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 2014/11/21 16:15:12 UTC
svn commit: r1640932 [2/2] - in /uima/uimaj/trunk:
uima-docbook-references/src/docbook/
uimaj-json/src/main/java/org/apache/uima/json/
uimaj-json/src/test/java/org/apache/uima/json/
uimaj-json/src/test/resources/CasSerialization/expected/json/
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollsionFiltered.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollsionFiltered.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollsionFiltered.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollsionFiltered.txt Fri Nov 21 15:15:11 2014
@@ -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","@feature_types":{"sofa":"@ref"}},"TOP":{"@id":"uima.cas.TOP","@subtypes":["Sofa","AnnotationBase"]},"Annotation":{"@id":"uima.tcas.Annotation","@feature_types":{"sofa":"@ref"},"@subtypes":["test:Token","test2:Token"]},"AnnotationBase":{"@id":"uima.cas.AnnotationBase","@feature_types":{"sofa":"@ref"},"@subtypes":["Annotation"]}}},"@views":{"_InitialView":{"test:Token":[{"sofa":5}],"test2: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"}},"test:Token":{"_id":"org.apache.uima.test.Token","_feature_types":{"sofa":"_ref"}},"test2:Token":{"_id":"org.apache.uimax.test.Token","_feature_types":{"sofa":"_ref"}},"TOP":{"_id":"uima.cas.TOP","_subtypes":["Sofa","AnnotationBase"]},"Annotation":{"_id":"uima.tcas.Annotation","_feature_types":{"sofa":"_ref"},"_subtypes":["test:Token","test2:Token"]},"AnnotationBase":{"_id":"uima.cas.AnnotationBase","_feature_types":{"sofa":"_ref"},"_subtypes":["Annotation"]}}},"_views":{"_InitialView":{"test:Token":[{"sofa":5}],"test2:Token":[{"sofa":5}]}},"_referenced_fss":{"5":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceNoCollsionFiltered.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceNoCollsionFiltered.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceNoCollsionFiltered.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceNoCollsionFiltered.txt Fri Nov 21 15:15:11 2014
@@ -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":5}]}},"_referenced_fss":{"5":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnly.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnly.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnly.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnly.txt Fri Nov 21 15:15:11 2014
@@ -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":6}]}},"_referenced_fss":{"6":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoContext.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoContext.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoContext.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoContext.txt Fri Nov 21 15:15:11 2014
@@ -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":6}]}},"_referenced_fss":{"6":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoExpandedTypeNames.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoExpandedTypeNames.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoExpandedTypeNames.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoExpandedTypeNames.txt Fri Nov 21 15:15:11 2014
@@ -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":6}]}},"_referenced_fss":{"6":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoSubtypes.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoSubtypes.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoSubtypes.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topAndTokenOnlyNoSubtypes.txt Fri Nov 21 15:15:11 2014
@@ -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":6}]}},"_referenced_fss":{"6":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topExpandedNamesNoViews.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topExpandedNamesNoViews.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topExpandedNamesNoViews.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topExpandedNamesNoViews.txt Fri Nov 21 15:15:11 2014
@@ -1 +1 @@
-{"@context":{"@type_system":"A URI to TypeSystem","@types":{"TOP":{"@id":"uima.cas.TOP"}}},"@views":{"_InitialView":{"TOP":[{}]}}}
\ No newline at end of file
+{"_context":{"_type_system":"A URI to TypeSystem","_types":{"TOP":{"_id":"uima.cas.TOP"}}},"_views":{"_InitialView":{"TOP":[{}]}}}
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topNoContext.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topNoContext.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topNoContext.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topNoContext.txt Fri Nov 21 15:15:11 2014
@@ -1 +1 @@
-{"@views":{"_InitialView":{"TOP":[{}]}}}
\ No newline at end of file
+{"_views":{"_InitialView":{"TOP":[{}]}}}
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topNoExpandedTypeNames.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topNoExpandedTypeNames.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topNoExpandedTypeNames.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topNoExpandedTypeNames.txt Fri Nov 21 15:15:11 2014
@@ -1 +1 @@
-{"@context":{"@type_system":"A URI to TypeSystem","@types":{"TOP":{}}},"@views":{"_InitialView":{"TOP":[{}]}}}
\ No newline at end of file
+{"_context":{"_type_system":"A URI to TypeSystem","_types":{"TOP":{}}},"_views":{"_InitialView":{"TOP":[{}]}}}
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithDefaultViewOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithDefaultViewOmits.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithDefaultViewOmits.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithDefaultViewOmits.txt Fri Nov 21 15:15:11 2014
@@ -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":5}]}},"_referenced_fss":{"5":{"_type":"Sofa","sofaNum":1,"sofaID":"_InitialView"}}}
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithNamedViewOmits.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithNamedViewOmits.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithNamedViewOmits.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/topWithNamedViewOmits.txt Fri Nov 21 15:15:11 2014
@@ -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"}},"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
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMerge.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMerge.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMerge.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMerge.txt Fri Nov 21 15:15:11 2014
@@ -1,18 +1,18 @@
-{"@context" : {
- "@types" : {
- "EmptyIntegerList" : {"@id" : "uima.cas.EmptyIntegerList" },
- "NonEmptyIntegerList" : {"@id" : "uima.cas.NonEmptyIntegerList",
- "@feature_types" : {"tail" : "@array" } },
- "IntegerList" : {"@id" : "uima.cas.IntegerList",
- "@subtypes" : ["EmptyIntegerList", "NonEmptyIntegerList" ] },
- "ListBase" : {"@id" : "uima.cas.ListBase",
- "@subtypes" : ["IntegerList" ] },
- "TOP" : {"@id" : "uima.cas.TOP",
- "@subtypes" : ["ListBase" ] } } },
- "@views" : {
+{"_context" : {
+ "_types" : {
+ "EmptyIntegerList" : {"_id" : "uima.cas.EmptyIntegerList" },
+ "NonEmptyIntegerList" : {"_id" : "uima.cas.NonEmptyIntegerList",
+ "_feature_types" : {"tail" : "_array" } },
+ "IntegerList" : {"_id" : "uima.cas.IntegerList",
+ "_subtypes" : ["EmptyIntegerList", "NonEmptyIntegerList" ] },
+ "ListBase" : {"_id" : "uima.cas.ListBase",
+ "_subtypes" : ["IntegerList" ] },
+ "TOP" : {"_id" : "uima.cas.TOP",
+ "_subtypes" : ["ListBase" ] } } },
+ "_views" : {
"_InitialView" : {
"NonEmptyIntegerList" : [
{"head" : 11, "tail" : 5 },
{"head" : 110, "tail" : 5 } ] } },
- "@referenced_fss" : {
- "5" : {"@type" : "NonEmptyIntegerList", "head" : 22, "tail" : [33 ] } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "5" : {"_type" : "NonEmptyIntegerList", "head" : 22, "tail" : [33 ] } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMergeStatic.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMergeStatic.txt?rev=1640932&r1=1640931&r2=1640932&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMergeStatic.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMergeStatic.txt Fri Nov 21 15:15:11 2014
@@ -1,20 +1,20 @@
-{"@context" : {
- "@types" : {
- "EmptyIntegerList" : {"@id" : "uima.cas.EmptyIntegerList" },
- "NonEmptyIntegerList" : {"@id" : "uima.cas.NonEmptyIntegerList",
- "@feature_types" : {"tail" : "@array" } },
- "IntegerList" : {"@id" : "uima.cas.IntegerList",
- "@subtypes" : ["EmptyIntegerList", "NonEmptyIntegerList" ] },
- "ListBase" : {"@id" : "uima.cas.ListBase",
- "@subtypes" : ["IntegerList" ] },
- "TOP" : {"@id" : "uima.cas.TOP",
- "@subtypes" : ["ListBase" ] } } },
- "@views" : {
+{"_context" : {
+ "_types" : {
+ "EmptyIntegerList" : {"_id" : "uima.cas.EmptyIntegerList" },
+ "NonEmptyIntegerList" : {"_id" : "uima.cas.NonEmptyIntegerList",
+ "_feature_types" : {"tail" : "_array" } },
+ "IntegerList" : {"_id" : "uima.cas.IntegerList",
+ "_subtypes" : ["EmptyIntegerList", "NonEmptyIntegerList" ] },
+ "ListBase" : {"_id" : "uima.cas.ListBase",
+ "_subtypes" : ["IntegerList" ] },
+ "TOP" : {"_id" : "uima.cas.TOP",
+ "_subtypes" : ["ListBase" ] } } },
+ "_views" : {
"_InitialView" : {
"NonEmptyIntegerList" : [
{"head" : 11, "tail" : 5 },
{"head" : 110, "tail" : 5 } ] } },
- "@referenced_fss" : {
- "5" : {"@type" : "NonEmptyIntegerList", "head" : 22, "tail" : 2 },
- "2" : {"@type" : "NonEmptyIntegerList", "head" : 33, "tail" : 1 },
- "1" : {"@type" : "EmptyIntegerList" } } }
\ No newline at end of file
+ "_referenced_fss" : {
+ "5" : {"_type" : "NonEmptyIntegerList", "head" : 22, "tail" : 2 },
+ "2" : {"_type" : "NonEmptyIntegerList", "head" : 33, "tail" : 1 },
+ "1" : {"_type" : "EmptyIntegerList" } } }
\ No newline at end of file