Changeset 35364

Timestamp:

2021-09-11T14:13:03+12:00 (3 years ago)

Author:

kjdon

Message:

XMLREaderFactory is deprecated. Use SAXParserFactory instead. Hope I've done this right...

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLTransformer.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLTransformer.java

@@ -43 +43 @@
 
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.OutputKeys;
@@ -67 +70 @@
 import org.xml.sax.SAXException;
 import javax.xml.transform.sax.SAXSource;
-import org.xml.sax.helpers.XMLReaderFactory;
+//import org.xml.sax.helpers.XMLReaderFactory;
+
 /**
  * XMLTransformer - utility class for greenstone
@@ -497 +501 @@
             DOMResult result =  (docDocType == null) ? new DOMResult() : new DOMResult(docDocType);
 
-            XMLReader reader = XMLReaderFactory.createXMLReader();
+//          XMLReader reader = XMLReaderFactory.createXMLReader(); // deprecated
+                        SAXParserFactory parserFactory = SAXParserFactory.newInstance();
+                        parserFactory.setNamespaceAware(true);
+                        SAXParser parser = parserFactory.newSAXParser();
+                        XMLReader reader = parser.getXMLReader();
             reader.setEntityResolver(er);
             SAXSource xmlSource = new SAXSource(reader, new InputSource(new InputStreamReader(new FileInputStream(source), GSConstants.XML_FILE_ENCODING)));
@@ -526 +534 @@
             return transformError("XMLTransformer.transform(File, File)" + "\ncouldn't find the file specified\n" + stylesheet + "\n" + source, e);
         }
+                catch (ParserConfigurationException e)
+                {
+                  return transformError("XMLTransformer.transform(File, File)" + "\ncouldn't create a SAXParser for files\n" + stylesheet + "\n" + source, e);
+                }
     }
     // debugAsFile is only to be set to true when either the stylesheet or source parameters