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 2016/11/04 13:23:51 UTC
svn commit: r1768027 [2/2] - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test:
java/org/apache/uima/json/ resources/CasSerialization/expected/json/
resources/CasSerialization/expected/xmi/
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesStaticNoOmits.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesStaticNoOmits.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesStaticNoOmits.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesStaticNoOmits.xml Fri Nov 4 13:23:50 2016
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:AllTypes xmi:id="1" sofa="29" begin="0" end="0" aBoolean="true" aByte="-117" aShort="-112" aInteger="0" aLong="1234" aFloat="1.3" aDouble="2.6" aString="some "String"" aFS="36" aArrayBoolean="false" aArrayMrBoolean="165" aArrayMrByte="168" aArrayByte="0FEE" aArrayShort="" aArrayMrShort="171" aArrayMrString="174" aListInteger="" aListFs="0">
+ <test:AllTypes xmi:id="2" sofa="1" begin="0" end="0" aBoolean="true" aByte="-117" aShort="-112" aInteger="0" aLong="1234" aFloat="1.3" aDouble="2.6" aString="some "String"" aFS="3" aArrayBoolean="false" aArrayMrBoolean="12" aArrayMrByte="13" aArrayByte="0FEE" aArrayShort="" aArrayMrShort="14" aArrayMrString="15" aListInteger="" aListFs="0">
<aArrayString/>
<aListString>testStr</aListString>
</test:AllTypes>
- <cas:Sofa xmi:id="29" sofaNum="1" sofaID="_InitialView"/>
- <test:AllTypes xmi:id="36" sofa="29" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="0" aLong="0" aFloat="0.0" aDouble="0.0"/>
- <cas:BooleanArray xmi:id="165" elements="false"/>
- <cas:ByteArray xmi:id="168" elements="0000"/>
- <cas:ShortArray xmi:id="171" elements=""/>
- <cas:StringArray xmi:id="174">
+ <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/>
+ <test:AllTypes xmi:id="3" sofa="1" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="0" aLong="0" aFloat="0.0" aDouble="0.0"/>
+ <cas:BooleanArray xmi:id="12" elements="false"/>
+ <cas:ByteArray xmi:id="13" elements="0000"/>
+ <cas:ShortArray xmi:id="14" elements=""/>
+ <cas:StringArray xmi:id="15">
<elements/>
</cas:StringArray>
- <cas:View sofa="29" members="1"/>
-</xmi:XMI>
\ No newline at end of file
+ <cas:View sofa="1" members="2"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a1-not-a.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a1-not-a.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a1-not-a.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a1-not-a.xml Fri Nov 4 13:23:50 2016
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aArrayFS="15 22 29"/>
- <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/>
- <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/>
- <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="29" sofa="8" begin="0" end="0"/>
- <cas:View sofa="8" members="1 15"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:RefTypes xmi:id="1" sofa="2" begin="0" end="0" aArrayFS="3 4 5"/>
+ <test:RefTypes xmi:id="3" sofa="2" begin="0" end="0"/>
+ <cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/>
+ <test:RefTypes xmi:id="4" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="5" sofa="2" begin="0" end="0"/>
+ <cas:View sofa="2" members="1 3"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a1-not-l.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a1-not-l.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a1-not-l.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a1-not-l.xml Fri Nov 4 13:23:50 2016
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aListFs="15 22 29"/>
- <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/>
- <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/>
- <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="29" sofa="8" begin="0" end="0"/>
- <cas:View sofa="8" members="1 15"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:RefTypes xmi:id="1" sofa="2" begin="0" end="0" aListFs="3 4 5"/>
+ <test:RefTypes xmi:id="3" sofa="2" begin="0" end="0"/>
+ <cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/>
+ <test:RefTypes xmi:id="4" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="5" sofa="2" begin="0" end="0"/>
+ <cas:View sofa="2" members="1 3"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a2-not-a.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a2-not-a.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a2-not-a.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a2-not-a.xml Fri Nov 4 13:23:50 2016
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aArrayFS="15 22 29"/>
- <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/>
- <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/>
- <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="29" sofa="8" begin="0" end="0"/>
- <cas:View sofa="8" members="1 22"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:RefTypes xmi:id="1" sofa="2" begin="0" end="0" aArrayFS="3 4 5"/>
+ <test:RefTypes xmi:id="4" sofa="2" begin="0" end="0"/>
+ <cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/>
+ <test:RefTypes xmi:id="3" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="5" sofa="2" begin="0" end="0"/>
+ <cas:View sofa="2" members="1 4"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a2-not-l.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a2-not-l.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a2-not-l.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a2-not-l.xml Fri Nov 4 13:23:50 2016
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aListFs="15 22 29"/>
- <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/>
- <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/>
- <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="29" sofa="8" begin="0" end="0"/>
- <cas:View sofa="8" members="1 22"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:RefTypes xmi:id="1" sofa="2" begin="0" end="0" aListFs="3 4 5"/>
+ <test:RefTypes xmi:id="4" sofa="2" begin="0" end="0"/>
+ <cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/>
+ <test:RefTypes xmi:id="3" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="5" sofa="2" begin="0" end="0"/>
+ <cas:View sofa="2" members="1 4"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a3-not-a.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a3-not-a.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a3-not-a.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a3-not-a.xml Fri Nov 4 13:23:50 2016
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aArrayFS="15 22 29"/>
- <test:RefTypes xmi:id="29" sofa="8" begin="0" end="0"/>
- <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/>
- <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/>
- <cas:View sofa="8" members="1 29"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:RefTypes xmi:id="1" sofa="2" begin="0" end="0" aArrayFS="3 4 5"/>
+ <test:RefTypes xmi:id="5" sofa="2" begin="0" end="0"/>
+ <cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/>
+ <test:RefTypes xmi:id="3" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="4" sofa="2" begin="0" end="0"/>
+ <cas:View sofa="2" members="1 5"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a3-not-l.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a3-not-l.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a3-not-l.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a3-not-l.xml Fri Nov 4 13:23:50 2016
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aListFs="15 22 29"/>
- <test:RefTypes xmi:id="29" sofa="8" begin="0" end="0"/>
- <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/>
- <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/>
- <cas:View sofa="8" members="1 29"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:RefTypes xmi:id="1" sofa="2" begin="0" end="0" aListFs="3 4 5"/>
+ <test:RefTypes xmi:id="5" sofa="2" begin="0" end="0"/>
+ <cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/>
+ <test:RefTypes xmi:id="3" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="4" sofa="2" begin="0" end="0"/>
+ <cas:View sofa="2" members="1 5"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-all-embeddable-a.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-all-embeddable-a.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-all-embeddable-a.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-all-embeddable-a.xml Fri Nov 4 13:23:50 2016
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aArrayFS="15 22 29"/>
- <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/>
- <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="29" sofa="8" begin="0" end="0"/>
- <cas:View sofa="8" members="1"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:RefTypes xmi:id="1" sofa="2" begin="0" end="0" aArrayFS="3 4 5"/>
+ <cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/>
+ <test:RefTypes xmi:id="3" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="4" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="5" sofa="2" begin="0" end="0"/>
+ <cas:View sofa="2" members="1"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-all-embeddable-l.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-all-embeddable-l.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-all-embeddable-l.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-all-embeddable-l.xml Fri Nov 4 13:23:50 2016
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aListFs="15 22 29"/>
- <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/>
- <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="29" sofa="8" begin="0" end="0"/>
- <cas:View sofa="8" members="1"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:RefTypes xmi:id="1" sofa="2" begin="0" end="0" aListFs="3 4 5"/>
+ <cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/>
+ <test:RefTypes xmi:id="3" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="4" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="5" sofa="2" begin="0" end="0"/>
+ <cas:View sofa="2" members="1"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-non-embeddable-a.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-non-embeddable-a.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-non-embeddable-a.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-non-embeddable-a.xml Fri Nov 4 13:23:50 2016
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aArrayFS="15 22 29"/>
- <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="29" sofa="8" begin="0" end="0"/>
- <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/>
- <cas:View sofa="8" members="1 15 22 29"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:RefTypes xmi:id="1" sofa="2" begin="0" end="0" aArrayFS="3 4 5"/>
+ <test:RefTypes xmi:id="3" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="4" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="5" sofa="2" begin="0" end="0"/>
+ <cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/>
+ <cas:View sofa="2" members="1 3 4 5"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-non-embeddable-l.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-non-embeddable-l.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-non-embeddable-l.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-non-embeddable-l.xml Fri Nov 4 13:23:50 2016
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aListFs="15 22 29"/>
- <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="29" sofa="8" begin="0" end="0"/>
- <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/>
- <cas:View sofa="8" members="1 15 22 29"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:RefTypes xmi:id="1" sofa="2" begin="0" end="0" aListFs="3 4 5"/>
+ <test:RefTypes xmi:id="3" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="4" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="5" sofa="2" begin="0" end="0"/>
+ <cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/>
+ <cas:View sofa="2" members="1 3 4 5"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-a.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-a.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-a.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-a.xml Fri Nov 4 13:23:50 2016
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aArrayFS="15 22 29"/>
- <cas:FSArray xmi:id="36" elements="15 22 29"/>
- <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/>
- <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="29" sofa="8" begin="0" end="0"/>
- <cas:View sofa="8" members="1 36"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:RefTypes xmi:id="1" sofa="2" begin="0" end="0" aArrayFS="3 4 5"/>
+ <cas:FSArray xmi:id="6" elements="3 4 5"/>
+ <cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/>
+ <test:RefTypes xmi:id="3" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="4" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="5" sofa="2" begin="0" end="0"/>
+ <cas:View sofa="2" members="1 6"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-l.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-l.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-l.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-l.xml Fri Nov 4 13:23:50 2016
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aListFs="15 22 29"/>
- <cas:NonEmptyFSList xmi:id="41" head="15" tail="44"/>
- <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/>
- <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/>
- <cas:NonEmptyFSList xmi:id="44" head="22" tail="47"/>
- <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/>
- <cas:NonEmptyFSList xmi:id="47" head="29" tail="50"/>
- <test:RefTypes xmi:id="29" sofa="8" begin="0" end="0"/>
- <cas:EmptyFSList xmi:id="50"/>
- <cas:View sofa="8" members="1 41"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:RefTypes xmi:id="1" sofa="2" begin="0" end="0" aListFs="3 4 5"/>
+ <cas:NonEmptyFSList xmi:id="7" tail="8" head="3"/>
+ <cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/>
+ <cas:NonEmptyFSList xmi:id="8" tail="9" head="4"/>
+ <cas:NonEmptyFSList xmi:id="9" tail="10" head="5"/>
+ <cas:EmptyFSList xmi:id="10"/>
+ <test:RefTypes xmi:id="5" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="4" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="3" sofa="2" begin="0" end="0"/>
+ <cas:View sofa="2" members="1 7"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-non-embeddable-a.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-non-embeddable-a.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-non-embeddable-a.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-non-embeddable-a.xml Fri Nov 4 13:23:50 2016
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aArrayFS="15 22 29"/>
- <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="29" sofa="8" begin="0" end="0"/>
- <cas:FSArray xmi:id="36" elements="15 22 29"/>
- <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/>
- <cas:View sofa="8" members="1 15 22 29 36"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:RefTypes xmi:id="1" sofa="2" begin="0" end="0" aArrayFS="3 4 5"/>
+ <test:RefTypes xmi:id="3" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="4" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="5" sofa="2" begin="0" end="0"/>
+ <cas:FSArray xmi:id="6" elements="3 4 5"/>
+ <cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/>
+ <cas:View sofa="2" members="1 3 4 5 6"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-non-embeddable-l.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-non-embeddable-l.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-non-embeddable-l.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-non-embeddable-l.xml Fri Nov 4 13:23:50 2016
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aListFs="15 22 29"/>
- <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="29" sofa="8" begin="0" end="0"/>
- <cas:NonEmptyFSList xmi:id="41" head="15" tail="44"/>
- <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/>
- <cas:NonEmptyFSList xmi:id="44" head="22" tail="47"/>
- <cas:NonEmptyFSList xmi:id="47" head="29" tail="50"/>
- <cas:EmptyFSList xmi:id="50"/>
- <cas:View sofa="8" members="1 15 22 29 41"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:RefTypes xmi:id="1" sofa="2" begin="0" end="0" aListFs="3 4 5"/>
+ <test:RefTypes xmi:id="3" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="4" sofa="2" begin="0" end="0"/>
+ <test:RefTypes xmi:id="5" sofa="2" begin="0" end="0"/>
+ <cas:NonEmptyFSList xmi:id="7" tail="8" head="3"/>
+ <cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/>
+ <cas:NonEmptyFSList xmi:id="8" tail="9" head="4"/>
+ <cas:NonEmptyFSList xmi:id="9" tail="10" head="5"/>
+ <cas:EmptyFSList xmi:id="10"/>
+ <cas:View sofa="2" members="1 3 4 5 7"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/emptyCAS.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/emptyCAS.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/emptyCAS.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/emptyCAS.xml Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/></xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedAndRef.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedAndRef.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedAndRef.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedAndRef.xml Fri Nov 4 13:23:50 2016
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aFS="15"/>
- <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/>
- <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/>
- <cas:View sofa="8" members="1 15"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:RefTypes xmi:id="1" sofa="2" begin="0" end="0" aFS="3"/>
+ <test:RefTypes xmi:id="3" sofa="2" begin="0" end="0"/>
+ <cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/>
+ <cas:View sofa="2" members="1 3"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleList.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleList.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleList.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleList.xml Fri Nov 4 13:23:50 2016
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <cas:NonEmptyIntegerList xmi:id="8" head="11" tail="5"/>
- <cas:NonEmptyIntegerList xmi:id="5" head="22" tail="2"/>
- <cas:NonEmptyIntegerList xmi:id="2" head="33" tail="1"/>
+ <cas:NonEmptyIntegerList xmi:id="4" tail="3" head="11"/>
+ <cas:NonEmptyIntegerList xmi:id="3" tail="2" head="22"/>
+ <cas:NonEmptyIntegerList xmi:id="2" tail="1" head="33"/>
<cas:EmptyIntegerList xmi:id="1"/>
- <cas:View members="8"/>
-</xmi:XMI>
\ No newline at end of file
+ <cas:View members="4"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleListStatic.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleListStatic.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleListStatic.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleListStatic.xml Fri Nov 4 13:23:50 2016
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <cas:NonEmptyIntegerList xmi:id="8" head="11" tail="5"/>
- <cas:NonEmptyIntegerList xmi:id="5" head="22" tail="2"/>
- <cas:NonEmptyIntegerList xmi:id="2" head="33" tail="1"/>
+ <cas:NonEmptyIntegerList xmi:id="4" tail="3" head="11"/>
+ <cas:NonEmptyIntegerList xmi:id="3" tail="2" head="22"/>
+ <cas:NonEmptyIntegerList xmi:id="2" tail="1" head="33"/>
<cas:EmptyIntegerList xmi:id="1"/>
- <cas:View members="8"/>
-</xmi:XMI>
\ No newline at end of file
+ <cas:View members="4"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/multipleViews.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/multipleViews.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/multipleViews.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/multipleViews.xml Fri Nov 4 13:23:50 2016
@@ -1,28 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:AllTypes xmi:id="1" sofa="29" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="1" aLong="4321" aFloat="NaN" aDouble="-Infinity" aString="some "String"" aFS="36" aArrayBoolean="" aArrayMrBoolean="164" aArrayMrByte="167" aArrayByte="" aArrayShort="0 0" aArrayMrShort="170" aArrayMrString="173" aListInteger="" aListFs="0">
+ <test:AllTypes xmi:id="2" sofa="1" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="1" aLong="4321" aFloat="NaN" aDouble="-Infinity" aString="some "String"" aFS="3" aArrayBoolean="" aArrayMrBoolean="12" aArrayMrByte="13" aArrayByte="" aArrayShort="0 0" aArrayMrShort="14" aArrayMrString="15" aListInteger="" aListFs="0">
<aListString>testStr</aListString>
</test:AllTypes>
- <test:AllTypes xmi:id="192" sofa="185" begin="0" end="0" aBoolean="true" aByte="-117" aShort="-112" aInteger="0" aLong="1234" aFloat="1.3" aDouble="2.6" aString="some "String"" aFS="220" aArrayBoolean="false" aArrayMrBoolean="349" aArrayMrByte="352" aArrayByte="0FEE" aArrayShort="" aArrayMrShort="355" aArrayMrString="358" aListInteger="" aListFs="0">
+ <test:AllTypes xmi:id="22" sofa="1" begin="0" end="0" aBoolean="true" aByte="-117" aShort="-112" aInteger="0" aLong="1234" aFloat="1.3" aDouble="2.6" aString="some "String"" aFS="23" aArrayBoolean="false" aArrayMrBoolean="32" aArrayMrByte="33" aArrayByte="0FEE" aArrayShort="" aArrayMrShort="34" aArrayMrString="35" aListInteger="" aListFs="0">
<aArrayString/>
<aListString>testStr</aListString>
</test:AllTypes>
- <cas:Sofa xmi:id="29" sofaNum="1" sofaID="_InitialView"/>
- <cas:Sofa xmi:id="185" sofaNum="2" sofaID="View2"/>
- <test:AllTypes xmi:id="36" sofa="29" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="0" aLong="0" aFloat="0.0" aDouble="0.0"/>
- <cas:BooleanArray xmi:id="164" elements="false"/>
- <cas:ByteArray xmi:id="167" elements="0000"/>
- <cas:ShortArray xmi:id="170" elements=""/>
- <cas:StringArray xmi:id="173">
+ <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/>
+ <cas:Sofa xmi:id="21" sofaNum="2" sofaID="View2"/>
+ <test:AllTypes xmi:id="3" sofa="1" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="0" aLong="0" aFloat="0.0" aDouble="0.0"/>
+ <cas:BooleanArray xmi:id="12" elements="false"/>
+ <cas:ByteArray xmi:id="13" elements="0000"/>
+ <cas:ShortArray xmi:id="14" elements=""/>
+ <cas:StringArray xmi:id="15">
<elements/>
</cas:StringArray>
- <test:AllTypes xmi:id="220" sofa="185" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="0" aLong="0" aFloat="0.0" aDouble="0.0"/>
- <cas:BooleanArray xmi:id="349" elements="false"/>
- <cas:ByteArray xmi:id="352" elements="0000"/>
- <cas:ShortArray xmi:id="355" elements=""/>
- <cas:StringArray xmi:id="358">
+ <test:AllTypes xmi:id="23" sofa="1" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="0" aLong="0" aFloat="0.0" aDouble="0.0"/>
+ <cas:BooleanArray xmi:id="32" elements="false"/>
+ <cas:ByteArray xmi:id="33" elements="0000"/>
+ <cas:ShortArray xmi:id="34" elements=""/>
+ <cas:StringArray xmi:id="35">
<elements/>
</cas:StringArray>
- <cas:View sofa="29" members="1"/>
- <cas:View sofa="185" members="192"/>
-</xmi:XMI>
\ No newline at end of file
+ <cas:View sofa="1" members="2 22"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision.xml Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12"/><test2:Token xmi:id="13" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 13"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="2" sofa="1" begin="0" end="0"/><test3:Token xmi:id="3"/><test2:Token xmi:id="4" sofa="1" begin="0" end="0"/><cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="1" members="2 3 4"/></xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2.xml Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12"/><test2:Token xmi:id="13" sofa="5" begin="0" end="0"/><test2:Token xmi:id="17" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 13 17"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="2" sofa="1" begin="0" end="0"/><test3:Token xmi:id="3"/><test2:Token xmi:id="4" sofa="1" begin="0" end="0"/><test2:Token xmi:id="5" sofa="1" begin="0" end="0"/><cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="1" members="2 3 4 5"/></xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2Omits.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2Omits.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2Omits.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2Omits.xml Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12"/><test2:Token xmi:id="13" sofa="5" begin="0" end="0"/><test2:Token xmi:id="17" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 13 17"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="2" sofa="1" begin="0" end="0"/><test3:Token xmi:id="3"/><test2:Token xmi:id="4" sofa="1" begin="0" end="0"/><test2:Token xmi:id="5" sofa="1" begin="0" end="0"/><cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="1" members="2 3 4 5"/></xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2pp.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2pp.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2pp.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2pp.xml Fri Nov 4 13:23:50 2016
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:Token xmi:id="1" sofa="5" begin="0" end="0"/>
- <test3:Token xmi:id="12"/>
- <test2:Token xmi:id="13" sofa="5" begin="0" end="0"/>
- <test2:Token xmi:id="17" sofa="5" begin="0" end="0"/>
- <cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/>
- <cas:View sofa="5" members="1 12 13 17"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:Token xmi:id="2" sofa="1" begin="0" end="0"/>
+ <test3:Token xmi:id="3"/>
+ <test2:Token xmi:id="4" sofa="1" begin="0" end="0"/>
+ <test2:Token xmi:id="5" sofa="1" begin="0" end="0"/>
+ <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/>
+ <cas:View sofa="1" members="2 3 4 5"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2ppOmits.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2ppOmits.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2ppOmits.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2ppOmits.xml Fri Nov 4 13:23:50 2016
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <test:Token xmi:id="1" sofa="5" begin="0" end="0"/>
- <test3:Token xmi:id="12"/>
- <test2:Token xmi:id="13" sofa="5" begin="0" end="0"/>
- <test2:Token xmi:id="17" sofa="5" begin="0" end="0"/>
- <cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/>
- <cas:View sofa="5" members="1 12 13 17"/>
-</xmi:XMI>
\ No newline at end of file
+ <test:Token xmi:id="2" sofa="1" begin="0" end="0"/>
+ <test3:Token xmi:id="3"/>
+ <test2:Token xmi:id="4" sofa="1" begin="0" end="0"/>
+ <test2:Token xmi:id="5" sofa="1" begin="0" end="0"/>
+ <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/>
+ <cas:View sofa="1" members="2 3 4 5"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollisionOmits.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollisionOmits.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollisionOmits.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollisionOmits.xml Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12"/><test2:Token xmi:id="13" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 13"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="2" sofa="1" begin="0" end="0"/><test3:Token xmi:id="3"/><test2:Token xmi:id="4" sofa="1" begin="0" end="0"/><cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="1" members="2 3 4"/></xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollsionFiltered.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollsionFiltered.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollsionFiltered.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollsionFiltered.xml Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="2" sofa="1" begin="0" end="0"/><test3:Token xmi:id="3"/><cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="1" members="2 3"/></xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceNoCollsionFiltered.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceNoCollsionFiltered.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceNoCollsionFiltered.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceNoCollsionFiltered.xml Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="2" sofa="1" begin="0" end="0"/><cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="1" members="2"/></xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnly.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnly.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnly.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnly.xml Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="2" sofa="6" begin="0" end="0"/><cas:Sofa xmi:id="6" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="6" members="1 2"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="3" sofa="2" begin="0" end="0"/><cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="2" members="1 3"/></xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoContext.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoContext.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoContext.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoContext.xml Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="2" sofa="6" begin="0" end="0"/><cas:Sofa xmi:id="6" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="6" members="1 2"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="3" sofa="2" begin="0" end="0"/><cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="2" members="1 3"/></xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoExpandedTypeNames.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoExpandedTypeNames.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoExpandedTypeNames.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoExpandedTypeNames.xml Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="2" sofa="6" begin="0" end="0"/><cas:Sofa xmi:id="6" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="6" members="1 2"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="3" sofa="2" begin="0" end="0"/><cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="2" members="1 3"/></xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoSubtypes.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoSubtypes.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoSubtypes.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoSubtypes.xml Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="2" sofa="6" begin="0" end="0"/><cas:Sofa xmi:id="6" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="6" members="1 2"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="3" sofa="2" begin="0" end="0"/><cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="2" members="1 3"/></xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topExpandedNamesNoViews.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topExpandedNamesNoViews.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topExpandedNamesNoViews.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topExpandedNamesNoViews.xml Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><cas:View members="1"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><cas:View members="1"/></xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoContext.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoContext.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoContext.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoContext.xml Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><cas:View members="1"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><cas:View members="1"/></xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoExpandedTypeNames.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoExpandedTypeNames.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoExpandedTypeNames.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoExpandedTypeNames.xml Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><cas:View members="1"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><cas:View members="1"/></xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithDefaultViewOmits.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithDefaultViewOmits.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithDefaultViewOmits.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithDefaultViewOmits.xml Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><tcas:Annotation xmi:id="1" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><tcas:Annotation xmi:id="2" sofa="1" begin="0" end="0"/><cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="1" members="2"/></xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithNamedViewOmits.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithNamedViewOmits.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithNamedViewOmits.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithNamedViewOmits.xml Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="2" sofa="6" begin="0" end="0"/><tcas:Annotation xmi:id="20" sofa="13" begin="0" end="0"/><cas:Sofa xmi:id="6" sofaNum="1" sofaID="_InitialView"/><cas:Sofa xmi:id="13" sofaNum="2" sofaID="basicView"/><cas:View sofa="6" members="1 2"/><cas:View sofa="13" members="20"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:test3="http:///org/apache/uimax/test.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="3" sofa="2" begin="0" end="0"/><tcas:Annotation xmi:id="5" sofa="4" begin="0" end="0"/><cas:Sofa xmi:id="2" sofaNum="1" sofaID="_InitialView"/><cas:Sofa xmi:id="4" sofaNum="2" sofaID="basicView"/><cas:View sofa="2" members="1 3"/><cas:View sofa="4" members="5"/></xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMerge.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMerge.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMerge.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMerge.xml Fri Nov 4 13:23:50 2016
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <cas:NonEmptyIntegerList xmi:id="8" head="11" tail="5"/>
- <cas:NonEmptyIntegerList xmi:id="11" head="110" tail="5"/>
- <cas:NonEmptyIntegerList xmi:id="5" head="22" tail="2"/>
- <cas:NonEmptyIntegerList xmi:id="2" head="33" tail="1"/>
+ <cas:NonEmptyIntegerList xmi:id="4" tail="3" head="11"/>
+ <cas:NonEmptyIntegerList xmi:id="5" tail="3" head="110"/>
+ <cas:NonEmptyIntegerList xmi:id="3" tail="2" head="22"/>
+ <cas:NonEmptyIntegerList xmi:id="2" tail="1" head="33"/>
<cas:EmptyIntegerList xmi:id="1"/>
- <cas:View members="8 11"/>
-</xmi:XMI>
\ No newline at end of file
+ <cas:View members="4 5"/>
+</xmi:XMI>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMergeStatic.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMergeStatic.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMergeStatic.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMergeStatic.xml Fri Nov 4 13:23:50 2016
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
- <cas:NonEmptyIntegerList xmi:id="8" head="11" tail="5"/>
- <cas:NonEmptyIntegerList xmi:id="11" head="110" tail="5"/>
- <cas:NonEmptyIntegerList xmi:id="5" head="22" tail="2"/>
- <cas:NonEmptyIntegerList xmi:id="2" head="33" tail="1"/>
+ <cas:NonEmptyIntegerList xmi:id="4" tail="3" head="11"/>
+ <cas:NonEmptyIntegerList xmi:id="5" tail="3" head="110"/>
+ <cas:NonEmptyIntegerList xmi:id="3" tail="2" head="22"/>
+ <cas:NonEmptyIntegerList xmi:id="2" tail="1" head="33"/>
<cas:EmptyIntegerList xmi:id="1"/>
- <cas:View members="8 11"/>
-</xmi:XMI>
\ No newline at end of file
+ <cas:View members="4 5"/>
+</xmi:XMI>