x/clouddocs-maven-plugin
Code Issues Proposed changes

Updating Calabash helper for legacy source. Updating pom for newer version of papi. Updating PDFMojo to use calabash. TODOs for refactoring.

Browse Source
This commit is contained in:
Seth
2011-12-13 16:54:07 -06:00
committed by dcramer
parent f963fd0a28
commit c9682c0181
3 changed files with 22 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/rackspace/cloud/api/docs/CalabashHelper.java
View File

@@ -6,22 +6,22 @@ import com.rackspace.papi.components.translation.xproc.calabash.CalabashPipeline
import org.xml.sax.InputSource;
import javax.xml.transform.Source;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
public class CalabashHelper {
public static void run(final String pipelineUri, final InputStream inputStream) throws FileNotFoundException {
Pipeline pipe = new CalabashPipelineBuilder(false).build(pipelineUri);
public static Source run(final String pipelineURI, final InputSource inputSource) throws FileNotFoundException {
Pipeline pipeline = new CalabashPipelineBuilder(false, true).build(pipelineURI);
List<PipelineInput> inputs = new ArrayList<PipelineInput>() {{
add(PipelineInput.port("source", new InputSource(inputStream)));
add(PipelineInput.port("source", inputSource));
}};
pipe.run(inputs);
pipeline.run(inputs);
List<Source> nodes = pipe.getResultPort("result"); // result of xinclude;
List<Source> sources = pipeline.getResultPort("result"); // result of xinclude;
return sources.get(0);
}
}

41
src/main/java/com/rackspace/cloud/api/docs/PDFMojo.java
View File

@@ -3,11 +3,6 @@ package com.rackspace.cloud.api.docs;
import com.agilejava.docbkx.maven.AbstractFoMojo;
import com.agilejava.docbkx.maven.PreprocessingFilter;
import com.agilejava.docbkx.maven.TransformerBuilder;
import nu.xom.Builder;
import nu.xom.ParsingException;
import nu.xom.ValidityException;
import nu.xom.xinclude.XIncludeException;
import nu.xom.xinclude.XIncluder;
import org.antlr.stringtemplate.StringTemplate;
import org.antlr.stringtemplate.StringTemplateGroup;
import org.apache.avalon.framework.configuration.Configuration;
@@ -20,7 +15,6 @@ import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
import org.apache.maven.plugin.MojoExecutionException;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import javax.xml.transform.Result;
@@ -322,29 +316,20 @@ public abstract class PDFMojo extends AbstractFoMojo {
@Override
protected Source createSource(String inputFilename, File sourceFile, PreprocessingFilter filter)
throws MojoExecutionException {
// if both properties are set, XOM is used for a better XInclude support.
if (getXIncludeSupported() && getGeneratedSourceDirectory() != null) {
getLog().debug("Advanced XInclude mode entered");
final Builder xomBuilder = new Builder();
try {
final nu.xom.Document doc = xomBuilder.build(sourceFile);
XIncluder.resolveInPlace(doc);
// TODO also dump PIs computed and Entities included
final File dump = dumpResolvedXML(inputFilename, doc);
return new SAXSource(filter, new InputSource(dump.getAbsolutePath()));
} catch (ValidityException e) {
throw new MojoExecutionException("Failed to validate source", e);
} catch (ParsingException e) {
throw new MojoExecutionException("Failed to parse source", e);
} catch (IOException e) {
throw new MojoExecutionException("Failed to read source", e);
} catch (XIncludeException e) {
throw new MojoExecutionException("Failed to process XInclude", e);
Source source = super.createSource(inputFilename, sourceFile, filter);
String pipelineURI = "/Users/sbrayman/Documents/workspace/rc-maven-cloud-docs/src/main/resources/test.xpl"; //TODO: Pull this out to someplace better.
try {
if (!(source instanceof SAXSource)) {
throw new MojoExecutionException("Expecting a SAXSource");
}
} else { // else fallback on Xerces XInclude support.
getLog().debug("Xerces XInclude mode entered");
final InputSource inputSource = new InputSource(sourceFile.getAbsolutePath());
return new SAXSource(filter, inputSource);
SAXSource saxSource = (SAXSource) source;
return CalabashHelper.run(pipelineURI, saxSource.getInputSource());
} catch (FileNotFoundException e) {
throw new MojoExecutionException("Failed to find source.", e);
}
}
}

4
src/main/java/com/rackspace/cloud/api/docs/ResourceResolver.java
View File

@@ -13,7 +13,7 @@ import java.util.regex.Pattern;
* User: sbrayman
* Date: 10/19/11
*/
public class ResourceResolver implements URIResolver {
public class ResourceResolver implements URIResolver { //TODO: Kill this class?
private URIResolver originalResolver;
private String type;
@@ -34,7 +34,7 @@ public class ResourceResolver implements URIResolver {
try {
return new StreamSource(url.openStream(), url.toExternalForm());
} catch (IOException ioe) {
throw new TransformerException("Can't resolve glossary link: " + href + "->" + filePath + ". Glossary missing in classpath?", ioe);
throw new TransformerException("Can't resolve path: " + href + "->" + filePath + ". Resource missing in classpath?", ioe);
}
}
System.err.println("This failed to match. " + href);