You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2017/09/21 17:17:08 UTC
svn commit: r1809180 - in /uima/uv3/uimaj-v3/trunk: jVinci/src/main/java/
jVinci/src/main/java/org/apache/vinci/transport/document/
jVinci/src/main/java/org/apache/vinci/transport/vns/service/
uimaj-adapter-vinci/ uimaj-adapter-vinci/src/main/java/org/...
Author: schor
Date: Thu Sep 21 17:17:07 2017
New Revision: 1809180
URL: http://svn.apache.org/viewvc?rev=1809180&view=rev
Log: (empty)
Modified:
uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/ (props changed)
uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToVinci.java
uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceRegistry.java
uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/ (props changed)
uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Descriptor.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java (contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java (contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java (contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java (contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/ (props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/XMLUtil.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java (contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java (contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java (contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java (contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/XMLSerializerTest.java (contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml
uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java (contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java (contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmlDetagger.java (contents, props changed)
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/ (props changed)
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ (props changed)
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapXmlParser.java
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/ (props changed)
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/AnnotationViewGenerator.java
Propchange: uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -0,0 +1,6 @@
+/incubator/uima/uimaj/branches/mavenAlign/jVinci/src/main/java:932400-933272
+/uima/uimaj/branches/depend-on-july-9-build-tools/jVinci/src/main/java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/jVinci/src/main/java:961329-961747
+/uima/uimaj/branches/filteredCompress-uima-2498/jVinci/src/main/java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/jVinci/src/main/java:933273-944394
+/uima/uimaj/trunk/jVinci/src/main/java:1690273-1809174
Modified: uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToVinci.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToVinci.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToVinci.java (original)
+++ uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/document/XMLToVinci.java Thu Sep 21 17:17:07 2017
@@ -29,6 +29,8 @@ import javax.xml.parsers.SAXParserFactor
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler;
@@ -48,6 +50,15 @@ import org.apache.vinci.transport.util.T
*/
public class XMLToVinci {
+ private static final SAXParserFactory spf = SAXParserFactory.newInstance();
+ static {
+ try {
+ spf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ } catch (SAXNotRecognizedException | SAXNotSupportedException
+ | ParserConfigurationException e) {
+ throw new RuntimeException(e);
+ }
+ }
/**
* Utility class not intended to be instantiated.
*/
@@ -243,7 +254,9 @@ public class XMLToVinci {
public static VinciFrame xmlToVinciFrame(Reader r) throws ServiceException {
XMLReader xr;
try {
- xr = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
+ synchronized(spf) {
+ xr = spf.newSAXParser().getXMLReader();
+ }
} catch (SAXException e) {
throw new ServiceException("Error creating SAX Parser: " + e);
} catch (ParserConfigurationException e) {
@@ -284,7 +297,9 @@ public class XMLToVinci {
public static AFrame xmlToAFrame(Reader r) throws ServiceException {
XMLReader xr;
try {
- xr = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
+ synchronized (spf) {
+ xr = spf.newSAXParser().getXMLReader();
+ }
} catch (SAXException e) {
throw new ServiceException("Error creating SAX Parser: " + e);
} catch (ParserConfigurationException e) {
Modified: uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceRegistry.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceRegistry.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceRegistry.java (original)
+++ uima/uv3/uimaj-v3/trunk/jVinci/src/main/java/org/apache/vinci/transport/vns/service/ServiceRegistry.java Thu Sep 21 17:17:07 2017
@@ -407,7 +407,10 @@ public class ServiceRegistry {
/* Methods to load and save registry info */
public void load(String fname) throws Exception {
- DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ DocumentBuilder docBuilder = dbf.newDocumentBuilder();
+
FileReader readme = new FileReader(fname);
Document doc;
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -3,4 +3,4 @@
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-adapter-vinci:961329-961747
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-adapter-vinci:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-adapter-vinci:933273-944395
-/uima/uimaj/trunk/uimaj-adapter-vinci:1690273-1768790
+/uima/uimaj/trunk/uimaj-adapter-vinci:1690273-1809176
Modified: uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Descriptor.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Descriptor.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Descriptor.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/Descriptor.java Thu Sep 21 17:17:07 2017
@@ -87,8 +87,8 @@ public class Descriptor extends DefaultH
private Document parse(String configFile) {
Document doc = null;
try {
-
SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", false);
factory.setValidating(false);
// Create the builder and parse the file
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java Thu Sep 21 17:17:07 2017
@@ -37,6 +37,7 @@ import org.apache.uima.internal.util.Int
import org.apache.uima.internal.util.Misc;
import org.apache.uima.internal.util.Pair;
import org.apache.uima.internal.util.StringUtils;
+import org.apache.uima.internal.util.XMLUtils;
import org.apache.uima.internal.util.rb_trees.RedBlackTree;
import org.apache.uima.jcas.cas.CommonPrimitiveArray;
import org.apache.uima.jcas.cas.FSArray;
@@ -1293,7 +1294,7 @@ public class XCASDeserializer {
*/
public static void deserialize(InputStream aStream, CAS aCAS, boolean aLenient)
throws SAXException, IOException {
- XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+ XMLReader xmlReader = XMLUtils.createXMLReader();
XCASDeserializer deser = new XCASDeserializer(aCAS.getTypeSystem());
ContentHandler handler;
if (aLenient) {
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java:1690273-1809176
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java Thu Sep 21 17:17:07 2017
@@ -51,6 +51,7 @@ import org.apache.uima.cas.impl.XmiSeria
import org.apache.uima.internal.util.I18nUtil;
import org.apache.uima.internal.util.IntVector;
import org.apache.uima.internal.util.Misc;
+import org.apache.uima.internal.util.XMLUtils;
import org.apache.uima.internal.util.XmlAttribute;
import org.apache.uima.internal.util.XmlElementName;
import org.apache.uima.internal.util.XmlElementNameAndContents;
@@ -2291,7 +2292,7 @@ public class XmiCasDeserializer {
public static void deserialize(InputStream aStream, CAS aCAS, boolean aLenient,
XmiSerializationSharedData aSharedData, int aMergePoint)
throws SAXException, IOException {
- XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+ XMLReader xmlReader = XMLUtils.createXMLReader();
XmiCasDeserializer deser = new XmiCasDeserializer(aCAS.getTypeSystem());
ContentHandler handler = deser.getXmiCasHandler(aCAS, aLenient, aSharedData, aMergePoint);
xmlReader.setContentHandler(handler);
@@ -2365,7 +2366,7 @@ public class XmiCasDeserializer {
public static void deserialize(InputStream aStream, CAS aCAS, boolean aLenient,
XmiSerializationSharedData aSharedData, int aMergePoint, AllowPreexistingFS allowPreexistingFS)
throws SAXException, IOException {
- XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+ XMLReader xmlReader = XMLUtils.createXMLReader();
XmiCasDeserializer deser = new XmiCasDeserializer(aCAS.getTypeSystem());
ContentHandler handler = deser.getXmiCasHandler(aCAS, aLenient, aSharedData, aMergePoint, allowPreexistingFS);
xmlReader.setContentHandler(handler);
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -5,4 +5,4 @@
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java:933273-944396
/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java:1024030
-/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java:1690273-1758857,1773486-1774106
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java:1690273-1809176
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java Thu Sep 21 17:17:07 2017
@@ -485,6 +485,7 @@ public class UIMAFramework_impl extends
// with XML4J v3. This is a good thing, since the UtilityClassLoader writes
// to the logger, which isn't created yet!
SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
SAXParser parser = factory.newSAXParser();
XMLReader reader = parser.getXMLReader();
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java:1690273-1809177
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java Thu Sep 21 17:17:07 2017
@@ -27,6 +27,9 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
/**
* Some utilities for working with XML.
@@ -517,4 +520,12 @@ public abstract class XMLUtils {
(c >= 0xE000 && c <= 0xFFFD));
}
+ public static XMLReader createXMLReader() throws SAXException {
+ XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+ xmlReader.setFeature("http://xml.org/sax/features/external-general-entities", false);
+ xmlReader.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+ xmlReader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+ return xmlReader;
+ }
+
}
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java:1690273-1809177
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/pear/util:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/pear/util:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/pear/util:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/pear/util:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/pear/util:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/pear/util:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/pear/util:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util:1690273-1809178
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/XMLUtil.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/XMLUtil.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/XMLUtil.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/XMLUtil.java Thu Sep 21 17:17:07 2017
@@ -125,6 +125,7 @@ public class XMLUtil {
try {
// get SAX parser factory
SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
// set default SAX parser features
factory.setFeature(NAMESPACES_FEATURE_ID, DEFAULT_NAMESPACES);
factory.setFeature(NAMESPACE_PREFIXES_FEATURE_ID, DEFAULT_NAMESPACE_PREFIXES);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java Thu Sep 21 17:17:07 2017
@@ -24,6 +24,7 @@ import java.io.Writer;
import java.util.ArrayList;
import java.util.List;
+import javax.xml.XMLConstants;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Result;
import javax.xml.transform.Transformer;
@@ -59,6 +60,10 @@ public class XMLSerializer {
private static final SAXTransformerFactory transformerFactory = (SAXTransformerFactory) SAXTransformerFactory
.newInstance();
+ static { transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+ transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
+ }
+
private TransformerHandler mHandler;
private Transformer mTransformer;
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java:1690273-1809178
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java Thu Sep 21 17:17:07 2017
@@ -27,6 +27,7 @@ import org.apache.uima.cas.SerialFormat;
import org.apache.uima.cas.impl.OutOfTypeSystemData;
import org.apache.uima.cas.impl.XCASDeserializer;
import org.apache.uima.cas.impl.XmiCasDeserializer;
+import org.apache.uima.internal.util.XMLUtils;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
@@ -78,7 +79,7 @@ public abstract class XmlCasDeserializer
*/
public static void deserialize(InputStream aStream, CAS aCAS, boolean aLenient)
throws SAXException, IOException {
- XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+ XMLReader xmlReader = XMLUtils.createXMLReader();
XmlCasDeserializerHandler handler = new XmlCasDeserializerHandler(aCAS, aLenient);
xmlReader.setContentHandler(handler);
xmlReader.parse(new InputSource(aStream));
@@ -104,7 +105,7 @@ public abstract class XmlCasDeserializer
*/
static SerialFormat deserializeR(InputStream aStream, CAS aCAS, boolean aLenient)
throws SAXException, IOException {
- XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+ XMLReader xmlReader = XMLUtils.createXMLReader();
XmlCasDeserializerHandler handler = new XmlCasDeserializerHandler(aCAS, aLenient);
xmlReader.setContentHandler(handler);
xmlReader.parse(new InputSource(aStream));
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -5,4 +5,4 @@
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java:933273-944396
/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java:1024030
-/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java:1690273-1757900
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasDeserializer.java:1690273-1809178
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java Thu Sep 21 17:17:07 2017
@@ -105,6 +105,7 @@ public class XMLParser_impl implements X
SCHEMA_URL = schemaURL;
}
+
/**
* Map from XML element names to Class objects.
*/
@@ -156,6 +157,7 @@ public class XMLParser_impl implements X
URL urlToParse = aInput.getURL();
try {
SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
// Turn on namespace support
factory.setNamespaceAware(true);
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java:1690273-1809178
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java Thu Sep 21 17:17:07 2017
@@ -39,6 +39,7 @@ import org.apache.uima.cas.FeatureStruct
import org.apache.uima.cas.IntArrayFS;
import org.apache.uima.cas.StringArrayFS;
import org.apache.uima.cas.Type;
+import org.apache.uima.internal.util.XMLUtils;
import org.apache.uima.resource.metadata.FsIndexDescription;
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.resource.metadata.impl.TypePriorities_impl;
@@ -283,7 +284,7 @@ public class XCASDeserializerTest extend
+ "<uima.tcas.DocumentAnnotation _indexed=\"1\" _id=\"8\" sofa=\"1\" begin=\"0\" end=\"13\" language=\"en\"/>"
+ "<foo.Bar _indexed=\"1\" _id=\"2\" sofa=\"1\" begin=\"0\" end=\"0\" baz=\"blah\">this is the value feature</foo.Bar></CAS>";
OutOfTypeSystemData ootsd = new OutOfTypeSystemData();
- XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+ XMLReader xmlReader = XMLUtils.createXMLReader();
XCASDeserializer deser = new XCASDeserializer(cas.getTypeSystem());
ContentHandler handler = deser.getXCASHandler(cas, ootsd);
xmlReader.setContentHandler(handler);
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -0,0 +1,7 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java:933273-944396
+/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java:1690273-1809178
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/XMLSerializerTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/XMLSerializerTest.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/XMLSerializerTest.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/XMLSerializerTest.java Thu Sep 21 17:17:07 2017
@@ -20,6 +20,7 @@ package org.apache.uima.util;
import java.io.ByteArrayOutputStream;
+import javax.xml.XMLConstants;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
@@ -57,7 +58,10 @@ public class XMLSerializerTest extends T
// if (xmlStr.contains("1.0")) {
// useful to investigate issues when bad XML output is produced
// related to which Java implementation is being used
- Transformer t = TransformerFactory.newInstance().newTransformer();
+ TransformerFactory transformerFactory = TransformerFactory.newInstance();
+ transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+ transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
+ Transformer t = transformerFactory.newTransformer();
t.setOutputProperty(OutputKeys.VERSION, "1.1");
System.out.println("Java version is " +
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/XMLSerializerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -0,0 +1,7 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/util/XMLSerializerTest.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/test/java/org/apache/uima/util/XMLSerializerTest.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/test/java/org/apache/uima/util/XMLSerializerTest.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/test/java/org/apache/uima/util/XMLSerializerTest.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/util/XMLSerializerTest.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/util/XMLSerializerTest.java:933273-944396
+/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/XMLSerializerTest.java:1690273-1809178
Modified: uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml Thu Sep 21 17:17:07 2017
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
- <version>3.0.0-beta</version>
+ <version>3.0.1-beta-SNAPSHOT</version>
<relativePath />
</parent>
@@ -111,6 +111,174 @@
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>BuildUpdateSite-pack-svnget-buildMetadata-commit-to-dev</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <taskdef classname="net.sf.antcontrib.logic.IfTask" name="if" />
+ <condition property="eclipse.home" value="C:/p/eclipse/470oxy">
+ <not>
+ <equals arg2="$C:/p/eclipse/470oxy" arg1="C:/p/eclipse/470oxy" />
+ </not>
+ </condition>
+ <property environment="envVar" />
+ <condition property="eclipse.home" value="${envVar.ECLIPSE_HOME}">
+ <isset property="envVar.ECLIPSE_HOME" />
+ </condition>
+ <fail unless="eclipse.home" message="********** Please set up and use an ant property eclipse.home set to an Eclipse installation at level 3.3 or later, e.g. c:/eclipses/3.3/eclipse" />
+ <fail unless="uima-eclipse-jar-processor" message="********** Please add to your settings.xml file the property uima-eclipse-jar-processor, point to this within an Eclipse installation at level 4.2 or later, e.g. \$\{uima-maven-build-eclipse-home\}/plugins/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110808-1657.jar" />
+ <if>
+ <equals arg2="true" arg1="${isApacheRelease}" />
+ <then>
+ <echo>checking out eclipse update subsite uimaj-v3-pre-production from dist ...release...</echo>
+ <delete quiet="true" dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production" />
+ <exec failonerror="true" executable="svn">
+ <arg value="checkout" />
+ <arg value="https://dist.apache.org/repos/dist/release/uima/eclipse-update-site/uimaj-v3-pre-production" />
+ <arg value="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production" />
+ </exec>
+ </then>
+ <else>
+ <echo>skipping checkout of current svn dist release (because not apache-release)</echo>
+ <delete quiet="true" dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production" />
+ </else>
+ </if>
+ <echo>Compress plugin Jars using pack200 - this may take a minute or 2</echo>
+ <java fork="true" maxmemory="256m" jar="C:/p/eclipse/470oxy/plugins/org.eclipse.equinox.p2.jarprocessor_1.0.500.v20160504-1450.jar" failonerror="true">
+ <arg line="-processAll" />
+ <arg line="-repack" />
+ <arg line="-pack" />
+ <arg line="-verbose" />
+ <arg line="-outputDir C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eus-work/plugins" />
+ <arg line="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/toBePacked" />
+ </java>
+ <copy todir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eus-work/plugins" failonerror="true">
+ <fileset dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/toBePacked" />
+ </copy>
+ <echo>Generate the p2 metadata and publish new artifacts</echo>
+ <java fork="true" maxmemory="256m" jar="C:/p/eclipse/470oxy/plugins/org.eclipse.equinox.launcher_1.4.0.v20161219-1356.jar" failonerror="true">
+ <arg line="-application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" />
+ <arg line="-metadataRepository file:///C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production" />
+ <arg line="-artifactRepository file:///C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production" />
+ <arg line="-source C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eus-work" />
+ <arg line="-configs ANY.ANY.ANY" />
+ <arg line="-publishArtifacts" />
+ <arg line="-reusePack200Files" />
+ <arg line="-compress" />
+ <arg line="-append" />
+ </java>
+ <echo>Augment p2 metadata with category information</echo>
+ <java fork="true" maxmemory="256m" jar="C:/p/eclipse/470oxy/plugins/org.eclipse.equinox.launcher_1.4.0.v20161219-1356.jar" failonerror="true">
+ <arg line="-application org.eclipse.equinox.p2.publisher.CategoryPublisher" />
+ <arg line="-metadataRepository file:///C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production" />
+ <arg line="-categoryDefinition file:///C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site/category.xml" />
+ <arg line="-categoryQualifier apache-uima" />
+ <arg line="-compress" />
+ </java>
+ <if>
+ <equals arg2="true" arg1="${isApacheRelease}" />
+ <then>
+ <echo message="Generating checksums for new features and plugins" />
+ <checksum format="MD5SUM" algorithm="sha1">
+ <fileset dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eus-work">
+ <include name="**/*.gz" />
+ <include name="**/*.jar" />
+ </fileset>
+ </checksum>
+ <checksum format="MD5SUM" algorithm="md5">
+ <fileset dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eus-work">
+ <include name="**/*.gz" />
+ <include name="**/*.jar" />
+ </fileset>
+ </checksum>
+ <echo message="Generating gpg signatures for new features and plugins" />
+ <apply failonerror="true" dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eus-work" executable="gpg">
+ <arg value="--detach-sign" />
+ <arg value="--armor" />
+ <arg value="--batch" />
+ <fileset dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eus-work">
+ <include name="**/*.jar" />
+ <include name="**/*.jar.pack.gz" />
+ </fileset>
+ </apply>
+ <echo message="Copying the checksums and signatures to the update subsite" />
+ <copy todir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production" failonerror="true">
+ <fileset dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eus-work">
+ <include name="**/*.asc" />
+ <include name="**/*.md5" />
+ <include name="**/*.sha1" />
+ </fileset>
+ </copy>
+ <echo message="Clearing previous checksums and signatures for update artifacts.jar and content.jar" />
+ <delete dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production">
+ <include name="*.sha1" />
+ <include name="*.md5" />
+ <include name="*.asc" />
+ </delete>
+ <echo message="Generating checksums for updated artifacts.jar and content.jar" />
+ <checksum format="MD5SUM" algorithm="sha1">
+ <fileset dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production">
+ <include name="*.jar" />
+ </fileset>
+ </checksum>
+ <checksum format="MD5SUM" algorithm="md5">
+ <fileset dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production">
+ <include name="*.jar" />
+ </fileset>
+ </checksum>
+ <echo message="Generating gpg signatures for artifacts.jar and content.jar" />
+ <apply failonerror="true" dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production" executable="gpg">
+ <arg value="--detach-sign" />
+ <arg value="--armor" />
+ <arg value="--batch" />
+ <fileset dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production">
+ <include name="*.jar" />
+ </fileset>
+ </apply>
+ </then>
+ </if>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>ant</artifactId>
+ <groupId>ant</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-regexp</artifactId>
+ <version>1.9.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta-regexp</groupId>
+ <artifactId>jakarta-regexp</artifactId>
+ <version>1.4</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+
+
</plugins>
</build>
Modified: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java Thu Sep 21 17:17:07 2017
@@ -111,6 +111,11 @@ public class DotCorpusSerializer {
*/
public static DotCorpus parseDotCorpus(InputStream dotCorpusStream) throws CoreException {
DocumentBuilderFactory documentBuilderFacoty = DocumentBuilderFactory.newInstance();
+ try {
+ documentBuilderFacoty.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ } catch (ParserConfigurationException e1) {
+ throw new RuntimeException(e1);
+ }
DocumentBuilder documentBuilder;
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -0,0 +1,4 @@
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java:1436573-1462257
+/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/core/model/dotcorpus/DotCorpusSerializer.java:1690273-1809179
Modified: uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java Thu Sep 21 17:17:07 2017
@@ -21,6 +21,7 @@ package org.apache.uima.examples;
import java.io.InputStream;
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
@@ -34,6 +35,8 @@ import org.apache.uima.cas.TypeSystem;
import org.apache.uima.resource.ResourceInitializationException;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.helpers.DefaultHandler;
/**
@@ -52,6 +55,14 @@ public class XmlDetagger extends CasAnno
public static final String PARAM_XMLTAG = "XmlTagContainingText";
private SAXParserFactory parserFactory = SAXParserFactory.newInstance();
+ { try {
+ parserFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ } catch (SAXNotRecognizedException | SAXNotSupportedException
+ | ParserConfigurationException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
private Type sourceDocInfoType;
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -0,0 +1,6 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java:932400-933272
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java:961329-961746
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java:933273-944403
+/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java:1690273-1809179
Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmlDetagger.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmlDetagger.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmlDetagger.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmlDetagger.java Thu Sep 21 17:17:07 2017
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.net.URL;
import java.util.Iterator;
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
@@ -40,6 +41,8 @@ import org.apache.uima.util.InvalidXMLEx
import org.apache.uima.util.XMLInputSource;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.helpers.DefaultHandler;
/**
@@ -58,6 +61,15 @@ public class XmlDetagger extends CasAnno
public static final String PARAM_TEXT_TAG = "XmlTagContainingText";
private SAXParserFactory parserFactory = SAXParserFactory.newInstance();
+
+ { try {
+ parserFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ } catch (SAXNotRecognizedException | SAXNotSupportedException
+ | ParserConfigurationException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
private Type sourceDocInfoType;
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmlDetagger.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -0,0 +1,6 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmlDetagger.java:932400-933272
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmlDetagger.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmlDetagger.java:961329-961746
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmlDetagger.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmlDetagger.java:933273-944404
+/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmlDetagger.java:1690273-1809179
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -0,0 +1,6 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-tools/src/main/java/org/apache/uima/tools/cvd:932400-933272
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-tools/src/main/java/org/apache/uima/tools/cvd:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-tools/src/main/java/org/apache/uima/tools/cvd:961329-961746
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/cvd:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-tools/src/main/java/org/apache/uima/tools/cvd:933273-944404
+/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd:1690273-1809179
Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java Thu Sep 21 17:17:07 2017
@@ -724,7 +724,9 @@ public class MainFrame extends JFrame {
setXcasFileOpenDir(xmiCasFile.getParentFile());
Timer time = new Timer();
time.start();
- SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
+ SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+ saxParserFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ SAXParser parser = saxParserFactory.newSAXParser();
XmiCasDeserializer xmiCasDeserializer = new XmiCasDeserializer(getCas().getTypeSystem());
getCas().reset();
parser.parse(xmiCasFile, xmiCasDeserializer.getXmiCasHandler(getCas(), true));
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -0,0 +1,6 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap:932400-933272
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap:961329-961746
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap:933273-944404
+/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap:1690273-1809179
Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapXmlParser.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapXmlParser.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapXmlParser.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapXmlParser.java Thu Sep 21 17:17:07 2017
@@ -71,7 +71,10 @@ public class StyleMapXmlParser extends D
public StyleMapXmlParser(String xmlFile) {
try {
// create new SAX Parser
- SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
+ SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+ saxParserFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ SAXParser parser = saxParserFactory.newSAXParser();
+
XMLReader reader = parser.getXMLReader();
// set the content handler
reader.setContentHandler(this);
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 21 17:17:07 2017
@@ -0,0 +1,6 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview:932400-933272
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview:961329-961746
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview:933273-944404
+/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview:1690273-1809179
Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/AnnotationViewGenerator.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/AnnotationViewGenerator.java?rev=1809180&r1=1809179&r2=1809180&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/AnnotationViewGenerator.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/AnnotationViewGenerator.java Thu Sep 21 17:17:07 2017
@@ -29,6 +29,7 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Iterator;
+import javax.xml.XMLConstants;
import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
@@ -87,6 +88,8 @@ public class AnnotationViewGenerator {
public AnnotationViewGenerator(File aOutputDir) {
mOutputDir = aOutputDir;
mTFactory = TransformerFactory.newInstance();
+ mTFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+ mTFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
// the viewer uses several files located via the classpath
// parse xsl files into templates