You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by tw...@apache.org on 2009/09/03 14:23:35 UTC
svn commit: r810911 - in /incubator/uima/sandbox/trunk/SimpleServer/src:
main/java/org/apache/uima/simpleserver/output/ test/resources/expected/
Author: twgoetz
Date: Thu Sep 3 12:23:34 2009
New Revision: 810911
URL: http://svn.apache.org/viewvc?rev=810911&view=rev
Log:
UIMA-1547: fix test cases. Add workaround for various sun jvms ignoring instructions not to create standalone="no" declarations in xml files. Still doesn't work with sun java 1.5 because it ignores instruction to add pretty printing indentation to files. Have not found a workaround. Since this makes no functional difference, one could also argue that the test cases are not set up properly.
https://issues.apache.org/jira/browse/UIMA-1547
Modified:
incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/output/ResultConverter.java
incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff01.xml
incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff02.xml
incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff03.xml
incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff04.xml
incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff05.xml
incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff06.xml
incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff07.xml
incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff08.xml
incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff09.xml
incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff10.xml
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/output/ResultConverter.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/output/ResultConverter.java?rev=810911&r1=810910&r2=810911&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/output/ResultConverter.java (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/output/ResultConverter.java Thu Sep 3 12:23:34 2009
@@ -77,12 +77,13 @@
transformer.setOutputProperty(OutputKeys.METHOD, "xml");
transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+ transformer.setOutputProperty(OutputKeys.STANDALONE, "no");
StringWriter stringWriter = new StringWriter();
StreamResult streamResult = new StreamResult(stringWriter);
transformer.transform(source, streamResult);
- return stringWriter.toString();
+ return stringWriter.toString().replace(" standalone=\"no\"", "");
} catch (Throwable t) {
throw new RuntimeException("XML output failed", t);
}
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff01.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff01.xml?rev=810911&r1=810910&r2=810911&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff01.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff01.xml Thu Sep 3 12:23:34 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<result>
<out>H</out>
<out>e</out>
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff02.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff02.xml?rev=810911&r1=810910&r2=810911&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff02.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff02.xml Thu Sep 3 12:23:34 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<result>
<out>e</out>
<out>r</out>
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff03.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff03.xml?rev=810911&r1=810910&r2=810911&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff03.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff03.xml Thu Sep 3 12:23:34 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<result>
<out>e</out>
</result>
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff04.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff04.xml?rev=810911&r1=810910&r2=810911&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff04.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff04.xml Thu Sep 3 12:23:34 2009
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<result/>
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff05.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff05.xml?rev=810911&r1=810910&r2=810911&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff05.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff05.xml Thu Sep 3 12:23:34 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<result>
<out>H</out>
<out>e</out>
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff06.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff06.xml?rev=810911&r1=810910&r2=810911&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff06.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff06.xml Thu Sep 3 12:23:34 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<result>
<out>e</out>
<out> </out>
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff07.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff07.xml?rev=810911&r1=810910&r2=810911&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff07.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff07.xml Thu Sep 3 12:23:34 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<result>
<out>H</out>
<out>'</out>
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff08.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff08.xml?rev=810911&r1=810910&r2=810911&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff08.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff08.xml Thu Sep 3 12:23:34 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<result>
<out stringList="foo">H</out>
<out stringList="foo">'</out>
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff09.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff09.xml?rev=810911&r1=810910&r2=810911&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff09.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff09.xml Thu Sep 3 12:23:34 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<result>
<out>r</out>
<out> </out>
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff10.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff10.xml?rev=810911&r1=810910&r2=810911&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff10.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/expected/standoff10.xml Thu Sep 3 12:23:34 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
<result>
<out stringList="foo">H</out>
<out>e</out>