Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollisionOmits.txt URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollisionOmits.txt?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollisionOmits.txt (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollisionOmits.txt Sun Nov 2 21:17:33 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"}},"test22:Token":{"@id":"org.apache.uima.test2.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","test22:Token","test2:Token"]},"AnnotationBase":{"@id":"uima.cas.AnnotationBase","@feature_types":{"sofa":"@ref"},"@subtypes":["Annotation"]}}},"@views":{"5":{"test:Token":[{"sofa":5}],"test22: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"}},"test22:Token":{"@id":"org.apache.uima.test2.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","test22:Token","test2:Token"]},"AnnotationBase":{"@id":"uima.cas.AnnotationBase","@feature_types":{"sofa":"@ref"},"@subtypes":["Annotation"]}}},"@views":{"_InitialView":{"test:Token":[{"sofa":5}],"test22: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/nameSpaceCollsionFiltered.txt URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/nameSpaceCollsionFiltered.txt?rev=1636198&r1=1636197&r2=1636198&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 Sun Nov 2 21:17:33 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":{"5":{"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=1636198&r1=1636197&r2=1636198&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 Sun Nov 2 21:17:33 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":{"5":{"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=1636198&r1=1636197&r2=1636198&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 Sun Nov 2 21:17:33 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":{"6":{"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=1636198&r1=1636197&r2=1636198&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 Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -{"@views":{"6":{"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=1636198&r1=1636197&r2=1636198&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 Sun Nov 2 21:17:33 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":{"6":{"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=1636198&r1=1636197&r2=1636198&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 Sun Nov 2 21:17:33 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":{"6":{"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=1636198&r1=1636197&r2=1636198&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 Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -{"@context":{"@type_system":"A URI to TypeSystem","@types":{"TOP":{"@id":"uima.cas.TOP"}}},"@views":{"0":{"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=1636198&r1=1636197&r2=1636198&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 Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -{"@views":{"0":{"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=1636198&r1=1636197&r2=1636198&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 Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -{"@context":{"@type_system":"A URI to TypeSystem","@types":{"TOP":{}}},"@views":{"0":{"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=1636198&r1=1636197&r2=1636198&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 Sun Nov 2 21:17:33 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":{"5":{"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=1636198&r1=1636197&r2=1636198&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 Sun Nov 2 21:17:33 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":{"6":{"TOP":[{}],"Token":[{"sofa":6}]},"13":{"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=1636198&r1=1636197&r2=1636198&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 Sun Nov 2 21:17:33 2014 @@ -10,7 +10,7 @@ "TOP" : {"@id" : "uima.cas.TOP", "@subtypes" : ["ListBase" ] } } }, "@views" : { - "0" : { + "_InitialView" : { "NonEmptyIntegerList" : [ {"head" : 11, "tail" : 5 }, {"head" : 110, "tail" : 5 } ] } }, 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=1636198&r1=1636197&r2=1636198&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 Sun Nov 2 21:17:33 2014 @@ -10,7 +10,7 @@ "TOP" : {"@id" : "uima.cas.TOP", "@subtypes" : ["ListBase" ] } } }, "@views" : { - "0" : { + "_InitialView" : { "NonEmptyIntegerList" : [ {"head" : 11, "tail" : 5 }, {"head" : 110, "tail" : 5 } ] } }, Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesNoOmits.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesNoOmits.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesNoOmits.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesNoOmits.xml Sun Nov 2 21:17:33 2014 @@ -1,16 +1,16 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"> +<?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"> <cas:NULL xmi:id="0"/> - <test:AllTypes xmi:id="1" sofa="28" begin="0" end="0" aBoolean="true" aByte="-117" aShort="-112" aInteger="0" aLong="1234" aFloat="1.3" aDouble="2.6" aString="some "String"" aFS="35" aArrayBoolean="false" aArrayMrBoolean="74" aArrayMrByte="77" aArrayByte="0FEE" aArrayShort="" aArrayMrShort="80" aArrayMrString="83" aListInteger="" aListFs="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"> <aArrayString/> <aListString>testStr</aListString> </test:AllTypes> - <cas:Sofa xmi:id="28" sofaNum="1" sofaID="_InitialView"/> - <test:AllTypes xmi:id="35" sofa="28" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="0" aLong="0" aFloat="0.0" aDouble="0.0"/> - <cas:BooleanArray xmi:id="74" elements="false"/> - <cas:ByteArray xmi:id="77" elements="0000"/> - <cas:ShortArray xmi:id="80" elements=""/> - <cas:StringArray xmi:id="83"> + <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"> <elements/> </cas:StringArray> - <cas:View sofa="28" members="1"/> + <cas:View sofa="29" members="1"/> </xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesOmits.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesOmits.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesOmits.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesOmits.xml Sun Nov 2 21:17:33 2014 @@ -1,16 +1,16 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"> +<?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"> <cas:NULL xmi:id="0"/> - <test:AllTypes xmi:id="1" sofa="28" begin="0" end="0" aBoolean="true" aByte="-117" aShort="-112" aInteger="0" aLong="1234" aFloat="1.3" aDouble="2.6" aString="some "String"" aFS="35" aArrayBoolean="false" aArrayMrBoolean="74" aArrayMrByte="77" aArrayByte="0FEE" aArrayShort="" aArrayMrShort="80" aArrayMrString="83" aListInteger="" aListFs="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"> <aArrayString/> <aListString>testStr</aListString> </test:AllTypes> - <cas:Sofa xmi:id="28" sofaNum="1" sofaID="_InitialView"/> - <test:AllTypes xmi:id="35" sofa="28" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="0" aLong="0" aFloat="0.0" aDouble="0.0"/> - <cas:BooleanArray xmi:id="74" elements="false"/> - <cas:ByteArray xmi:id="77" elements="0000"/> - <cas:ShortArray xmi:id="80" elements=""/> - <cas:StringArray xmi:id="83"> + <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"> <elements/> </cas:StringArray> - <cas:View sofa="28" members="1"/> + <cas:View sofa="29" members="1"/> </xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesStaticNoOmits.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesStaticNoOmits.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesStaticNoOmits.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/allValuesStaticNoOmits.xml Sun Nov 2 21:17:33 2014 @@ -1,16 +1,16 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"> +<?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"> <cas:NULL xmi:id="0"/> - <test:AllTypes xmi:id="1" sofa="28" begin="0" end="0" aBoolean="true" aByte="-117" aShort="-112" aInteger="0" aLong="1234" aFloat="1.3" aDouble="2.6" aString="some "String"" aFS="35" aArrayBoolean="false" aArrayMrBoolean="74" aArrayMrByte="77" aArrayByte="0FEE" aArrayShort="" aArrayMrShort="80" aArrayMrString="83" aListInteger="" aListFs="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"> <aArrayString/> <aListString>testStr</aListString> </test:AllTypes> - <cas:Sofa xmi:id="28" sofaNum="1" sofaID="_InitialView"/> - <test:AllTypes xmi:id="35" sofa="28" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="0" aLong="0" aFloat="0.0" aDouble="0.0"/> - <cas:BooleanArray xmi:id="74" elements="false"/> - <cas:ByteArray xmi:id="77" elements="0000"/> - <cas:ShortArray xmi:id="80" elements=""/> - <cas:StringArray xmi:id="83"> + <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"> <elements/> </cas:StringArray> - <cas:View sofa="28" members="1"/> + <cas:View sofa="29" members="1"/> </xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/emptyCAS.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/emptyCAS.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/emptyCAS.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/emptyCAS.xml Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"><cas:NULL xmi:id="0"/></xmi:XMI> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"><cas:NULL xmi:id="0"/></xmi:XMI> \ No newline at end of file Added: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedAndRef.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedAndRef.xml?rev=1636198&view=auto ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedAndRef.xml (added) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedAndRef.xml Sun Nov 2 21:17:33 2014 @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"> + <cas:NULL xmi:id="0"/> + <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aFS="15"/> + <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/> + <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/> + <cas:View sofa="8" members="1 15"/> +</xmi:XMI> \ No newline at end of file Added: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedAndRefEmbed.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedAndRefEmbed.xml?rev=1636198&view=auto ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedAndRefEmbed.xml (added) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedAndRefEmbed.xml Sun Nov 2 21:17:33 2014 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"> + <cas:NULL xmi:id="0"/> + <test:RefTypes xmi:id="1" sofa="8" begin="0" end="0" aFS="15"/> + <test:RefTypes xmi:id="15" sofa="8" begin="0" end="0" aFS="22"/> + <cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/> + <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/> + <cas:View sofa="8" members="1 15"/> +</xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleList.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleList.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleList.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleList.xml Sun Nov 2 21:17:33 2014 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"> +<?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"> <cas:NULL xmi:id="0"/> <cas:NonEmptyIntegerList xmi:id="8" head="11" tail="5"/> <cas:NonEmptyIntegerList xmi:id="5" head="22" tail="2"/> Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleListStatic.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleListStatic.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleListStatic.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleListStatic.xml Sun Nov 2 21:17:33 2014 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"> +<?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"> <cas:NULL xmi:id="0"/> <cas:NonEmptyIntegerList xmi:id="8" head="11" tail="5"/> <cas:NonEmptyIntegerList xmi:id="5" head="22" tail="2"/> Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/multipleViews.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/multipleViews.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/multipleViews.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/multipleViews.xml Sun Nov 2 21:17:33 2014 @@ -1,28 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"> +<?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"> <cas:NULL xmi:id="0"/> - <test:AllTypes xmi:id="1" sofa="28" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="1" aLong="4321" aFloat="NaN" aDouble="-Infinity" aString="some "String"" aFS="35" aArrayBoolean="" aArrayMrBoolean="73" aArrayMrByte="76" aArrayByte="" aArrayShort="0 0" aArrayMrShort="79" aArrayMrString="82" aListInteger="" aListFs="0"> + <test:AllTypes xmi:id="1" sofa="29" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="1" aLong="4321" aFloat="NaN" aDouble="-Infinity" aString="some "String"" aFS="36" aArrayBoolean="" aArrayMrBoolean="164" aArrayMrByte="167" aArrayByte="" aArrayShort="0 0" aArrayMrShort="170" aArrayMrString="173" aListInteger="" aListFs="0"> <aListString>testStr</aListString> </test:AllTypes> - <test:AllTypes xmi:id="101" sofa="94" begin="0" end="0" aBoolean="true" aByte="-117" aShort="-112" aInteger="0" aLong="1234" aFloat="1.3" aDouble="2.6" aString="some "String"" aFS="128" aArrayBoolean="false" aArrayMrBoolean="167" aArrayMrByte="170" aArrayByte="0FEE" aArrayShort="" aArrayMrShort="173" aArrayMrString="176" aListInteger="" aListFs="0"> + <test:AllTypes xmi:id="192" sofa="185" begin="0" end="0" aBoolean="true" aByte="-117" aShort="-112" aInteger="0" aLong="1234" aFloat="1.3" aDouble="2.6" aString="some "String"" aFS="220" aArrayBoolean="false" aArrayMrBoolean="349" aArrayMrByte="352" aArrayByte="0FEE" aArrayShort="" aArrayMrShort="355" aArrayMrString="358" aListInteger="" aListFs="0"> <aArrayString/> <aListString>testStr</aListString> </test:AllTypes> - <cas:Sofa xmi:id="28" sofaNum="1" sofaID="_InitialView"/> - <cas:Sofa xmi:id="94" sofaNum="2" sofaID="View2"/> - <test:AllTypes xmi:id="35" sofa="28" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="0" aLong="0" aFloat="0.0" aDouble="0.0"/> - <cas:BooleanArray xmi:id="73" elements="false"/> - <cas:ByteArray xmi:id="76" elements="0000"/> - <cas:ShortArray xmi:id="79" elements=""/> - <cas:StringArray xmi:id="82"> + <cas:Sofa xmi:id="29" sofaNum="1" sofaID="_InitialView"/> + <cas:Sofa xmi:id="185" sofaNum="2" sofaID="View2"/> + <test:AllTypes xmi:id="36" sofa="29" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="0" aLong="0" aFloat="0.0" aDouble="0.0"/> + <cas:BooleanArray xmi:id="164" elements="false"/> + <cas:ByteArray xmi:id="167" elements="0000"/> + <cas:ShortArray xmi:id="170" elements=""/> + <cas:StringArray xmi:id="173"> <elements/> </cas:StringArray> - <test:AllTypes xmi:id="128" sofa="94" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="0" aLong="0" aFloat="0.0" aDouble="0.0"/> - <cas:BooleanArray xmi:id="167" elements="false"/> - <cas:ByteArray xmi:id="170" elements="0000"/> - <cas:ShortArray xmi:id="173" elements=""/> - <cas:StringArray xmi:id="176"> + <test:AllTypes xmi:id="220" sofa="185" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="0" aLong="0" aFloat="0.0" aDouble="0.0"/> + <cas:BooleanArray xmi:id="349" elements="false"/> + <cas:ByteArray xmi:id="352" elements="0000"/> + <cas:ShortArray xmi:id="355" elements=""/> + <cas:StringArray xmi:id="358"> <elements/> </cas:StringArray> - <cas:View sofa="28" members="1"/> - <cas:View sofa="94" members="101"/> + <cas:View sofa="29" members="1"/> + <cas:View sofa="185" members="192"/> </xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision.xml Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12" sofa="5" begin="0" end="0"/><test2:Token xmi:id="16" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 16"/></xmi:XMI> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12" sofa="5" begin="0" end="0"/><test2:Token xmi:id="16" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 16"/></xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2.xml Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12" sofa="5" begin="0" end="0"/><test2:Token xmi:id="16" sofa="5" begin="0" end="0"/><test2:Token xmi:id="20" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 16 20"/></xmi:XMI> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12" sofa="5" begin="0" end="0"/><test2:Token xmi:id="16" sofa="5" begin="0" end="0"/><test2:Token xmi:id="20" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 16 20"/></xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2Omits.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2Omits.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2Omits.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2Omits.xml Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12" sofa="5" begin="0" end="0"/><test2:Token xmi:id="16" sofa="5" begin="0" end="0"/><test2:Token xmi:id="20" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 16 20"/></xmi:XMI> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12" sofa="5" begin="0" end="0"/><test2:Token xmi:id="16" sofa="5" begin="0" end="0"/><test2:Token xmi:id="20" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 16 20"/></xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2pp.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2pp.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2pp.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2pp.xml Sun Nov 2 21:17:33 2014 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"> +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"> <cas:NULL xmi:id="0"/> <test:Token xmi:id="1" sofa="5" begin="0" end="0"/> <test3:Token xmi:id="12" sofa="5" begin="0" end="0"/> Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2ppOmits.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2ppOmits.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2ppOmits.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2ppOmits.xml Sun Nov 2 21:17:33 2014 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"> +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"> <cas:NULL xmi:id="0"/> <test:Token xmi:id="1" sofa="5" begin="0" end="0"/> <test3:Token xmi:id="12" sofa="5" begin="0" end="0"/> Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollisionOmits.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollisionOmits.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollisionOmits.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollisionOmits.xml Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12" sofa="5" begin="0" end="0"/><test2:Token xmi:id="16" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 16"/></xmi:XMI> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12" sofa="5" begin="0" end="0"/><test2:Token xmi:id="16" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 16"/></xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollsionFiltered.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollsionFiltered.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollsionFiltered.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollsionFiltered.xml Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12"/></xmi:XMI> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12"/></xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceNoCollsionFiltered.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceNoCollsionFiltered.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceNoCollsionFiltered.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceNoCollsionFiltered.xml Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1"/></xmi:XMI> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1"/></xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnly.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnly.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnly.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnly.xml Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="2" sofa="6" begin="0" end="0"/><cas:Sofa xmi:id="6" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="6" members="1 2"/></xmi:XMI> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="2" sofa="6" begin="0" end="0"/><cas:Sofa xmi:id="6" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="6" members="1 2"/></xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoContext.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoContext.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoContext.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoContext.xml Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="2" sofa="6" begin="0" end="0"/><cas:Sofa xmi:id="6" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="6" members="1 2"/></xmi:XMI> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="2" sofa="6" begin="0" end="0"/><cas:Sofa xmi:id="6" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="6" members="1 2"/></xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoExpandedTypeNames.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoExpandedTypeNames.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoExpandedTypeNames.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoExpandedTypeNames.xml Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="2" sofa="6" begin="0" end="0"/><cas:Sofa xmi:id="6" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="6" members="1 2"/></xmi:XMI> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="2" sofa="6" begin="0" end="0"/><cas:Sofa xmi:id="6" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="6" members="1 2"/></xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoSubtypes.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoSubtypes.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoSubtypes.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topAndTokenOnlyNoSubtypes.xml Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="2" sofa="6" begin="0" end="0"/><cas:Sofa xmi:id="6" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="6" members="1 2"/></xmi:XMI> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="2" sofa="6" begin="0" end="0"/><cas:Sofa xmi:id="6" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="6" members="1 2"/></xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topExpandedNamesNoViews.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topExpandedNamesNoViews.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topExpandedNamesNoViews.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topExpandedNamesNoViews.xml Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><cas:View members="1"/></xmi:XMI> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><cas:View members="1"/></xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoContext.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoContext.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoContext.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoContext.xml Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><cas:View members="1"/></xmi:XMI> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><cas:View members="1"/></xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoExpandedTypeNames.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoExpandedTypeNames.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoExpandedTypeNames.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topNoExpandedTypeNames.xml Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><cas:View members="1"/></xmi:XMI> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><cas:View members="1"/></xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithDefaultViewOmits.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithDefaultViewOmits.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithDefaultViewOmits.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithDefaultViewOmits.xml Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"><cas:NULL xmi:id="0"/><tcas:Annotation xmi:id="1" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1"/></xmi:XMI> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"><cas:NULL xmi:id="0"/><tcas:Annotation xmi:id="1" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1"/></xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithNamedViewOmits.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithNamedViewOmits.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithNamedViewOmits.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/topWithNamedViewOmits.xml Sun Nov 2 21:17:33 2014 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="2" sofa="6" begin="0" end="0"/><tcas:Annotation xmi:id="20" sofa="13" begin="0" end="0"/><cas:Sofa xmi:id="6" sofaNum="1" sofaID="_InitialView"/><cas:Sofa xmi:id="13" sofaNum="2" sofaID="basicView"/><cas:View sofa="6" members="1 2"/><cas:View sofa="13" members="20"/></xmi:XMI> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:test2="http:///org/apache/uima/test2.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:TOP xmi:id="1"/><test:Token xmi:id="2" sofa="6" begin="0" end="0"/><tcas:Annotation xmi:id="20" sofa="13" begin="0" end="0"/><cas:Sofa xmi:id="6" sofaNum="1" sofaID="_InitialView"/><cas:Sofa xmi:id="13" sofaNum="2" sofaID="basicView"/><cas:View sofa="6" members="1 2"/><cas:View sofa="13" members="20"/></xmi:XMI> \ No newline at end of file Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMerge.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMerge.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMerge.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMerge.xml Sun Nov 2 21:17:33 2014 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"> +<?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"> <cas:NULL xmi:id="0"/> <cas:NonEmptyIntegerList xmi:id="8" head="11" tail="5"/> <cas:NonEmptyIntegerList xmi:id="11" head="110" tail="5"/> Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMergeStatic.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMergeStatic.xml?rev=1636198&r1=1636197&r2=1636198&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMergeStatic.xml (original) +++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMergeStatic.xml Sun Nov 2 21:17:33 2014 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:tcas="http:///uima/tcas.ecore"; xmlns:cas="http:///uima/cas.ecore"; xmlns:test="http:///org/apache/uima/test.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmi:version="2.0"> +<?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"> <cas:NULL xmi:id="0"/> <cas:NonEmptyIntegerList xmi:id="8" head="11" tail="5"/> <cas:NonEmptyIntegerList xmi:id="11" head="110" tail="5"/>
