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 [1/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/
Author: schor
Date: Fri Nov 4 13:23:50 2016
New Revision: 1768027
URL: http://svn.apache.org/viewvc?rev=1768027&view=rev
Log:
no Jira - update expected for consecutive ids
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/java/org/apache/uima/json/JsonCasSerializerTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesNoOmits.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesOmits.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesStaticNoOmits.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-a.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-l.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-a.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-l.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-a.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-l.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-a.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-l.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-a.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-l.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-a.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-l.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-a.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-l.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedAndRef.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleList.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleListStatic.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/multipleViews.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2Omits.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2pp.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2ppOmits.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollisionOmits.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollsionFiltered.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceNoCollsionFiltered.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnly.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoContext.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoExpandedTypeNames.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoSubtypes.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithDefaultViewOmits.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithNamedViewOmits.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMerge.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMergeStatic.txt
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesNoOmits.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesOmits.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesStaticNoOmits.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a1-not-a.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a1-not-l.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a2-not-a.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a2-not-l.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a3-not-a.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-a3-not-l.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-all-embeddable-a.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-all-embeddable-l.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-non-embeddable-a.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-non-embeddable-l.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-a.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-l.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-non-embeddable-a.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-non-embeddable-l.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/emptyCAS.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedAndRef.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleList.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleListStatic.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/multipleViews.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2Omits.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2pp.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2ppOmits.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollisionOmits.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollsionFiltered.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceNoCollsionFiltered.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnly.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoContext.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoExpandedTypeNames.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoSubtypes.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topExpandedNamesNoViews.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoContext.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoExpandedTypeNames.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithDefaultViewOmits.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithNamedViewOmits.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMerge.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMergeStatic.xml
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/java/org/apache/uima/json/JsonCasSerializerTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/java/org/apache/uima/json/JsonCasSerializerTest.java?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/java/org/apache/uima/json/JsonCasSerializerTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/java/org/apache/uima/json/JsonCasSerializerTest.java Fri Nov 4 13:23:50 2016
@@ -80,8 +80,8 @@ public class JsonCasSerializerTest exten
*********************************************************************/
private static final boolean GENERATE_EXPECTED = false;
-// private static final String generateDir = "src/test/resources/CasSerialization/expected/";
- private static final String generateDir = "src/test/resources/CasSerialization/newExpected/";
+ private static final String generateDir = "src/test/resources/CasSerialization/expected/";
+// private static final String generateDir = "src/test/resources/CasSerialization/newExpected/";
private XMLParser parser = UIMAFramework.getXMLParser();
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesNoOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesNoOmits.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesNoOmits.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesNoOmits.txt Fri Nov 4 13:23:50 2016
@@ -8,7 +8,7 @@
"EmptyIntegerList" : {"_id" : "uima.cas.EmptyIntegerList" },
"EmptyStringList" : {"_id" : "uima.cas.EmptyStringList" },
"NonEmptyFSList" : {"_id" : "uima.cas.NonEmptyFSList",
- "_feature_types" : {"head" : "_ref", "tail" : "_ref" } },
+ "_feature_types" : {"tail" : "_ref", "head" : "_ref" } },
"NonEmptyStringList" : {"_id" : "uima.cas.NonEmptyStringList",
"_feature_types" : {"tail" : "_array" } },
"ShortArray" : {"_id" : "uima.cas.ShortArray" },
@@ -36,7 +36,8 @@
"_views" : {
"_InitialView" : {
"AllTypes" : [
- {"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" : {"_type" : "AllTypes", "sofa" : 29, "begin" : 0, "end" : 0, "aBoolean" : false, "aByte" : 0, "aShort" : 0, "aInteger" : 0, "aLong" : 0, "aFloat" : 0.0, "aDouble" : 0.0 }, "aArrayBoolean" : [false ], "aArrayMrBoolean" : [false ], "aArrayMrByte" : "AAA=", "aArrayByte" : "D+4=", "aArrayShort" : [ ], "aArrayMrShort" : [ ], "aArrayString" : [null ], "aArrayMrString" : [null ], "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [0 ] } ] } },
+ {"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" : {"_type" : "AllTypes", "sofa" : 1, "begin" : 0, "end" : 0, "aBoolean" : false, "aByte" : 0, "aShort" : 0, "aInteger" : 0, "aLong" : 0, "aFloat" : 0.0, "aDouble" : 0.0 }, "aArrayBoolean" : [false ], "aArrayMrBoolean" : [false ], "aArrayMrByte" : "AAA=", "aArrayByte" : "D+4=", "aArrayShort" : [ ], "aArrayMrShort" : [ ], "aArrayString" : [null ], "aArrayMrString" : [null ], "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [
+ {"_type" : "NonEmptyFSList", "tail" : [ ] } ] } ] } },
"_referenced_fss" : {
- "29" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
+ "1" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesOmits.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesOmits.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesOmits.txt Fri Nov 4 13:23:50 2016
@@ -8,7 +8,7 @@
"EmptyIntegerList" : {"_id" : "uima.cas.EmptyIntegerList" },
"EmptyStringList" : {"_id" : "uima.cas.EmptyStringList" },
"NonEmptyFSList" : {"_id" : "uima.cas.NonEmptyFSList",
- "_feature_types" : {"head" : "_ref", "tail" : "_ref" } },
+ "_feature_types" : {"tail" : "_ref", "head" : "_ref" } },
"NonEmptyStringList" : {"_id" : "uima.cas.NonEmptyStringList",
"_feature_types" : {"tail" : "_array" } },
"ShortArray" : {"_id" : "uima.cas.ShortArray" },
@@ -36,7 +36,8 @@
"_views" : {
"_InitialView" : {
"AllTypes" : [
- {"sofa" : 29, "aBoolean" : true, "aByte" : -117, "aShort" : -112, "aLong" : 1234, "aFloat" : 1.3, "aDouble" : 2.6, "aString" : "some \"String\"",
- "aFS" : {"_type" : "AllTypes", "sofa" : 29, "aBoolean" : false }, "aArrayBoolean" : [false ], "aArrayMrBoolean" : [false ], "aArrayMrByte" : "AAA=", "aArrayByte" : "D+4=", "aArrayShort" : [ ], "aArrayMrShort" : [ ], "aArrayString" : [null ], "aArrayMrString" : [null ], "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [0 ] } ] } },
+ {"sofa" : 1, "aBoolean" : true, "aByte" : -117, "aShort" : -112, "aLong" : 1234, "aFloat" : 1.3, "aDouble" : 2.6, "aString" : "some \"String\"",
+ "aFS" : {"_type" : "AllTypes", "sofa" : 1, "aBoolean" : false }, "aArrayBoolean" : [false ], "aArrayMrBoolean" : [false ], "aArrayMrByte" : "AAA=", "aArrayByte" : "D+4=", "aArrayShort" : [ ], "aArrayMrShort" : [ ], "aArrayString" : [null ], "aArrayMrString" : [null ], "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [
+ {"_type" : "NonEmptyFSList", "tail" : [ ] } ] } ] } },
"_referenced_fss" : {
- "29" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
+ "1" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesStaticNoOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesStaticNoOmits.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesStaticNoOmits.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/allValuesStaticNoOmits.txt Fri Nov 4 13:23:50 2016
@@ -21,11 +21,11 @@
"_views" : {
"_InitialView" : {
"AllTypes" : [
- {"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" : "D+4=", "aArrayShort" : [ ], "aArrayMrShort" : 171, "aArrayString" : [null ], "aArrayMrString" : 174, "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [0 ] } ] } },
+ {"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" : "D+4=", "aArrayShort" : [ ], "aArrayMrShort" : 14, "aArrayString" : [null ], "aArrayMrString" : 15, "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [19 ] } ] } },
"_referenced_fss" : {
- "29" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "36" : {"_type" : "AllTypes", "sofa" : 29, "begin" : 0, "end" : 0, "aBoolean" : false, "aByte" : 0, "aShort" : 0, "aInteger" : 0, "aLong" : 0, "aFloat" : 0.0, "aDouble" : 0.0 },
- "165" : {"_type" : "BooleanArray", "_collection" : [false ] },
- "168" : {"_type" : "ByteArray", "_collection" : "AAA=" },
- "171" : {"_type" : "ShortArray", "_collection" : [ ] },
- "174" : {"_type" : "StringArray", "_collection" : [null ] } } }
\ No newline at end of file
+ "1" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "3" : {"_type" : "AllTypes", "sofa" : 1, "begin" : 0, "end" : 0, "aBoolean" : false, "aByte" : 0, "aShort" : 0, "aInteger" : 0, "aLong" : 0, "aFloat" : 0.0, "aDouble" : 0.0 },
+ "12" : {"_type" : "BooleanArray", "_collection" : [false ] },
+ "13" : {"_type" : "ByteArray", "_collection" : "AAA=" },
+ "14" : {"_type" : "ShortArray", "_collection" : [ ] },
+ "15" : {"_type" : "StringArray", "_collection" : [null ] } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-a.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-a.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-a.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-a.txt Fri Nov 4 13:23:50 2016
@@ -2,9 +2,9 @@
"_views" : {
"_InitialView" : {
"RefTypes" : [
- {"sofa" : 8, "aArrayFS" : [15, 22, 29 ] }, 15 ] } },
+ {"sofa" : 2, "aArrayFS" : [3, 4, 5 ] }, 3 ] } },
"_referenced_fss" : {
- "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "15" : {"_type" : "RefTypes", "sofa" : 8 },
- "22" : {"_type" : "RefTypes", "sofa" : 8 },
- "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "2" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "3" : {"_type" : "RefTypes", "sofa" : 2 },
+ "4" : {"_type" : "RefTypes", "sofa" : 2 },
+ "5" : {"_type" : "RefTypes", "sofa" : 2 } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-l.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-l.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-l.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a1-not-l.txt Fri Nov 4 13:23:50 2016
@@ -2,9 +2,20 @@
"_views" : {
"_InitialView" : {
"RefTypes" : [
- {"sofa" : 8, "aListFs" : [15,
- {"_type" : "RefTypes", "sofa" : 8 },
- {"_type" : "RefTypes", "sofa" : 8 } ] }, 15 ] } },
+ {"sofa" : 2, "aListFs" : [
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [ ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } } ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } },
+ {"_type" : "NonEmptyFSList", "tail" : [ ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } } ], "head" : 3 },
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [ ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } } ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } },
+ {"_type" : "NonEmptyFSList", "tail" : [ ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } } ] }, 3 ] } },
"_referenced_fss" : {
- "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "15" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "2" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "3" : {"_type" : "RefTypes", "sofa" : 2 } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-a.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-a.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-a.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-a.txt Fri Nov 4 13:23:50 2016
@@ -2,9 +2,9 @@
"_views" : {
"_InitialView" : {
"RefTypes" : [
- {"sofa" : 8, "aArrayFS" : [15, 22, 29 ] }, 22 ] } },
+ {"sofa" : 2, "aArrayFS" : [3, 4, 5 ] }, 4 ] } },
"_referenced_fss" : {
- "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "15" : {"_type" : "RefTypes", "sofa" : 8 },
- "22" : {"_type" : "RefTypes", "sofa" : 8 },
- "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "2" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "3" : {"_type" : "RefTypes", "sofa" : 2 },
+ "4" : {"_type" : "RefTypes", "sofa" : 2 },
+ "5" : {"_type" : "RefTypes", "sofa" : 2 } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-l.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-l.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-l.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a2-not-l.txt Fri Nov 4 13:23:50 2016
@@ -2,9 +2,19 @@
"_views" : {
"_InitialView" : {
"RefTypes" : [
- {"sofa" : 8, "aListFs" : [
- {"_type" : "RefTypes", "sofa" : 8 }, 22,
- {"_type" : "RefTypes", "sofa" : 8 } ] }, 22 ] } },
+ {"sofa" : 2, "aListFs" : [
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [ ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } } ], "head" : 4 },
+ {"_type" : "NonEmptyFSList", "tail" : [ ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } } ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } },
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [ ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } } ], "head" : 4 },
+ {"_type" : "NonEmptyFSList", "tail" : [ ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } } ] }, 4 ] } },
"_referenced_fss" : {
- "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "22" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "2" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "4" : {"_type" : "RefTypes", "sofa" : 2 } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-a.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-a.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-a.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-a.txt Fri Nov 4 13:23:50 2016
@@ -2,9 +2,9 @@
"_views" : {
"_InitialView" : {
"RefTypes" : [
- {"sofa" : 8, "aArrayFS" : [15, 22, 29 ] }, 29 ] } },
+ {"sofa" : 2, "aArrayFS" : [3, 4, 5 ] }, 5 ] } },
"_referenced_fss" : {
- "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "15" : {"_type" : "RefTypes", "sofa" : 8 },
- "22" : {"_type" : "RefTypes", "sofa" : 8 },
- "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "2" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "3" : {"_type" : "RefTypes", "sofa" : 2 },
+ "4" : {"_type" : "RefTypes", "sofa" : 2 },
+ "5" : {"_type" : "RefTypes", "sofa" : 2 } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-l.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-l.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-l.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-a3-not-l.txt Fri Nov 4 13:23:50 2016
@@ -2,9 +2,17 @@
"_views" : {
"_InitialView" : {
"RefTypes" : [
- {"sofa" : 8, "aListFs" : [
- {"_type" : "RefTypes", "sofa" : 8 },
- {"_type" : "RefTypes", "sofa" : 8 }, 29 ] }, 29 ] } },
+ {"sofa" : 2, "aListFs" : [
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [ ], "head" : 5 } ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } },
+ {"_type" : "NonEmptyFSList", "tail" : [ ], "head" : 5 } ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } },
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [ ], "head" : 5 } ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } },
+ {"_type" : "NonEmptyFSList", "tail" : [ ], "head" : 5 } ] }, 5 ] } },
"_referenced_fss" : {
- "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "2" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "5" : {"_type" : "RefTypes", "sofa" : 2 } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-a.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-a.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-a.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-a.txt Fri Nov 4 13:23:50 2016
@@ -2,9 +2,9 @@
"_views" : {
"_InitialView" : {
"RefTypes" : [
- {"sofa" : 8, "aArrayFS" : [15, 22, 29 ] } ] } },
+ {"sofa" : 2, "aArrayFS" : [3, 4, 5 ] } ] } },
"_referenced_fss" : {
- "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "15" : {"_type" : "RefTypes", "sofa" : 8 },
- "22" : {"_type" : "RefTypes", "sofa" : 8 },
- "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "2" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "3" : {"_type" : "RefTypes", "sofa" : 2 },
+ "4" : {"_type" : "RefTypes", "sofa" : 2 },
+ "5" : {"_type" : "RefTypes", "sofa" : 2 } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-l.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-l.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-l.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-all-embeddable-l.txt Fri Nov 4 13:23:50 2016
@@ -2,9 +2,20 @@
"_views" : {
"_InitialView" : {
"RefTypes" : [
- {"sofa" : 8, "aListFs" : [
- {"_type" : "RefTypes", "sofa" : 8 },
- {"_type" : "RefTypes", "sofa" : 8 },
- {"_type" : "RefTypes", "sofa" : 8 } ] } ] } },
+ {"sofa" : 2, "aListFs" : [
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [ ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } } ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } },
+ {"_type" : "NonEmptyFSList", "tail" : [ ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } } ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } },
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [ ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } } ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } },
+ {"_type" : "NonEmptyFSList", "tail" : [ ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } } ] } ] } },
"_referenced_fss" : {
- "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
+ "2" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-a.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-a.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-a.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-a.txt Fri Nov 4 13:23:50 2016
@@ -2,9 +2,9 @@
"_views" : {
"_InitialView" : {
"RefTypes" : [
- {"sofa" : 8, "aArrayFS" : [15, 22, 29 ] }, 15, 22, 29 ] } },
+ {"sofa" : 2, "aArrayFS" : [3, 4, 5 ] }, 3, 4, 5 ] } },
"_referenced_fss" : {
- "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "15" : {"_type" : "RefTypes", "sofa" : 8 },
- "22" : {"_type" : "RefTypes", "sofa" : 8 },
- "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "2" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "3" : {"_type" : "RefTypes", "sofa" : 2 },
+ "4" : {"_type" : "RefTypes", "sofa" : 2 },
+ "5" : {"_type" : "RefTypes", "sofa" : 2 } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-l.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-l.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-l.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-non-embeddable-l.txt Fri Nov 4 13:23:50 2016
@@ -2,9 +2,16 @@
"_views" : {
"_InitialView" : {
"RefTypes" : [
- {"sofa" : 8, "aListFs" : [15, 22, 29 ] }, 15, 22, 29 ] } },
+ {"sofa" : 2, "aListFs" : [
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [ ], "head" : 5 } ], "head" : 4 },
+ {"_type" : "NonEmptyFSList", "tail" : [ ], "head" : 5 } ], "head" : 3 },
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [ ], "head" : 5 } ], "head" : 4 },
+ {"_type" : "NonEmptyFSList", "tail" : [ ], "head" : 5 } ] }, 3, 4, 5 ] } },
"_referenced_fss" : {
- "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "15" : {"_type" : "RefTypes", "sofa" : 8 },
- "22" : {"_type" : "RefTypes", "sofa" : 8 },
- "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "2" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "5" : {"_type" : "RefTypes", "sofa" : 2 },
+ "4" : {"_type" : "RefTypes", "sofa" : 2 },
+ "3" : {"_type" : "RefTypes", "sofa" : 2 } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-a.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-a.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-a.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-a.txt Fri Nov 4 13:23:50 2016
@@ -1,12 +1,12 @@
{
"_views" : {
"_InitialView" : {
- "FSArray" : [36 ],
+ "FSArray" : [6 ],
"RefTypes" : [
- {"sofa" : 8, "aArrayFS" : 36 } ] } },
+ {"sofa" : 2, "aArrayFS" : 6 } ] } },
"_referenced_fss" : {
- "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "36" : {"_type" : "FSArray", "_collection" : [
- {"_type" : "RefTypes", "sofa" : 8 },
- {"_type" : "RefTypes", "sofa" : 8 },
- {"_type" : "RefTypes", "sofa" : 8 } ] } } }
\ No newline at end of file
+ "2" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "6" : {"_type" : "FSArray", "_collection" : [
+ {"_type" : "RefTypes", "sofa" : 2 },
+ {"_type" : "RefTypes", "sofa" : 2 },
+ {"_type" : "RefTypes", "sofa" : 2 } ] } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-l.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-l.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-l.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-items-all-embeddable-l.txt Fri Nov 4 13:23:50 2016
@@ -1,12 +1,16 @@
{
"_views" : {
"_InitialView" : {
- "NonEmptyFSList" : [41 ],
+ "NonEmptyFSList" : [7 ],
"RefTypes" : [
- {"sofa" : 8, "aListFs" : 41 } ] } },
+ {"sofa" : 2, "aListFs" : 7 } ] } },
"_referenced_fss" : {
- "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "41" : {"_type" : "NonEmptyFSList",
- "head" : {"_type" : "RefTypes", "sofa" : 8 }, "tail" : [
- {"_type" : "RefTypes", "sofa" : 8 },
- {"_type" : "RefTypes", "sofa" : 8 } ] } } }
\ No newline at end of file
+ "2" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "7" : {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [ ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } } ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } },
+ {"_type" : "NonEmptyFSList", "tail" : [ ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } } ],
+ "head" : {"_type" : "RefTypes", "sofa" : 2 } } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-a.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-a.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-a.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-a.txt Fri Nov 4 13:23:50 2016
@@ -1,12 +1,12 @@
{
"_views" : {
"_InitialView" : {
- "FSArray" : [36 ],
+ "FSArray" : [6 ],
"RefTypes" : [
- {"sofa" : 8, "aArrayFS" : 36 }, 15, 22, 29 ] } },
+ {"sofa" : 2, "aArrayFS" : 6 }, 3, 4, 5 ] } },
"_referenced_fss" : {
- "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "36" : {"_type" : "FSArray", "_collection" : [15, 22, 29 ] },
- "15" : {"_type" : "RefTypes", "sofa" : 8 },
- "22" : {"_type" : "RefTypes", "sofa" : 8 },
- "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "2" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "6" : {"_type" : "FSArray", "_collection" : [3, 4, 5 ] },
+ "3" : {"_type" : "RefTypes", "sofa" : 2 },
+ "4" : {"_type" : "RefTypes", "sofa" : 2 },
+ "5" : {"_type" : "RefTypes", "sofa" : 2 } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-l.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-l.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-l.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-l.txt Fri Nov 4 13:23:50 2016
@@ -1,12 +1,15 @@
{
"_views" : {
"_InitialView" : {
- "NonEmptyFSList" : [41 ],
+ "NonEmptyFSList" : [7 ],
"RefTypes" : [
- {"sofa" : 8, "aListFs" : 41 }, 15, 22, 29 ] } },
+ {"sofa" : 2, "aListFs" : 7 }, 3, 4, 5 ] } },
"_referenced_fss" : {
- "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "41" : {"_type" : "NonEmptyFSList", "head" : 15, "tail" : [22, 29 ] },
- "15" : {"_type" : "RefTypes", "sofa" : 8 },
- "22" : {"_type" : "RefTypes", "sofa" : 8 },
- "29" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "2" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "7" : {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [
+ {"_type" : "NonEmptyFSList", "tail" : [ ], "head" : 5 } ], "head" : 4 },
+ {"_type" : "NonEmptyFSList", "tail" : [ ], "head" : 5 } ], "head" : 3 },
+ "5" : {"_type" : "RefTypes", "sofa" : 2 },
+ "4" : {"_type" : "RefTypes", "sofa" : 2 },
+ "3" : {"_type" : "RefTypes", "sofa" : 2 } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedAndRef.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedAndRef.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedAndRef.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedAndRef.txt Fri Nov 4 13:23:50 2016
@@ -2,7 +2,7 @@
"_views" : {
"_InitialView" : {
"RefTypes" : [
- {"sofa" : 8, "aFS" : 15 }, 15 ] } },
+ {"sofa" : 2, "aFS" : 3 }, 3 ] } },
"_referenced_fss" : {
- "8" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "15" : {"_type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
+ "2" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "3" : {"_type" : "RefTypes", "sofa" : 2 } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleList.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleList.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleList.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleList.txt Fri Nov 4 13:23:50 2016
@@ -12,4 +12,4 @@
"_views" : {
"_InitialView" : {
"NonEmptyIntegerList" : [
- {"head" : 11, "tail" : [22, 33 ] } ] } } }
\ No newline at end of file
+ {"tail" : [22, 33 ], "head" : 11 } ] } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleListStatic.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleListStatic.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleListStatic.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleListStatic.txt Fri Nov 4 13:23:50 2016
@@ -12,8 +12,8 @@
"_views" : {
"_InitialView" : {
"NonEmptyIntegerList" : [
- {"head" : 11, "tail" : 5 } ] } },
+ {"tail" : 3, "head" : 11 } ] } },
"_referenced_fss" : {
- "5" : {"_type" : "NonEmptyIntegerList", "head" : 22, "tail" : 2 },
- "2" : {"_type" : "NonEmptyIntegerList", "head" : 33, "tail" : 1 },
+ "3" : {"_type" : "NonEmptyIntegerList", "tail" : 2, "head" : 22 },
+ "2" : {"_type" : "NonEmptyIntegerList", "tail" : 1, "head" : 33 },
"1" : {"_type" : "EmptyIntegerList" } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/multipleViews.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/multipleViews.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/multipleViews.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/multipleViews.txt Fri Nov 4 13:23:50 2016
@@ -8,7 +8,7 @@
"EmptyIntegerList" : {"_id" : "uima.cas.EmptyIntegerList" },
"EmptyStringList" : {"_id" : "uima.cas.EmptyStringList" },
"NonEmptyFSList" : {"_id" : "uima.cas.NonEmptyFSList",
- "_feature_types" : {"head" : "_ref", "tail" : "_ref" } },
+ "_feature_types" : {"tail" : "_ref", "head" : "_ref" } },
"NonEmptyStringList" : {"_id" : "uima.cas.NonEmptyStringList",
"_feature_types" : {"tail" : "_array" } },
"ShortArray" : {"_id" : "uima.cas.ShortArray" },
@@ -36,12 +36,12 @@
"_views" : {
"_InitialView" : {
"AllTypes" : [
- {"sofa" : 29, "aBoolean" : false, "aInteger" : 1, "aLong" : 4321, "aFloat" : "NaN", "aDouble" : "-Infinity", "aString" : "some \"String\"",
- "aFS" : {"_type" : "AllTypes", "sofa" : 29, "aBoolean" : false }, "aArrayBoolean" : [ ], "aArrayMrBoolean" : [false ], "aArrayMrByte" : "AAA=", "aArrayByte" : "", "aArrayShort" : [0, 0 ], "aArrayMrShort" : [ ], "aArrayString" : [ ], "aArrayMrString" : [null ], "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [0 ] } ] },
- "View2" : {
- "AllTypes" : [
- {"sofa" : 185, "aBoolean" : true, "aByte" : -117, "aShort" : -112, "aLong" : 1234, "aFloat" : 1.3, "aDouble" : 2.6, "aString" : "some \"String\"",
- "aFS" : {"_type" : "AllTypes", "sofa" : 185, "aBoolean" : false }, "aArrayBoolean" : [false ], "aArrayMrBoolean" : [false ], "aArrayMrByte" : "AAA=", "aArrayByte" : "D+4=", "aArrayShort" : [ ], "aArrayMrShort" : [ ], "aArrayString" : [null ], "aArrayMrString" : [null ], "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [0 ] } ] } },
+ {"sofa" : 1, "aBoolean" : false, "aInteger" : 1, "aLong" : 4321, "aFloat" : "NaN", "aDouble" : "-Infinity", "aString" : "some \"String\"",
+ "aFS" : {"_type" : "AllTypes", "sofa" : 1, "aBoolean" : false }, "aArrayBoolean" : [ ], "aArrayMrBoolean" : [false ], "aArrayMrByte" : "AAA=", "aArrayByte" : "", "aArrayShort" : [0, 0 ], "aArrayMrShort" : [ ], "aArrayString" : [ ], "aArrayMrString" : [null ], "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [
+ {"_type" : "NonEmptyFSList", "tail" : [ ] } ] },
+ {"sofa" : 1, "aBoolean" : true, "aByte" : -117, "aShort" : -112, "aLong" : 1234, "aFloat" : 1.3, "aDouble" : 2.6, "aString" : "some \"String\"",
+ "aFS" : {"_type" : "AllTypes", "sofa" : 1, "aBoolean" : false }, "aArrayBoolean" : [false ], "aArrayMrBoolean" : [false ], "aArrayMrByte" : "AAA=", "aArrayByte" : "D+4=", "aArrayShort" : [ ], "aArrayMrShort" : [ ], "aArrayString" : [null ], "aArrayMrString" : [null ], "aListInteger" : [ ], "aListString" : ["testStr" ], "aListFs" : [
+ {"_type" : "NonEmptyFSList", "tail" : [ ] } ] } ] },
+ "View2" : { } },
"_referenced_fss" : {
- "29" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
- "185" : {"_type" : "Sofa", "sofaNum" : 2, "sofaID" : "View2" } } }
\ No newline at end of file
+ "1" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision.txt Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"test:Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"test22:Token":{"_id":"org.apache.uima.test2.Token","_feature_types":{"sofa":"_ref"}},"test2:Token":{"_id":"org.apache.uimax.test.Token"},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase","test3:TOP"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["test:Token","test22:Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]},"test3:TOP":{"_id":"org.apache.uima.test.TOP","_subtypes":["test2:Token"]}}},"_views":{"_InitialView":{"test:Token":[{"sofa":5,"begin":0,"end":0}],"test22:Token":[{"sofa":5,"begin":0,"end":0}],"test2:Token":[{}]}},"_referenced_fss":{"5":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
+{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"test:Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"test22:Token":{"_id":"org.apache.uima.test2.Token","_feature_types":{"sofa":"_ref"}},"test2:Token":{"_id":"org.apache.uimax.test.Token"},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase","test3:TOP"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["test:Token","test22:Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]},"test3:TOP":{"_id":"org.apache.uima.test.TOP","_subtypes":["test2:Token"]}}},"_views":{"_InitialView":{"test:Token":[{"sofa":1,"begin":0,"end":0}],"test22:Token":[{"sofa":1,"begin":0,"end":0}],"test2:Token":[{}]}},"_referenced_fss":{"1":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2.txt Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"test:Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"test22:Token":{"_id":"org.apache.uima.test2.Token","_feature_types":{"sofa":"_ref"}},"test2:Token":{"_id":"org.apache.uimax.test.Token"},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase","test3:TOP"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["test:Token","test22:Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]},"test3:TOP":{"_id":"org.apache.uima.test.TOP","_subtypes":["test2:Token"]}}},"_views":{"_InitialView":{"test:Token":[{"sofa":5,"begin":0,"end":0}],"test22:Token":[{"sofa":5,"begin":0,"end":0},{"sofa":5,"begin":0,"end":0}],"test2:Token":[{}]}},"_referenced_fss":{"5":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
+{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"test:Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"test22:Token":{"_id":"org.apache.uima.test2.Token","_feature_types":{"sofa":"_ref"}},"test2:Token":{"_id":"org.apache.uimax.test.Token"},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase","test3:TOP"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["test:Token","test22:Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]},"test3:TOP":{"_id":"org.apache.uima.test.TOP","_subtypes":["test2:Token"]}}},"_views":{"_InitialView":{"test:Token":[{"sofa":1,"begin":0,"end":0}],"test22:Token":[{"sofa":1,"begin":0,"end":0},{"sofa":1,"begin":0,"end":0}],"test2:Token":[{}]}},"_referenced_fss":{"1":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2Omits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2Omits.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2Omits.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2Omits.txt Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"test:Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"test22:Token":{"_id":"org.apache.uima.test2.Token","_feature_types":{"sofa":"_ref"}},"test2:Token":{"_id":"org.apache.uimax.test.Token"},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase","test3:TOP"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["test:Token","test22:Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]},"test3:TOP":{"_id":"org.apache.uima.test.TOP","_subtypes":["test2:Token"]}}},"_views":{"_InitialView":{"test:Token":[{"sofa":5}],"test22:Token":[{"sofa":5},{"sofa":5}],"test2:Token":[{}]}},"_referenced_fss":{"5":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
+{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"test:Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"test22:Token":{"_id":"org.apache.uima.test2.Token","_feature_types":{"sofa":"_ref"}},"test2:Token":{"_id":"org.apache.uimax.test.Token"},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase","test3:TOP"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["test:Token","test22:Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]},"test3:TOP":{"_id":"org.apache.uima.test.TOP","_subtypes":["test2:Token"]}}},"_views":{"_InitialView":{"test:Token":[{"sofa":1}],"test22:Token":[{"sofa":1},{"sofa":1}],"test2:Token":[{}]}},"_referenced_fss":{"1":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2pp.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2pp.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2pp.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2pp.txt Fri Nov 4 13:23:50 2016
@@ -20,11 +20,11 @@
"_views" : {
"_InitialView" : {
"test:Token" : [
- {"sofa" : 5, "begin" : 0, "end" : 0 } ],
+ {"sofa" : 1, "begin" : 0, "end" : 0 } ],
"test22:Token" : [
- {"sofa" : 5, "begin" : 0, "end" : 0 },
- {"sofa" : 5, "begin" : 0, "end" : 0 } ],
+ {"sofa" : 1, "begin" : 0, "end" : 0 },
+ {"sofa" : 1, "begin" : 0, "end" : 0 } ],
"test2:Token" : [
{ } ] } },
"_referenced_fss" : {
- "5" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
+ "1" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2ppOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2ppOmits.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2ppOmits.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollision2ppOmits.txt Fri Nov 4 13:23:50 2016
@@ -20,11 +20,11 @@
"_views" : {
"_InitialView" : {
"test:Token" : [
- {"sofa" : 5 } ],
+ {"sofa" : 1 } ],
"test22:Token" : [
- {"sofa" : 5 },
- {"sofa" : 5 } ],
+ {"sofa" : 1 },
+ {"sofa" : 1 } ],
"test2:Token" : [
{ } ] } },
"_referenced_fss" : {
- "5" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
+ "1" : {"_type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollisionOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollisionOmits.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollisionOmits.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollisionOmits.txt Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"test:Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"test22:Token":{"_id":"org.apache.uima.test2.Token","_feature_types":{"sofa":"_ref"}},"test2:Token":{"_id":"org.apache.uimax.test.Token"},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase","test3:TOP"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["test:Token","test22:Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]},"test3:TOP":{"_id":"org.apache.uima.test.TOP","_subtypes":["test2:Token"]}}},"_views":{"_InitialView":{"test:Token":[{"sofa":5}],"test22:Token":[{"sofa":5}],"test2:Token":[{}]}},"_referenced_fss":{"5":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
+{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"test:Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"test22:Token":{"_id":"org.apache.uima.test2.Token","_feature_types":{"sofa":"_ref"}},"test2:Token":{"_id":"org.apache.uimax.test.Token"},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase","test3:TOP"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["test:Token","test22:Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]},"test3:TOP":{"_id":"org.apache.uima.test.TOP","_subtypes":["test2:Token"]}}},"_views":{"_InitialView":{"test:Token":[{"sofa":1}],"test22:Token":[{"sofa":1}],"test2:Token":[{}]}},"_referenced_fss":{"1":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollsionFiltered.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollsionFiltered.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollsionFiltered.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollsionFiltered.txt Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"test:Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"test2:Token":{"_id":"org.apache.uimax.test.Token"},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase","test3:TOP"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["test:Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]},"test3:TOP":{"_id":"org.apache.uima.test.TOP","_subtypes":["test2:Token"]}}},"_views":{"_InitialView":{"test:Token":[{"sofa":5}],"test2:Token":[{}]}},"_referenced_fss":{"5":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
+{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"test:Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"test2:Token":{"_id":"org.apache.uimax.test.Token"},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase","test3:TOP"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["test:Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]},"test3:TOP":{"_id":"org.apache.uima.test.TOP","_subtypes":["test2:Token"]}}},"_views":{"_InitialView":{"test:Token":[{"sofa":1}],"test2:Token":[{}]}},"_referenced_fss":{"1":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceNoCollsionFiltered.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceNoCollsionFiltered.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceNoCollsionFiltered.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceNoCollsionFiltered.txt Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]}}},"_views":{"_InitialView":{"Token":[{"sofa":5}]}},"_referenced_fss":{"5":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
+{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]}}},"_views":{"_InitialView":{"Token":[{"sofa":1}]}},"_referenced_fss":{"1":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnly.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnly.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnly.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnly.txt Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase"]},"Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]}}},"_views":{"_InitialView":{"TOP":[{}],"Token":[{"sofa":6}]}},"_referenced_fss":{"6":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
+{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase"]},"Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]}}},"_views":{"_InitialView":{"TOP":[{}],"Token":[{"sofa":2}]}},"_referenced_fss":{"2":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoContext.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoContext.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoContext.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoContext.txt Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-{"_views":{"_InitialView":{"TOP":[{}],"Token":[{"sofa":6}]}},"_referenced_fss":{"6":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
+{"_views":{"_InitialView":{"TOP":[{}],"Token":[{"sofa":2}]}},"_referenced_fss":{"2":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoExpandedTypeNames.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoExpandedTypeNames.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoExpandedTypeNames.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoExpandedTypeNames.txt Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-{"_context":{"_types":{"Sofa":{"_feature_types":{"sofaArray":"_ref"}},"TOP":{"_subtypes":["Sofa","AnnotationBase"]},"Token":{"_feature_types":{"sofa":"_ref"}},"Annotation":{"_feature_types":{"sofa":"_ref"},"_subtypes":["Token"]},"AnnotationBase":{"_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]}}},"_views":{"_InitialView":{"TOP":[{}],"Token":[{"sofa":6}]}},"_referenced_fss":{"6":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
+{"_context":{"_types":{"Sofa":{"_feature_types":{"sofaArray":"_ref"}},"TOP":{"_subtypes":["Sofa","AnnotationBase"]},"Token":{"_feature_types":{"sofa":"_ref"}},"Annotation":{"_feature_types":{"sofa":"_ref"},"_subtypes":["Token"]},"AnnotationBase":{"_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]}}},"_views":{"_InitialView":{"TOP":[{}],"Token":[{"sofa":2}]}},"_referenced_fss":{"2":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoSubtypes.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoSubtypes.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoSubtypes.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoSubtypes.txt Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"TOP":{"_id":"uima.cas.TOP"},"Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"}},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"}}}},"_views":{"_InitialView":{"TOP":[{}],"Token":[{"sofa":6}]}},"_referenced_fss":{"6":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
+{"_context":{"_types":{"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"TOP":{"_id":"uima.cas.TOP"},"Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"}},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"}}}},"_views":{"_InitialView":{"TOP":[{}],"Token":[{"sofa":2}]}},"_referenced_fss":{"2":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithDefaultViewOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithDefaultViewOmits.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithDefaultViewOmits.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithDefaultViewOmits.txt Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-{"_context":{"_types":{"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"}},"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"}},"TOP":{"_id":"uima.cas.TOP"}}},"_views":{"_InitialView":{"Annotation":[{"sofa":5}]}},"_referenced_fss":{"5":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
+{"_context":{"_types":{"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"}},"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"}},"TOP":{"_id":"uima.cas.TOP"}}},"_views":{"_InitialView":{"Annotation":[{"sofa":1}]}},"_referenced_fss":{"1":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithNamedViewOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithNamedViewOmits.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithNamedViewOmits.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithNamedViewOmits.txt Fri Nov 4 13:23:50 2016
@@ -1 +1 @@
-{"_context":{"_types":{"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"}},"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"TOP":{"_id":"uima.cas.TOP"},"Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"}},"TOP":{"_id":"uima.cas.TOP"},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"}}}},"_views":{"_InitialView":{"TOP":[{}],"Token":[{"sofa":6}]},"basicView":{"Annotation":[{"sofa":13}]}},"_referenced_fss":{"6":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"},"13":{"_type":"Sofa","sofaNum":2,"sofaID":"basicView"}}}
\ No newline at end of file
+{"_context":{"_types":{"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"}},"Sofa":{"_id":"uima.cas.Sofa","_feature_types":{"sofaArray":"_ref"}},"TOP":{"_id":"uima.cas.TOP"},"Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"}},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"}}}},"_views":{"_InitialView":{"TOP":[{}],"Token":[{"sofa":2}]},"basicView":{"Annotation":[{"sofa":4}]}},"_referenced_fss":{"2":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"},"4":{"_type":"Sofa","sofaNum":2,"sofaID":"basicView"}}}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMerge.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMerge.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMerge.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMerge.txt Fri Nov 4 13:23:50 2016
@@ -12,7 +12,7 @@
"_views" : {
"_InitialView" : {
"NonEmptyIntegerList" : [
- {"head" : 11, "tail" : 5 },
- {"head" : 110, "tail" : 5 } ] } },
+ {"tail" : 3, "head" : 11 },
+ {"tail" : 3, "head" : 110 } ] } },
"_referenced_fss" : {
- "5" : {"_type" : "NonEmptyIntegerList", "head" : 22, "tail" : [33 ] } } }
\ No newline at end of file
+ "3" : {"_type" : "NonEmptyIntegerList", "tail" : [33 ], "head" : 22 } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMergeStatic.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMergeStatic.txt?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMergeStatic.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMergeStatic.txt Fri Nov 4 13:23:50 2016
@@ -12,9 +12,9 @@
"_views" : {
"_InitialView" : {
"NonEmptyIntegerList" : [
- {"head" : 11, "tail" : 5 },
- {"head" : 110, "tail" : 5 } ] } },
+ {"tail" : 3, "head" : 11 },
+ {"tail" : 3, "head" : 110 } ] } },
"_referenced_fss" : {
- "5" : {"_type" : "NonEmptyIntegerList", "head" : 22, "tail" : 2 },
- "2" : {"_type" : "NonEmptyIntegerList", "head" : 33, "tail" : 1 },
+ "3" : {"_type" : "NonEmptyIntegerList", "tail" : 2, "head" : 22 },
+ "2" : {"_type" : "NonEmptyIntegerList", "tail" : 1, "head" : 33 },
"1" : {"_type" : "EmptyIntegerList" } } }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesNoOmits.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesNoOmits.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesNoOmits.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesNoOmits.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/allValuesOmits.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesOmits.xml?rev=1768027&r1=1768026&r2=1768027&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesOmits.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesOmits.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>