From 0245d769bdb4677a62d8a62e3e6d526a6d597c0d Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 3 Aug 2000 09:34:05 +0000
Subject: [PATCH] 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
---
 .../org/apache/tools/ant/taskdefs/XSLTProcess.java   |  2 +-
 .../tools/ant/taskdefs/optional/XalanLiaison.java    | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index a31e525eb..f60910cbc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -94,7 +94,7 @@ public class XSLTProcess extends MatchingTask {
 
     private File xslFile = null;
 
-    private String targetExtension = "html";
+    private String targetExtension = ".html";
 
     private XSLTLiaison liaison;
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java
index 29ff7eba3..5f05f4275 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java
@@ -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