You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2018/02/15 16:19:34 UTC
svn commit: r1824324 - in /uima/uima-ducc/trunk:
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/
uima-ducc-user/src/main/java/org/apache/uima/ducc/user/common/
uima-ducc-user/src/main/java...
Author: cwiklik
Date: Thu Feb 15 16:19:34 2018
New Revision: 1824324
URL: http://svn.apache.org/viewvc?rev=1824324&view=rev
Log:
UIMA-5731 modified to use XMLUtils from uima sdk
Modified:
uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java
uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/DDParser.java
uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/common/DuccUimaSerializer.java
uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DeployableGenerator.java
Modified: uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java?rev=1824324&r1=1824323&r2=1824324&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java Thu Feb 15 16:19:34 2018
@@ -36,7 +36,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.TcpStreamHandler;
@@ -45,6 +44,7 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.user.common.PrivateClassLoader;
import org.apache.uima.ducc.user.common.QuotedOptions;
import org.apache.uima.ducc.user.common.UimaUtils;
+import org.apache.uima.internal.util.XMLUtils;
import org.apache.uima.util.XMLInputSource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -169,7 +169,9 @@ public class DuccUiUtilities {
} else {
xmlin = UimaUtils.getXMLInputSource(process_DD);
}
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ DocumentBuilder db =
+ XMLUtils.createDocumentBuilderFactory().newDocumentBuilder();
+ //DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
doc = db.parse(xmlin.getInputStream());
} catch (Throwable t) {
t.printStackTrace();
Modified: uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/DDParser.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/DDParser.java?rev=1824324&r1=1824323&r2=1824324&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/DDParser.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/DDParser.java Thu Feb 15 16:19:34 2018
@@ -26,6 +26,7 @@ import javax.xml.parsers.ParserConfigura
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.apache.uima.internal.util.XMLUtils;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
@@ -50,7 +51,11 @@ public class DDParser extends DefaultHan
private void parse() throws ParserConfigurationException, SAXException, IOException {
fis = new FileInputStream(file);
- parser = SAXParserFactory.newInstance().newSAXParser();
+ //TransformerFactory tFactory =
+ SAXParserFactory f =
+ XMLUtils.createSAXParserFactory();
+ parser = f.newSAXParser();
+// parser = SAXParserFactory.newInstance().newSAXParser();
parser.parse(fis, this);
}
Modified: uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/common/DuccUimaSerializer.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/common/DuccUimaSerializer.java?rev=1824324&r1=1824323&r2=1824324&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/common/DuccUimaSerializer.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/common/DuccUimaSerializer.java Thu Feb 15 16:19:34 2018
@@ -31,12 +31,12 @@ import javax.xml.parsers.ParserConfigura
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.impl.XmiCasDeserializer;
import org.apache.uima.cas.impl.XmiCasSerializer;
+import org.apache.uima.internal.util.XMLUtils;
import org.apache.uima.util.XMLSerializer;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
//import com.thoughtworks.xstream.XStream;
//import com.thoughtworks.xstream.io.xml.DomDriver;
@@ -70,7 +70,10 @@ public class DuccUimaSerializer {
public void deserializeCasFromXmi(String anXmlStr, CAS aCAS)
throws FactoryConfigurationError, ParserConfigurationException, SAXException, IOException {
- XMLReader xmlReader = XMLReaderFactory.createXMLReader(); // localXmlReader.get();
+ XMLReader xmlReader =
+ XMLUtils.createXMLReader();
+
+ //XMLReader xmlReader = XMLReaderFactory.createXMLReader(); // localXmlReader.get();
Reader reader = new StringReader(anXmlStr);
XmiCasDeserializer deser = new XmiCasDeserializer(aCAS.getTypeSystem());
ContentHandler handler = deser.getXmiCasHandler(aCAS);
Modified: uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DeployableGenerator.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DeployableGenerator.java?rev=1824324&r1=1824323&r2=1824324&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DeployableGenerator.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DeployableGenerator.java Thu Feb 15 16:19:34 2018
@@ -39,6 +39,7 @@ import javax.xml.transform.stream.Stream
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
import org.apache.uima.ducc.user.common.UimaUtils;
import org.apache.uima.ducc.user.jp.UimaASProcessContainer;
+import org.apache.uima.internal.util.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -123,7 +124,11 @@ public class DeployableGenerator {
// Create DOM from the DD ... file or class-like name
String location = configuration.getReferenceByName();
org.apache.uima.util.XMLInputSource xmlin = UimaUtils.getXMLInputSource(location); // Reads from FS or classpath
- DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+
+ DocumentBuilderFactory dbFactory = XMLUtils.createDocumentBuilderFactory();
+ DocumentBuilder db = dbFactory.newDocumentBuilder();
+
+ //DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
doc = db.parse(xmlin.getInputStream());
// Create converted descriptor if input is not a file or if endpoint or broker wrong
@@ -207,10 +212,14 @@ public class DeployableGenerator {
StringWriter writer = null;
DOMSource domSource = new DOMSource(xmlDoc.getDocumentElement());
+
writer = new StringWriter();
StreamResult streamResult = new StreamResult(writer);
- TransformerFactory factory = TransformerFactory.newInstance();
+ TransformerFactory factory =
+ XMLUtils.createTransformerFactory();
+
+ //TransformerFactory factory = TransformerFactory.newInstance();
Transformer transformer = factory.newTransformer();
transformer.transform(domSource, streamResult);