Changeset 1633 for trunk/src/java/org/jcoderz/commons/taskdefs/XsltBasedTask.java

Timestamp:

05/26/10 18:16:57 (2 years ago)

Author:

amandel

Message:

#81 open the stream directly in StreamSource? to avoid whitespace in path issue.

Files:

• trunk/src/java/org/jcoderz/commons/taskdefs/XsltBasedTask.java (modified) (8 diffs)

trunk/src/java/org/jcoderz/commons/taskdefs/XsltBasedTask.java

@@ -39 +39 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.Properties;
 
@@ -57 +59 @@
 import org.jcoderz.commons.util.IoUtil;
 import org.jcoderz.commons.util.StringUtil;
+import org.jcoderz.commons.util.XmlUtil;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
@@ -391 +394 @@
         throws BuildException
     {
+        StreamResult out = null;
         try
         {
-            final String xmlParserConfig = System
-                .getProperty(XML_PARSER_CONFIGURATION_PROPERTY);
+            final String xmlParserConfig
+                = System.getProperty(XML_PARSER_CONFIGURATION_PROPERTY);
             if (!XML_PARSER_CONFIG_WITH_XINCLUDE.equals(xmlParserConfig))
             {
-                System.setProperty(XML_PARSER_CONFIGURATION_PROPERTY,
+                System.setProperty(
+                    XML_PARSER_CONFIGURATION_PROPERTY,
                     XML_PARSER_CONFIG_WITH_XINCLUDE);
                 log("Using XML Parser configuration "
@@ -404 +409 @@
             // Xalan2 transformer is required,
             // that why we explicit use this factory
-            final TransformerFactory factory = (TransformerFactory)
-            (loadClass("org.apache.xalan.processor.TransformerFactoryImpl")
-                .newInstance());
+            final TransformerFactory factory
+                = (TransformerFactory)
+                    (loadClass(
+                        "org.apache.xalan.processor.TransformerFactoryImpl")
+                            .newInstance());
 
             factory.setURIResolver(new JarArchiveUriResolver(this));
-            final InputStream xslStream = getXslFileAsStream();
-            final Transformer transformer = factory
-                .newTransformer(new StreamSource(xslStream));
+            final StreamSource source = getXslFileAsSource();
+            final Transformer transformer
+                = factory.newTransformer(source);
             setAdditionalTransformerParameters(transformer);
             transformer.setParameter("outdir", mDestDir != null ? mDestDir
                 .getAbsolutePath() : "");
             final Source xml = getInAsStreamSource();
-            final StreamResult out = new StreamResult(mOutFile);
+            out = XmlUtil.createStreamResult(mOutFile);
             transformer.setErrorListener(new MyErrorListener());
             transformer.transform(xml, out);
@@ -426 +433 @@
         finally
         {
+            if (out != null)
+            {
+                IoUtil.close(out.getOutputStream());
+            }
             if (mClassLoader != null)
             {
@@ -457 +468 @@
     }
 
-    private InputStream getXslFileAsStream ()
-    {
-        final InputStream result;
+    private StreamSource getXslFileAsSource ()
+    {
+        final StreamSource result;
         final InputStream xslStream
             = XsltBasedTask.class.getResourceAsStream(mXslFile);
@@ -466 +477 @@
             try
             {
-                final InputStream xslFile = new FileInputStream(mXslFile);
-                result = xslFile;
+                final File file = new File(mXslFile);
+                final InputStream xslFile = new FileInputStream(file);
+                result = new StreamSource(xslFile);
+                result.setSystemId(file.toURI().toASCIIString());
             }
             catch (FileNotFoundException e)
@@ -477 +490 @@
         else
         {
-            result = xslStream;
+            result = new StreamSource(xslStream);
+            final URL url = XsltBasedTask.class.getResource(mXslFile);
+            if (url != null)
+            {
+                try
+                {
+                    result.setSystemId(url.toURI().toASCIIString());
+                }
+                catch (URISyntaxException ex)
+                {
+                    log("Failed to set systemId. Got " + ex,
+                            Project.MSG_VERBOSE);
+                }
+            }
         }
         return result;