Browse Source

Added missing dot to default extension in <style>, ensured Xalan gets

infile as a file:// URL.
Submitted by:	Brian Zimmer <bzimmer@ignitemedia.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267878 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 25 years ago
parent
commit
0245d769bd
2 changed files with 11 additions and 3 deletions
  1. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
  2. +10
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java

+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java View File

@@ -94,7 +94,7 @@ public class XSLTProcess extends MatchingTask {

private File xslFile = null;

private String targetExtension = "html";
private String targetExtension = ".html";

private XSLTLiaison liaison;



+ 10
- 2
src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java View File

@@ -68,6 +68,8 @@ import org.apache.xalan.xslt.XSLTResultTarget;
*/
public class XalanLiaison implements XSLTLiaison {

protected final static String FILEURL = "file:";

XSLTProcessor processor;
XSLTInputSource xslSheet;

@@ -76,12 +78,18 @@ public class XalanLiaison implements XSLTLiaison {
}

public void setStylesheet(String fileName) throws Exception {
xslSheet = new XSLTInputSource (fileName);
xslSheet = new XSLTInputSource (normalize(fileName));
};

public void transform(String infile, String outfile) throws Exception {
processor.process(new XSLTInputSource(infile), xslSheet,
processor.process(new XSLTInputSource(normalize(infile)), xslSheet,
new XSLTResultTarget(outfile));
}

protected String normalize(String fileName) {
if(fileName != null && !fileName.startsWith(FILEURL)) {
return FILEURL + fileName;
}
return fileName;
}
} //-- XalanLiaison

Loading…
Cancel
Save