diff options
Diffstat (limited to 'config-model/src/test/derived')
28 files changed, 48 insertions, 373 deletions
diff --git a/config-model/src/test/derived/advanced/documentmanager.cfg b/config-model/src/test/derived/advanced/documentmanager.cfg index a0a59fbf7ac..4da92d82fb9 100644 --- a/config-model/src/test/derived/advanced/documentmanager.cfg +++ b/config-model/src/test/derived/advanced/documentmanager.cfg @@ -67,20 +67,13 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "mysummary" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].detailedtype "" -datatype[].id -704605648 -datatype[].structtype[].name "advanced.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id 686681444 datatype[].documenttype[].name "advanced" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct -1337915045 -datatype[].documenttype[].bodystruct -704605648 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{titleabstract}.fields[] "title" datatype[].documenttype[].fieldsets{default}.fields[] "title" datatype[].documenttype[].fieldsets{[document]}.fields[] "attributes_src" diff --git a/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg b/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg index fae6bd46ad7..aa74ecebd5b 100644 --- a/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg @@ -29,20 +29,13 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].id -1503592268 -datatype[].structtype[].name "annotationsimplicitstruct.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -2099544992 datatype[].documenttype[].name "annotationsimplicitstruct" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct -364910881 -datatype[].documenttype[].bodystruct -1503592268 +datatype[].documenttype[].bodystruct 0 annotationtype[].id -269517759 annotationtype[].name "banana" annotationtype[].datatype 517946310 diff --git a/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg b/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg index 21baed26dbf..e103218793d 100644 --- a/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg @@ -94,20 +94,13 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].id 1181354668 -datatype[].structtype[].name "annotationsinheritance.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -748546200 datatype[].documenttype[].name "annotationsinheritance" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct -1406250281 -datatype[].documenttype[].bodystruct 1181354668 +datatype[].documenttype[].bodystruct 0 annotationtype[].id -269517759 annotationtype[].name "banana" annotationtype[].datatype 517946310 diff --git a/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg b/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg index 3ef71148f12..5b5b2ac348f 100644 --- a/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg @@ -57,20 +57,13 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].id 1375438150 -datatype[].structtype[].name "annotationsinheritance2.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -1730091890 datatype[].documenttype[].name "annotationsinheritance2" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 424382193 -datatype[].documenttype[].bodystruct 1375438150 +datatype[].documenttype[].bodystruct 0 annotationtype[].id 1769416289 annotationtype[].name "a" annotationtype[].datatype -1 diff --git a/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg b/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg index e9ec2cb3715..1f71057f268 100644 --- a/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg +++ b/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg @@ -31,20 +31,13 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].id -570750959 -datatype[].structtype[].name "annotationspolymorphy.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -1383624989 datatype[].documenttype[].name "annotationspolymorphy" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct -1552577796 -datatype[].documenttype[].bodystruct -570750959 +datatype[].documenttype[].bodystruct 0 annotationtype[].id 668095690 annotationtype[].name "super" annotationtype[].datatype -1 diff --git a/config-model/src/test/derived/annotationsreference/documentmanager.cfg b/config-model/src/test/derived/annotationsreference/documentmanager.cfg index 6526f56a906..737bcbf3cac 100644 --- a/config-model/src/test/derived/annotationsreference/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsreference/documentmanager.cfg @@ -65,20 +65,13 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].id 1692909067 -datatype[].structtype[].name "annotationsreference.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -1448377175 datatype[].documenttype[].name "annotationsreference" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 571255414 -datatype[].documenttype[].bodystruct 1692909067 +datatype[].documenttype[].bodystruct 0 annotationtype[].id -269517759 annotationtype[].name "banana" annotationtype[].datatype 517946310 diff --git a/config-model/src/test/derived/annotationssimple/documentmanager.cfg b/config-model/src/test/derived/annotationssimple/documentmanager.cfg index d32f0addceb..3af65e96558 100644 --- a/config-model/src/test/derived/annotationssimple/documentmanager.cfg +++ b/config-model/src/test/derived/annotationssimple/documentmanager.cfg @@ -19,20 +19,13 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].id -682121732 -datatype[].structtype[].name "annotationssimple.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -1584092648 datatype[].documenttype[].name "annotationssimple" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct -1205708249 -datatype[].documenttype[].bodystruct -682121732 +datatype[].documenttype[].bodystruct 0 annotationtype[].id -269517759 annotationtype[].name "banana" annotationtype[].datatype -1 diff --git a/config-model/src/test/derived/annotationsstruct/documentmanager.cfg b/config-model/src/test/derived/annotationsstruct/documentmanager.cfg index c91b5c5e97e..0a1cda99a95 100644 --- a/config-model/src/test/derived/annotationsstruct/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsstruct/documentmanager.cfg @@ -39,20 +39,13 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].id -1180029319 -datatype[].structtype[].name "annotationsstruct.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -263977093 datatype[].documenttype[].name "annotationsstruct" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 1341437796 -datatype[].documenttype[].bodystruct -1180029319 +datatype[].documenttype[].bodystruct 0 annotationtype[].id -160036815 annotationtype[].name "my_anno" annotationtype[].datatype -1080124700 diff --git a/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg b/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg index 22b951b1b5d..fca86c58ffa 100644 --- a/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg @@ -41,20 +41,13 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].id 1616435858 -datatype[].structtype[].name "annotationsstructarray.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id 1593733058 datatype[].documenttype[].name "annotationsstructarray" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 94945597 -datatype[].documenttype[].bodystruct 1616435858 +datatype[].documenttype[].bodystruct 0 annotationtype[].id -160036815 annotationtype[].name "my_anno" annotationtype[].datatype -1080124700 diff --git a/config-model/src/test/derived/arrays/documentmanager.cfg b/config-model/src/test/derived/arrays/documentmanager.cfg index a2d8e2e78b4..f542a936574 100644 --- a/config-model/src/test/derived/arrays/documentmanager.cfg +++ b/config-model/src/test/derived/arrays/documentmanager.cfg @@ -42,20 +42,13 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "c" datatype[].structtype[].field[].datatype 1328286588 datatype[].structtype[].field[].detailedtype "" -datatype[].id -1747896808 -datatype[].structtype[].name "arrays.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -1292863364 datatype[].documenttype[].name "arrays" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 1081627459 -datatype[].documenttype[].bodystruct -1747896808 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{default}.fields[] "a" datatype[].documenttype[].fieldsets{default}.fields[] "b" datatype[].documenttype[].fieldsets{default}.fields[] "c" diff --git a/config-model/src/test/derived/attributeprefetch/documentmanager.cfg b/config-model/src/test/derived/attributeprefetch/documentmanager.cfg index e27c72fbe50..dc208a86913 100644 --- a/config-model/src/test/derived/attributeprefetch/documentmanager.cfg +++ b/config-model/src/test/derived/attributeprefetch/documentmanager.cfg @@ -109,20 +109,13 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "wsstring" datatype[].structtype[].field[].datatype 1328286588 datatype[].structtype[].field[].detailedtype "" -datatype[].id 932425403 -datatype[].structtype[].name "prefetch.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -1458051591 datatype[].documenttype[].name "prefetch" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct -109105370 -datatype[].documenttype[].bodystruct 932425403 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[document]}.fields[] "multibyte" datatype[].documenttype[].fieldsets{[document]}.fields[] "multidouble" datatype[].documenttype[].fieldsets{[document]}.fields[] "multifloat" diff --git a/config-model/src/test/derived/complex/documentmanager.cfg b/config-model/src/test/derived/complex/documentmanager.cfg index 42234e52211..50d5dac1ef9 100644 --- a/config-model/src/test/derived/complex/documentmanager.cfg +++ b/config-model/src/test/derived/complex/documentmanager.cfg @@ -98,20 +98,13 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "exact" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].detailedtype "" -datatype[].id -1665926686 -datatype[].structtype[].name "complex.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -1402929550 datatype[].documenttype[].name "complex" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct -1749463923 -datatype[].documenttype[].bodystruct -1665926686 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{default}.fields[] "stringfield" datatype[].documenttype[].fieldsets{default}.fields[] "title" datatype[].documenttype[].fieldsets{special}.fields[] "special1" diff --git a/config-model/src/test/derived/emptydefault/documentmanager.cfg b/config-model/src/test/derived/emptydefault/documentmanager.cfg index b6cb2d06718..e69b2c5d8c3 100644 --- a/config-model/src/test/derived/emptydefault/documentmanager.cfg +++ b/config-model/src/test/derived/emptydefault/documentmanager.cfg @@ -25,19 +25,12 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "two" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].detailedtype "" -datatype[].id 311791038 -datatype[].structtype[].name "emptydefault.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -1663995626 datatype[].documenttype[].name "emptydefault" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 461724009 -datatype[].documenttype[].bodystruct 311791038 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[document]}.fields[] "one" datatype[].documenttype[].fieldsets{[document]}.fields[] "two" diff --git a/config-model/src/test/derived/id/documentmanager.cfg b/config-model/src/test/derived/id/documentmanager.cfg index 5140abc65fa..8ee82cdd946 100644 --- a/config-model/src/test/derived/id/documentmanager.cfg +++ b/config-model/src/test/derived/id/documentmanager.cfg @@ -22,18 +22,11 @@ datatype[].structtype[].compressminsize 800 datatype[].structtype[].field[].name "uri" datatype[].structtype[].field[].datatype 10 datatype[].structtype[].field[].detailedtype "" -datatype[].id -1830022377 -datatype[].structtype[].name "id.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id 3225629 datatype[].documenttype[].name "id" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct -531633022 -datatype[].documenttype[].bodystruct -1830022377 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[document]}.fields[] "uri" diff --git a/config-model/src/test/derived/indexswitches/documentmanager.cfg b/config-model/src/test/derived/indexswitches/documentmanager.cfg index 78dbdb7ae74..ffeaab177ba 100644 --- a/config-model/src/test/derived/indexswitches/documentmanager.cfg +++ b/config-model/src/test/derived/indexswitches/documentmanager.cfg @@ -31,20 +31,13 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "source" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].detailedtype "" -datatype[].id -1892617122 -datatype[].structtype[].name "indexswitches.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -753375626 datatype[].documenttype[].name "indexswitches" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct -555640823 -datatype[].documenttype[].bodystruct -1892617122 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{default}.fields[] "descr" datatype[].documenttype[].fieldsets{default}.fields[] "title" datatype[].documenttype[].fieldsets{[document]}.fields[] "descr" diff --git a/config-model/src/test/derived/inheritance/documentmanager.cfg b/config-model/src/test/derived/inheritance/documentmanager.cfg index b15ef13ed3f..e054019bd8f 100644 --- a/config-model/src/test/derived/inheritance/documentmanager.cfg +++ b/config-model/src/test/derived/inheritance/documentmanager.cfg @@ -25,20 +25,13 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "overridden" datatype[].structtype[].field[].datatype 0 datatype[].structtype[].field[].detailedtype "" -datatype[].id 978262812 -datatype[].structtype[].name "grandparent.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -154107656 datatype[].documenttype[].name "grandparent" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 990971719 -datatype[].documenttype[].bodystruct 978262812 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[document]}.fields[] "onlygrandparent" datatype[].documenttype[].fieldsets{[document]}.fields[] "overridden" datatype[].id 1306663898 @@ -54,13 +47,6 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "overridden" datatype[].structtype[].field[].datatype 0 datatype[].structtype[].field[].detailedtype "" -datatype[].id -1989003153 -datatype[].structtype[].name "mother.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -158393403 datatype[].documenttype[].name "mother" datatype[].documenttype[].version 0 @@ -69,7 +55,7 @@ datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 1306663898 -datatype[].documenttype[].bodystruct -1989003153 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[document]}.fields[] "onlygrandparent" datatype[].documenttype[].fieldsets{[document]}.fields[] "onlymother" datatype[].documenttype[].fieldsets{[document]}.fields[] "overridden" @@ -86,13 +72,6 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "overridden" datatype[].structtype[].field[].datatype 0 datatype[].structtype[].field[].detailedtype "" -datatype[].id -1742340170 -datatype[].structtype[].name "father.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id 986686494 datatype[].documenttype[].name "father" datatype[].documenttype[].version 0 @@ -101,7 +80,7 @@ datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 2126589281 -datatype[].documenttype[].bodystruct -1742340170 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[document]}.fields[] "onlyfather" datatype[].documenttype[].fieldsets{[document]}.fields[] "onlygrandparent" datatype[].documenttype[].fieldsets{[document]}.fields[] "overridden" @@ -118,13 +97,6 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "overridden" datatype[].structtype[].field[].datatype 0 datatype[].structtype[].field[].detailedtype "" -datatype[].id -126593034 -datatype[].structtype[].name "child.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id 746267614 datatype[].documenttype[].name "child" datatype[].documenttype[].version 0 @@ -135,7 +107,7 @@ datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].inherits[].name "mother" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 81425825 -datatype[].documenttype[].bodystruct -126593034 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[document]}.fields[] "onlychild" datatype[].documenttype[].fieldsets{[document]}.fields[] "onlyfather" datatype[].documenttype[].fieldsets{[document]}.fields[] "onlygrandparent" diff --git a/config-model/src/test/derived/inheritdiamond/documentmanager.cfg b/config-model/src/test/derived/inheritdiamond/documentmanager.cfg index c3ead0d31f8..df3f8908a60 100644 --- a/config-model/src/test/derived/inheritdiamond/documentmanager.cfg +++ b/config-model/src/test/derived/inheritdiamond/documentmanager.cfg @@ -1,11 +1,4 @@ enablecompression false -datatype[].id -126593034 -datatype[].structtype[].name "child.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id 336538650 datatype[].structtype[].name "child_struct" datatype[].structtype[].version 0 @@ -40,7 +33,7 @@ datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].inherits[].name "father" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 81425825 -datatype[].documenttype[].bodystruct -126593034 +datatype[].documenttype[].bodystruct 0 datatype[].id -1913265190 datatype[].structtype[].name "father_struct" datatype[].structtype[].version 0 @@ -66,27 +59,13 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].id -52742073 -datatype[].structtype[].name "father_search.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id 1464571117 datatype[].documenttype[].name "father_search" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct -1962244686 -datatype[].documenttype[].bodystruct -52742073 -datatype[].id -1852215954 -datatype[].structtype[].name "mother_search.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 +datatype[].documenttype[].bodystruct 0 datatype[].id -384824039 datatype[].structtype[].name "mother_search.header" datatype[].structtype[].version 0 @@ -109,7 +88,7 @@ datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct -384824039 -datatype[].documenttype[].bodystruct -1852215954 +datatype[].documenttype[].bodystruct 0 datatype[].id 1306663898 datatype[].structtype[].name "mother.header" datatype[].structtype[].version 0 @@ -117,13 +96,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].id -1989003153 -datatype[].structtype[].name "mother.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -158393403 datatype[].documenttype[].name "mother" datatype[].documenttype[].version 0 @@ -132,7 +104,7 @@ datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 1306663898 -datatype[].documenttype[].bodystruct -1989003153 +datatype[].documenttype[].bodystruct 0 datatype[].id -205818510 datatype[].structtype[].name "child_search.header" datatype[].structtype[].version 0 @@ -140,20 +112,13 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].id -1467672569 -datatype[].structtype[].name "child_search.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -580592339 datatype[].documenttype[].name "child_search" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct -205818510 -datatype[].documenttype[].bodystruct -1467672569 +datatype[].documenttype[].bodystruct 0 datatype[].id 111553393 datatype[].structtype[].name "url" datatype[].structtype[].version 0 @@ -186,13 +151,6 @@ datatype[].structtype[].field[].name "x" datatype[].structtype[].field[].datatype 0 datatype[].structtype[].field[].name "y" datatype[].structtype[].field[].datatype 0 -datatype[].id 1845861921 -datatype[].structtype[].name "grandparent_search.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id 1530060044 datatype[].structtype[].name "grandparent_search.header" datatype[].structtype[].version 0 @@ -206,7 +164,7 @@ datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 1530060044 -datatype[].documenttype[].bodystruct 1845861921 +datatype[].documenttype[].bodystruct 0 datatype[].id 990971719 datatype[].structtype[].name "grandparent.header" datatype[].structtype[].version 0 @@ -214,27 +172,13 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].id 978262812 -datatype[].structtype[].name "grandparent.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -154107656 datatype[].documenttype[].name "grandparent" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 990971719 -datatype[].documenttype[].bodystruct 978262812 -datatype[].id -1742340170 -datatype[].structtype[].name "father.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 +datatype[].documenttype[].bodystruct 0 datatype[].id 2126589281 datatype[].structtype[].name "father.header" datatype[].structtype[].version 0 @@ -250,4 +194,4 @@ datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 2126589281 -datatype[].documenttype[].bodystruct -1742340170 +datatype[].documenttype[].bodystruct 0 diff --git a/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg b/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg index 8e2ee3bbc4e..25872641741 100644 --- a/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg +++ b/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg @@ -29,20 +29,13 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].id 978262812 -datatype[].structtype[].name "grandparent.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -154107656 datatype[].documenttype[].name "grandparent" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 990971719 -datatype[].documenttype[].bodystruct 978262812 +datatype[].documenttype[].bodystruct 0 datatype[].id 836075987 datatype[].structtype[].name "parent.header" datatype[].structtype[].version 0 @@ -50,13 +43,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].id -389494616 -datatype[].structtype[].name "parent.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id 1175161836 datatype[].documenttype[].name "parent" datatype[].documenttype[].version 0 @@ -65,7 +51,7 @@ datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 836075987 -datatype[].documenttype[].bodystruct -389494616 +datatype[].documenttype[].bodystruct 0 datatype[].id 81425825 datatype[].structtype[].name "child.header" datatype[].structtype[].version 0 @@ -76,13 +62,6 @@ datatype[].structtype[].compressminsize 800 datatype[].structtype[].field[].name "child_field" datatype[].structtype[].field[].datatype 1246084544 datatype[].structtype[].field[].detailedtype "" -datatype[].id -126593034 -datatype[].structtype[].name "child.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id 746267614 datatype[].documenttype[].name "child" datatype[].documenttype[].version 0 @@ -91,5 +70,5 @@ datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].inherits[].name "parent" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 81425825 -datatype[].documenttype[].bodystruct -126593034 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[document]}.fields[] "child_field" diff --git a/config-model/src/test/derived/inheritfromparent/documentmanager.cfg b/config-model/src/test/derived/inheritfromparent/documentmanager.cfg index 7c65a7b72f3..c9cd6fd3042 100644 --- a/config-model/src/test/derived/inheritfromparent/documentmanager.cfg +++ b/config-model/src/test/derived/inheritfromparent/documentmanager.cfg @@ -35,20 +35,13 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "weight" datatype[].structtype[].field[].datatype 1 datatype[].structtype[].field[].detailedtype "" -datatype[].id -389494616 -datatype[].structtype[].name "parent.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id 1175161836 datatype[].documenttype[].name "parent" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 836075987 -datatype[].documenttype[].bodystruct -389494616 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[]}.fields[] "weight_src" datatype[].id 81425825 datatype[].structtype[].name "child.header" @@ -60,13 +53,6 @@ datatype[].structtype[].compressminsize 800 datatype[].structtype[].field[].name "child_field" datatype[].structtype[].field[].datatype 1091188812 datatype[].structtype[].field[].detailedtype "" -datatype[].id -126593034 -datatype[].structtype[].name "child.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id 746267614 datatype[].documenttype[].name "child" datatype[].documenttype[].version 0 @@ -75,6 +61,6 @@ datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].inherits[].name "parent" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 81425825 -datatype[].documenttype[].bodystruct -126593034 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[]}.fields[] "child_field" datatype[].documenttype[].fieldsets{[]}.fields[] "weight_src" diff --git a/config-model/src/test/derived/inheritfromparent/documenttypes.cfg b/config-model/src/test/derived/inheritfromparent/documenttypes.cfg index f5ec18c4203..faef3f6923b 100644 --- a/config-model/src/test/derived/inheritfromparent/documenttypes.cfg +++ b/config-model/src/test/derived/inheritfromparent/documenttypes.cfg @@ -3,7 +3,7 @@ documenttype[].id 1175161836 documenttype[].name "parent" documenttype[].version 0 documenttype[].headerstruct 836075987 -documenttype[].bodystruct -389494616 +documenttype[].bodystruct 0 documenttype[].inherits[].id 8 documenttype[].datatype[].id 1091188812 documenttype[].datatype[].type STRUCT @@ -47,27 +47,12 @@ documenttype[].datatype[].sstruct.field[].name "weight" documenttype[].datatype[].sstruct.field[].id 1001392207 documenttype[].datatype[].sstruct.field[].datatype 1 documenttype[].datatype[].sstruct.field[].detailedtype "" -documenttype[].datatype[].id -389494616 -documenttype[].datatype[].type STRUCT -documenttype[].datatype[].array.element.id 0 -documenttype[].datatype[].map.key.id 0 -documenttype[].datatype[].map.value.id 0 -documenttype[].datatype[].wset.key.id 0 -documenttype[].datatype[].wset.createifnonexistent false -documenttype[].datatype[].wset.removeifzero false -documenttype[].datatype[].annotationref.annotation.id 0 -documenttype[].datatype[].sstruct.name "parent.body" -documenttype[].datatype[].sstruct.version 0 -documenttype[].datatype[].sstruct.compression.type NONE -documenttype[].datatype[].sstruct.compression.level 0 -documenttype[].datatype[].sstruct.compression.threshold 95 -documenttype[].datatype[].sstruct.compression.minsize 200 documenttype[].fieldsets{[]}.fields[] "weight_src" documenttype[].id 746267614 documenttype[].name "child" documenttype[].version 0 documenttype[].headerstruct 81425825 -documenttype[].bodystruct -126593034 +documenttype[].bodystruct 0 documenttype[].inherits[].id 8 documenttype[].inherits[].id 1175161836 documenttype[].datatype[].id 81425825 @@ -89,20 +74,5 @@ documenttype[].datatype[].sstruct.field[].name "child_field" documenttype[].datatype[].sstruct.field[].id 1814271363 documenttype[].datatype[].sstruct.field[].datatype 1091188812 documenttype[].datatype[].sstruct.field[].detailedtype "" -documenttype[].datatype[].id -126593034 -documenttype[].datatype[].type STRUCT -documenttype[].datatype[].array.element.id 0 -documenttype[].datatype[].map.key.id 0 -documenttype[].datatype[].map.value.id 0 -documenttype[].datatype[].wset.key.id 0 -documenttype[].datatype[].wset.createifnonexistent false -documenttype[].datatype[].wset.removeifzero false -documenttype[].datatype[].annotationref.annotation.id 0 -documenttype[].datatype[].sstruct.name "child.body" -documenttype[].datatype[].sstruct.version 0 -documenttype[].datatype[].sstruct.compression.type NONE -documenttype[].datatype[].sstruct.compression.level 0 -documenttype[].datatype[].sstruct.compression.threshold 95 -documenttype[].datatype[].sstruct.compression.minsize 200 documenttype[].fieldsets{[]}.fields[] "child_field" documenttype[].fieldsets{[]}.fields[] "weight_src" diff --git a/config-model/src/test/derived/mail/documentmanager.cfg b/config-model/src/test/derived/mail/documentmanager.cfg index 2fa9e5923c9..baf122d0241 100644 --- a/config-model/src/test/derived/mail/documentmanager.cfg +++ b/config-model/src/test/derived/mail/documentmanager.cfg @@ -37,15 +37,6 @@ datatype[].structtype[].field[].name "subject" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].name "snippet" datatype[].structtype[].field[].datatype 2 -datatype[].id -1206550296 -datatype[].arraytype[].datatype 12 -datatype[].id -953584901 -datatype[].structtype[].name "mail.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].structtype[].field[].name "body" datatype[].structtype[].field[].datatype 12 datatype[].structtype[].field[].name "attachmentcount" @@ -60,13 +51,15 @@ datatype[].structtype[].field[].name "attachmentcontent" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].name "attachments" datatype[].structtype[].field[].datatype -1206550296 +datatype[].id -1206550296 +datatype[].arraytype[].datatype 12 datatype[].id -1081574983 datatype[].documenttype[].name "mail" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct -88808602 -datatype[].documenttype[].bodystruct -953584901 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{sender}.fields[] "from" datatype[].documenttype[].fieldsets{address}.fields[] "cc" datatype[].documenttype[].fieldsets{address}.fields[] "from" diff --git a/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg b/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg index 060510c3578..9ab2da3f686 100644 --- a/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg +++ b/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg @@ -34,20 +34,13 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "indexfield2" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].detailedtype "" -datatype[].id -480519133 -datatype[].structtype[].name "prefixexactattribute.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -1812793455 datatype[].documenttype[].name "prefixexactattribute" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct -739138930 -datatype[].documenttype[].bodystruct -480519133 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[document]}.fields[] "attributefield1" datatype[].documenttype[].fieldsets{[document]}.fields[] "attributefield2" datatype[].documenttype[].fieldsets{[document]}.fields[] "indexfield0" diff --git a/config-model/src/test/derived/ranktypes/documentmanager.cfg b/config-model/src/test/derived/ranktypes/documentmanager.cfg index 072a0fff126..a8bb9e904dc 100644 --- a/config-model/src/test/derived/ranktypes/documentmanager.cfg +++ b/config-model/src/test/derived/ranktypes/documentmanager.cfg @@ -34,20 +34,13 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "identity_literal" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].detailedtype "" -datatype[].id 1374506021 -datatype[].structtype[].name "ranktypes.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -883421617 datatype[].documenttype[].name "ranktypes" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct -471393776 -datatype[].documenttype[].bodystruct 1374506021 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[document]}.fields[] "descr" datatype[].documenttype[].fieldsets{[document]}.fields[] "identity" datatype[].documenttype[].fieldsets{[document]}.fields[] "keywords" diff --git a/config-model/src/test/derived/streamingstruct/documentmanager.cfg b/config-model/src/test/derived/streamingstruct/documentmanager.cfg index 2cd35c7bdfa..63001ea38ca 100644 --- a/config-model/src/test/derived/streamingstruct/documentmanager.cfg +++ b/config-model/src/test/derived/streamingstruct/documentmanager.cfg @@ -119,20 +119,13 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "snippet2" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].detailedtype "" -datatype[].id 1858438651 -datatype[].structtype[].name "streamingstruct.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id 1433175737 datatype[].documenttype[].name "streamingstruct" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 731395686 -datatype[].documenttype[].bodystruct 1858438651 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[document]}.fields[] "a" datatype[].documenttype[].fieldsets{[document]}.fields[] "array1" datatype[].documenttype[].fieldsets{[document]}.fields[] "array2" diff --git a/config-model/src/test/derived/structanyorder/documentmanager.cfg b/config-model/src/test/derived/structanyorder/documentmanager.cfg index c18b1cc11b0..3ffc2f22a9b 100644 --- a/config-model/src/test/derived/structanyorder/documentmanager.cfg +++ b/config-model/src/test/derived/structanyorder/documentmanager.cfg @@ -69,20 +69,13 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "structarrayfield" datatype[].structtype[].field[].datatype -1244829667 datatype[].structtype[].field[].detailedtype "" -datatype[].id -1503592268 -datatype[].structtype[].name "annotationsimplicitstruct.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id -2099544992 datatype[].documenttype[].name "annotationsimplicitstruct" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct -364910881 -datatype[].documenttype[].bodystruct -1503592268 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[document]}.fields[] "structarrayfield" datatype[].documenttype[].fieldsets{[document]}.fields[] "structfield" annotationtype[].id -269517759 diff --git a/config-model/src/test/derived/tensor/documenttypes.cfg b/config-model/src/test/derived/tensor/documenttypes.cfg index bbf9759659b..acf5c7ed12f 100644 --- a/config-model/src/test/derived/tensor/documenttypes.cfg +++ b/config-model/src/test/derived/tensor/documenttypes.cfg @@ -3,7 +3,7 @@ documenttype[].id -1290043429 documenttype[].name "tensor" documenttype[].version 0 documenttype[].headerstruct 2125927172 -documenttype[].bodystruct -1903234535 +documenttype[].bodystruct 0 documenttype[].inherits[].id 8 documenttype[].datatype[].id 2125927172 documenttype[].datatype[].type STRUCT @@ -44,21 +44,6 @@ documenttype[].datatype[].sstruct.field[].name "f6" documenttype[].datatype[].sstruct.field[].id 596352344 documenttype[].datatype[].sstruct.field[].datatype 1 documenttype[].datatype[].sstruct.field[].detailedtype "" -documenttype[].datatype[].id -1903234535 -documenttype[].datatype[].type STRUCT -documenttype[].datatype[].array.element.id 0 -documenttype[].datatype[].map.key.id 0 -documenttype[].datatype[].map.value.id 0 -documenttype[].datatype[].wset.key.id 0 -documenttype[].datatype[].wset.createifnonexistent false -documenttype[].datatype[].wset.removeifzero false -documenttype[].datatype[].annotationref.annotation.id 0 -documenttype[].datatype[].sstruct.name "tensor.body" -documenttype[].datatype[].sstruct.version 0 -documenttype[].datatype[].sstruct.compression.type NONE -documenttype[].datatype[].sstruct.compression.level 0 -documenttype[].datatype[].sstruct.compression.threshold 95 -documenttype[].datatype[].sstruct.compression.minsize 200 documenttype[].fieldsets{[document]}.fields[] "f1" documenttype[].fieldsets{[document]}.fields[] "f2" documenttype[].fieldsets{[document]}.fields[] "f3" diff --git a/config-model/src/test/derived/twostreamingstructs/documentmanager.cfg b/config-model/src/test/derived/twostreamingstructs/documentmanager.cfg index bb5bb001036..19d00483a5a 100644 --- a/config-model/src/test/derived/twostreamingstructs/documentmanager.cfg +++ b/config-model/src/test/derived/twostreamingstructs/documentmanager.cfg @@ -90,20 +90,13 @@ datatype[].structtype[].field[].name "snippet" datatype[].structtype[].field[].datatype 2 datatype[].structtype[].field[].name "snippet2" datatype[].structtype[].field[].datatype 2 -datatype[].id 1858438651 -datatype[].structtype[].name "streamingstruct.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].id 1433175737 datatype[].documenttype[].name "streamingstruct" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 731395686 -datatype[].documenttype[].bodystruct 1858438651 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[document]}.fields[] "a" datatype[].documenttype[].fieldsets{[document]}.fields[] "array1" datatype[].documenttype[].fieldsets{[document]}.fields[] "array2" @@ -139,13 +132,6 @@ datatype[].structtype[].compresstype NONE datatype[].structtype[].compresslevel 0 datatype[].structtype[].compressthreshold 95 datatype[].structtype[].compressminsize 800 -datatype[].id -1417926544 -datatype[].structtype[].name "whatever.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 datatype[].structtype[].field[].name "f1" datatype[].structtype[].field[].datatype -995681764 datatype[].id -778211548 @@ -154,5 +140,5 @@ datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 355471259 -datatype[].documenttype[].bodystruct -1417926544 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[document]}.fields[] "f1" diff --git a/config-model/src/test/derived/types/documentmanager.cfg b/config-model/src/test/derived/types/documentmanager.cfg index a4fcd4f49f6..9556f77f6d9 100644 --- a/config-model/src/test/derived/types/documentmanager.cfg +++ b/config-model/src/test/derived/types/documentmanager.cfg @@ -209,28 +209,21 @@ datatype[].structtype[].field[].detailedtype "" datatype[].structtype[].field[].name "other" datatype[].structtype[].field[].datatype 4 datatype[].structtype[].field[].detailedtype "" +datatype[].structtype[].field[].name "complexarray" +datatype[].structtype[].field[].datatype 1416345047 +datatype[].structtype[].field[].detailedtype "" datatype[].id -372512406 datatype[].maptype[].keytype 0 datatype[].maptype[].valtype 1707615575 datatype[].id 1416345047 datatype[].arraytype[].datatype -372512406 -datatype[].id 348447225 -datatype[].structtype[].name "types.body" -datatype[].structtype[].version 0 -datatype[].structtype[].compresstype NONE -datatype[].structtype[].compresslevel 0 -datatype[].structtype[].compressthreshold 95 -datatype[].structtype[].compressminsize 800 -datatype[].structtype[].field[].name "complexarray" -datatype[].structtype[].field[].datatype 1416345047 -datatype[].structtype[].field[].detailedtype "" datatype[].id -853072901 datatype[].documenttype[].name "types" datatype[].documenttype[].version 0 datatype[].documenttype[].inherits[].name "document" datatype[].documenttype[].inherits[].version 0 datatype[].documenttype[].headerstruct 1328581348 -datatype[].documenttype[].bodystruct 348447225 +datatype[].documenttype[].bodystruct 0 datatype[].documenttype[].fieldsets{[document]}.fields[] "Folders" datatype[].documenttype[].fieldsets{[document]}.fields[] "abool" datatype[].documenttype[].fieldsets{[document]}.fields[] "abyte" |