added option for url in input handler

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194420 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 17 insertions, 8 deletions

diff --git a/src/org/apache/fop/apps/FOInputHandler.java b/src/org/apache/fop/apps/FOInputHandler.java
index f2828dd20..d3a871903 100644
--- a/src/org/apache/fop/apps/FOInputHandler.java
+++ b/src/org/apache/fop/apps/FOInputHandler.java
@@ -16,19 +16,27 @@ import org.apache.fop.messaging.MessageHandler;
 
 // java
 import java.io.File;
+import java.net.URL;
 
 /**
  * Manages input if it is an xsl:fo file
  */
 public class FOInputHandler extends InputHandler {
 
-    File fofile;
-    public FOInputHandler(File fofile) {
+    File fofile = null;
+    URL foURL = null;
+    public FOInputHandler (File fofile) {
         this.fofile = fofile;
     }
 
-    public InputSource getInputSource() {
-        return super.fileInputSource(fofile);
+    public FOInputHandler (URL url) {
+        this.foURL = url;
+    }
+
+    public InputSource getInputSource () {
+        if (fofile != null)
+            return super.fileInputSource(fofile);
+        return super.urlInputSource(foURL);
     }
 
     public XMLReader getParser() throws FOPException {
diff --git a/src/org/apache/fop/apps/InputHandler.java b/src/org/apache/fop/apps/InputHandler.java
index fe2d7cd7a..c2899ddbe 100644
--- a/src/org/apache/fop/apps/InputHandler.java
+++ b/src/org/apache/fop/apps/InputHandler.java
@@ -27,6 +27,10 @@ abstract public class InputHandler {
     abstract public XMLReader getParser() throws FOPException;
 
 
+    static public InputSource urlInputSource(URL url) {
+        return new InputSource(url.toString());
+    }
+
     /**
      * create an InputSource from a File
      *
@@ -55,10 +59,7 @@ abstract public class InputHandler {
      * @return the created SAX parser
      */
     protected static XMLReader createParser() throws FOPException {
-        String parserClassName = System.getProperty("org.xml.sax.parser");
-        if (parserClassName == null) {
-            parserClassName = "org.apache.xerces.parsers.SAXParser";
-        }
+        String parserClassName = Driver.getParserClassName();
         MessageHandler.logln("using SAX parser " + parserClassName);
 
         try {