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 a7b269a..1dd6a60 100644 --- a/src/main/java/com/rackspace/cloud/api/docs/WebHelpMojo.java +++ b/src/main/java/com/rackspace/cloud/api/docs/WebHelpMojo.java @@ -154,13 +154,6 @@ public abstract class WebHelpMojo extends AbstractWebhelpMojo { */ private String replacementsFile; - /** - * @parameter - * expression="${generate-webhelp.imageCopyDir}" - * default-value="" - */ - private String imageCopyDir; - /** * @parameter * expression="${generate-webhelp.makePdf}" @@ -471,13 +464,11 @@ public abstract class WebHelpMojo extends AbstractWebhelpMojo { String pathToPipelineFile = "classpath:/webhelp.xpl"; //use "classpath:/path" for this to work Source source = super.createSource(inputFilename, sourceFile, filter); - Map map=new HashMap(); + Map map=new HashMap(); map.put("security", this.security); map.put("canonicalUrlBase", this.canonicalUrlBase); map.put("replacementsFile", this.replacementsFile); - //This is where the images will be copied in the target. This is a POM configuration. - map.put("imageCopyDir", this.imageCopyDir); map.put("failOnValidationError", this.failOnValidationError); map.put("project.build.directory", this.projectBuildDirectory); map.put("inputSrcFile", inputFilename); @@ -522,8 +513,8 @@ public abstract class WebHelpMojo extends AbstractWebhelpMojo { } } - //targetExtQueryFile can tell us where the html will be built. Comparing this with the imageCopyDir path - //we can figure out the relative path of the images to the html output. So passing the path to the content dir to the pipeline. + //targetExtQueryFile can tell us where the html will be built. We pass this absolute path to the + //pipeline so that the copy-and-transform-image step can use it to calculate where to place the images. String targetExtQueryFile = (String) map.get("targetExtQueryFile"); int pos = targetExtQueryFile.lastIndexOf(File.separator); targetExtQueryFile = targetExtQueryFile.substring(0, pos); 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 6a7263c..d1b3bdc 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 @@ -135,6 +135,7 @@ public class PDFBuilder { // Extract all fonts into fonts directory // FileUtils.extractJaredDirectory("fonts",PDFBuilder.class,imageParentDirectory); + System.out.println("************************************** HELLO WORLD **************************************"); } public File processSources(Map map) throws MojoExecutionException{ diff --git a/src/main/java/com/rackspace/cloud/api/docs/calabash/extensions/CopyAndTransformXProcStep.java b/src/main/java/com/rackspace/cloud/api/docs/calabash/extensions/CopyAndTransformXProcStep.java index 5c3c570..f438835 100644 --- a/src/main/java/com/rackspace/cloud/api/docs/calabash/extensions/CopyAndTransformXProcStep.java +++ b/src/main/java/com/rackspace/cloud/api/docs/calabash/extensions/CopyAndTransformXProcStep.java @@ -78,15 +78,12 @@ public class CopyAndTransformXProcStep extends DefaultStep { private URI getTargetDirectoryURI() { RuntimeValue target = getOption(_target); URI uri = target.getBaseURI().resolve(target.getString()); - return uri; } private URI getTargetHtmlContentDirectoryURI() { RuntimeValue target = getOption(_targetHtmlContentDir); URI uri = target.getBaseURI().resolve(target.getString()); - File ttt = new File(uri); - System.out.println(ttt.getAbsolutePath()); return uri; } diff --git a/src/main/resources/rackspace-library.xpl b/src/main/resources/rackspace-library.xpl index c5cea29..6b61da3 100644 --- a/src/main/resources/rackspace-library.xpl +++ b/src/main/resources/rackspace-library.xpl @@ -819,17 +819,12 @@ - - - - - +