switch to new-style config

3 files changed, 200 insertions, 113 deletions

diff --git a/docproc/src/test/cfg/messagebus/documentmanager.cfg b/docproc/src/test/cfg/messagebus/documentmanager.cfg
index 36cf88c8384..93e245c8bdc 100644
--- a/docproc/src/test/cfg/messagebus/documentmanager.cfg
+++ b/docproc/src/test/cfg/messagebus/documentmanager.cfg
@@ -1,36 +1,65 @@
-datatype[3]
-datatype[0].id 306916075
-datatype[0].arraytype[0]
-datatype[0].weightedsettype[0]
-datatype[0].structtype[1]
-datatype[0].structtype[0].name test.header
-datatype[0].structtype[0].version 0
-datatype[0].structtype[0].field[3]
-datatype[0].structtype[0].field[0].name test
-datatype[0].structtype[0].field[0].id[0]
-datatype[0].structtype[0].field[0].datatype 2
-datatype[0].structtype[0].field[1].name touched
-datatype[0].structtype[0].field[1].id[0]
-datatype[0].structtype[0].field[1].datatype 2
-datatype[0].structtype[0].field[2].name docno
-datatype[0].structtype[0].field[2].id[0]
-datatype[0].structtype[0].field[2].datatype 0
-datatype[0].documenttype[0]
-datatype[1].id -1270491200
-datatype[1].arraytype[0]
-datatype[1].weightedsettype[0]
-datatype[1].structtype[1]
-datatype[1].structtype[0].name test.body
-datatype[1].structtype[0].version 0
-datatype[1].structtype[0].field[0]
-datatype[1].documenttype[0]
-datatype[2].id -877171244
-datatype[2].arraytype[0]
-datatype[2].weightedsettype[0]
-datatype[2].structtype[0]
-datatype[2].documenttype[1]
-datatype[2].documenttype[0].name test
-datatype[2].documenttype[0].version 0
-datatype[2].documenttype[0].inherits[0]
-datatype[2].documenttype[0].headerstruct 306916075
-datatype[2].documenttype[0].bodystruct -1270491200
+doctype[2]
+doctype[0].name "document"
+doctype[0].idx 10000
+doctype[0].contentstruct 10001
+doctype[0].primitivetype[0].idx 10002
+doctype[0].primitivetype[0].internalid 0
+doctype[0].primitivetype[0].name "int"
+doctype[0].primitivetype[1].idx 10003
+doctype[0].primitivetype[1].internalid 5
+doctype[0].primitivetype[1].name "double"
+doctype[0].primitivetype[2].idx 10004
+doctype[0].primitivetype[2].internalid 2
+doctype[0].primitivetype[2].name "string"
+doctype[0].annotationtype[0].idx 10005
+doctype[0].annotationtype[0].name "proximity_break"
+doctype[0].annotationtype[0].internalid 8
+doctype[0].annotationtype[0].datatype 10003
+doctype[0].annotationtype[1].idx 10006
+doctype[0].annotationtype[1].name "normalized"
+doctype[0].annotationtype[1].internalid 4
+doctype[0].annotationtype[1].datatype 10004
+doctype[0].annotationtype[2].idx 10007
+doctype[0].annotationtype[2].name "reading"
+doctype[0].annotationtype[2].internalid 5
+doctype[0].annotationtype[2].datatype 10004
+doctype[0].annotationtype[3].idx 10008
+doctype[0].annotationtype[3].name "term"
+doctype[0].annotationtype[3].internalid 1
+doctype[0].annotationtype[3].datatype 10004
+doctype[0].annotationtype[4].idx 10009
+doctype[0].annotationtype[4].name "transformed"
+doctype[0].annotationtype[4].internalid 7
+doctype[0].annotationtype[4].datatype 10004
+doctype[0].annotationtype[5].idx 10010
+doctype[0].annotationtype[5].name "canonical"
+doctype[0].annotationtype[5].internalid 3
+doctype[0].annotationtype[5].datatype 10004
+doctype[0].annotationtype[6].idx 10011
+doctype[0].annotationtype[6].name "token_type"
+doctype[0].annotationtype[6].internalid 2
+doctype[0].annotationtype[6].datatype 10002
+doctype[0].annotationtype[7].idx 10012
+doctype[0].annotationtype[7].name "special_token"
+doctype[0].annotationtype[7].internalid 9
+doctype[0].annotationtype[8].idx 10013
+doctype[0].annotationtype[8].name "stem"
+doctype[0].annotationtype[8].internalid 6
+doctype[0].annotationtype[8].datatype 10004
+doctype[0].structtype[0].idx 10001
+doctype[0].structtype[0].name document.header
+doctype[1].name "test"
+doctype[1].idx 10014
+doctype[1].inherits[0].idx 10000
+doctype[1].contentstruct 10015
+doctype[1].structtype[0].idx 10015
+doctype[1].structtype[0].name test.header
+doctype[1].structtype[0].field[0].name "test"
+doctype[1].structtype[0].field[0].internalid 1470086679
+doctype[1].structtype[0].field[0].type 10004
+doctype[1].structtype[0].field[1].name "touched"
+doctype[1].structtype[0].field[1].internalid 26783710
+doctype[1].structtype[0].field[1].type 10004
+doctype[1].structtype[0].field[2].name "docno"
+doctype[1].structtype[0].field[2].internalid 1938780436
+doctype[1].structtype[0].field[2].type 10002
diff --git a/docproc/src/test/cfg/server/documentmanager.cfg b/docproc/src/test/cfg/server/documentmanager.cfg
index b3e360e961f..962b9ac2e60 100644
--- a/docproc/src/test/cfg/server/documentmanager.cfg
+++ b/docproc/src/test/cfg/server/documentmanager.cfg
@@ -1,36 +1,62 @@
-datatype[3]
-datatype[0].id 306916075
-datatype[0].arraytype[0]
-datatype[0].weightedsettype[0]
-datatype[0].structtype[1]
-datatype[0].structtype[0].name test.header
-datatype[0].structtype[0].version 0
-datatype[0].structtype[0].field[2]
-datatype[0].structtype[0].field[0].name test
-datatype[0].structtype[0].field[0].id[0]
-datatype[0].structtype[0].field[0].datatype 2
-datatype[0].structtype[0].field[1].name touched
-datatype[0].structtype[0].field[1].id[0]
-datatype[0].structtype[0].field[1].datatype 2
-datatype[0].documenttype[0]
-datatype[1].id -1270491200
-datatype[1].arraytype[0]
-datatype[1].weightedsettype[0]
-datatype[1].structtype[1]
-datatype[1].structtype[0].name test.body
-datatype[1].structtype[0].version 0
-datatype[1].structtype[0].field[1]
-datatype[1].structtype[0].field[0].name docno
-datatype[1].structtype[0].field[0].id[0]
-datatype[1].structtype[0].field[0].datatype 0
-datatype[1].documenttype[0]
-datatype[2].id -877171244
-datatype[2].arraytype[0]
-datatype[2].weightedsettype[0]
-datatype[2].structtype[0]
-datatype[2].documenttype[1]
-datatype[2].documenttype[0].name test
-datatype[2].documenttype[0].version 0
-datatype[2].documenttype[0].inherits[0]
-datatype[2].documenttype[0].headerstruct 306916075
-datatype[2].documenttype[0].bodystruct -1270491200
+doctype[2]
+doctype[0].name "document"
+doctype[0].idx 10000
+doctype[0].contentstruct 10001
+doctype[0].primitivetype[0].idx 10002
+doctype[0].primitivetype[0].internalid 0
+doctype[0].primitivetype[0].name "int"
+doctype[0].primitivetype[1].idx 10003
+doctype[0].primitivetype[1].internalid 5
+doctype[0].primitivetype[1].name "double"
+doctype[0].primitivetype[2].idx 10004
+doctype[0].primitivetype[2].internalid 2
+doctype[0].primitivetype[2].name "string"
+doctype[0].annotationtype[0].idx 10005
+doctype[0].annotationtype[0].name "proximity_break"
+doctype[0].annotationtype[0].internalid 8
+doctype[0].annotationtype[0].datatype 10003
+doctype[0].annotationtype[1].idx 10006
+doctype[0].annotationtype[1].name "normalized"
+doctype[0].annotationtype[1].internalid 4
+doctype[0].annotationtype[1].datatype 10004
+doctype[0].annotationtype[2].idx 10007
+doctype[0].annotationtype[2].name "reading"
+doctype[0].annotationtype[2].internalid 5
+doctype[0].annotationtype[2].datatype 10004
+doctype[0].annotationtype[3].idx 10008
+doctype[0].annotationtype[3].name "term"
+doctype[0].annotationtype[3].internalid 1
+doctype[0].annotationtype[3].datatype 10004
+doctype[0].annotationtype[4].idx 10009
+doctype[0].annotationtype[4].name "transformed"
+doctype[0].annotationtype[4].internalid 7
+doctype[0].annotationtype[4].datatype 10004
+doctype[0].annotationtype[5].idx 10010
+doctype[0].annotationtype[5].name "canonical"
+doctype[0].annotationtype[5].internalid 3
+doctype[0].annotationtype[5].datatype 10004
+doctype[0].annotationtype[6].idx 10011
+doctype[0].annotationtype[6].name "token_type"
+doctype[0].annotationtype[6].internalid 2
+doctype[0].annotationtype[6].datatype 10002
+doctype[0].annotationtype[7].idx 10012
+doctype[0].annotationtype[7].name "special_token"
+doctype[0].annotationtype[7].internalid 9
+doctype[0].annotationtype[8].idx 10013
+doctype[0].annotationtype[8].name "stem"
+doctype[0].annotationtype[8].internalid 6
+doctype[0].annotationtype[8].datatype 10004
+doctype[0].structtype[0].idx 10001
+doctype[0].structtype[0].name document.header
+doctype[1].name "test"
+doctype[1].idx 10014
+doctype[1].inherits[0].idx 10000
+doctype[1].contentstruct 10015
+doctype[1].structtype[0].idx 10015
+doctype[1].structtype[0].name test.header
+doctype[1].structtype[0].field[0].name "test"
+doctype[1].structtype[0].field[0].internalid 1470086679
+doctype[1].structtype[0].field[0].type 10004
+doctype[1].structtype[0].field[1].name "touched"
+doctype[1].structtype[0].field[1].internalid 26783710
+doctype[1].structtype[0].field[1].type 10004
diff --git a/docproc/src/test/java/com/yahoo/docproc/util/documentmanager.docindoc.cfg b/docproc/src/test/java/com/yahoo/docproc/util/documentmanager.docindoc.cfg
index 65ce1b56811..0b6c59ca381 100644
--- a/docproc/src/test/java/com/yahoo/docproc/util/documentmanager.docindoc.cfg
+++ b/docproc/src/test/java/com/yahoo/docproc/util/documentmanager.docindoc.cfg
@@ -1,41 +1,73 @@
-enablecompression false
-datatype[7]
-datatype[0].id -1407012075
-datatype[0].structtype[1]
-datatype[0].structtype[0].name "outerdoc.body"
-datatype[0].structtype[0].version 0
-datatype[1].id -1686125086
-datatype[1].structtype[1]
-datatype[1].structtype[0].name "docindoc.header"
-datatype[1].structtype[0].version 0
-datatype[1].structtype[0].field[2]
-datatype[1].structtype[0].field[0].datatype 2
-datatype[1].structtype[0].field[0].name "name"
-datatype[1].structtype[0].field[1].datatype 2
-datatype[1].structtype[0].field[1].name "content"
-datatype[2].id -2035324352
-datatype[2].arraytype[1]
-datatype[2].arraytype[0].datatype 1447635645
-datatype[3].id -2040625920
-datatype[3].structtype[1]
-datatype[3].structtype[0].name "outerdoc.header"
-datatype[3].structtype[0].version 0
-datatype[3].structtype[0].field[1]
-datatype[3].structtype[0].field[0].datatype -2035324352
-datatype[3].structtype[0].field[0].name "innerdocuments"
-datatype[4].id 1447635645
-datatype[4].documenttype[1]
-datatype[4].documenttype[0].bodystruct 2030224503
-datatype[4].documenttype[0].headerstruct -1686125086
-datatype[4].documenttype[0].name "docindoc"
-datatype[4].documenttype[0].version 0
-datatype[5].id 1748635999
-datatype[5].documenttype[1]
-datatype[5].documenttype[0].bodystruct -1407012075
-datatype[5].documenttype[0].headerstruct -2040625920
-datatype[5].documenttype[0].name "outerdoc"
-datatype[5].documenttype[0].version 0
-datatype[6].id 2030224503
-datatype[6].structtype[1]
-datatype[6].structtype[0].name "docindoc.body"
-datatype[6].structtype[0].version 0
+doctype[3]
+doctype[0].name "document"
+doctype[0].idx 10000
+doctype[0].contentstruct 10001
+doctype[0].primitivetype[0].idx 10002
+doctype[0].primitivetype[0].internalid 0
+doctype[0].primitivetype[0].name "int"
+doctype[0].primitivetype[1].idx 10003
+doctype[0].primitivetype[1].internalid 5
+doctype[0].primitivetype[1].name "double"
+doctype[0].primitivetype[2].idx 10004
+doctype[0].primitivetype[2].internalid 2
+doctype[0].primitivetype[2].name "string"
+doctype[0].annotationtype[0].idx 10005
+doctype[0].annotationtype[0].name "proximity_break"
+doctype[0].annotationtype[0].internalid 8
+doctype[0].annotationtype[0].datatype 10003
+doctype[0].annotationtype[1].idx 10006
+doctype[0].annotationtype[1].name "normalized"
+doctype[0].annotationtype[1].internalid 4
+doctype[0].annotationtype[1].datatype 10004
+doctype[0].annotationtype[2].idx 10007
+doctype[0].annotationtype[2].name "reading"
+doctype[0].annotationtype[2].internalid 5
+doctype[0].annotationtype[2].datatype 10004
+doctype[0].annotationtype[3].idx 10008
+doctype[0].annotationtype[3].name "term"
+doctype[0].annotationtype[3].internalid 1
+doctype[0].annotationtype[3].datatype 10004
+doctype[0].annotationtype[4].idx 10009
+doctype[0].annotationtype[4].name "transformed"
+doctype[0].annotationtype[4].internalid 7
+doctype[0].annotationtype[4].datatype 10004
+doctype[0].annotationtype[5].idx 10010
+doctype[0].annotationtype[5].name "canonical"
+doctype[0].annotationtype[5].internalid 3
+doctype[0].annotationtype[5].datatype 10004
+doctype[0].annotationtype[6].idx 10011
+doctype[0].annotationtype[6].name "token_type"
+doctype[0].annotationtype[6].internalid 2
+doctype[0].annotationtype[6].datatype 10002
+doctype[0].annotationtype[7].idx 10012
+doctype[0].annotationtype[7].name "special_token"
+doctype[0].annotationtype[7].internalid 9
+doctype[0].annotationtype[8].idx 10013
+doctype[0].annotationtype[8].name "stem"
+doctype[0].annotationtype[8].internalid 6
+doctype[0].annotationtype[8].datatype 10004
+doctype[0].structtype[0].idx 10001
+doctype[0].structtype[0].name document.header
+doctype[1].name "docindoc"
+doctype[1].idx 10014
+doctype[1].inherits[0].idx 10000
+doctype[1].contentstruct 10015
+doctype[1].structtype[0].idx 10015
+doctype[1].structtype[0].name docindoc.header
+doctype[1].structtype[0].field[0].name "name"
+doctype[1].structtype[0].field[0].internalid 1160796772
+doctype[1].structtype[0].field[0].type 10004
+doctype[1].structtype[0].field[1].name "content"
+doctype[1].structtype[0].field[1].internalid 482196823
+doctype[1].structtype[0].field[1].type 10004
+doctype[2].name "outerdoc"
+doctype[2].idx 10016
+doctype[2].inherits[0].idx 10000
+doctype[2].contentstruct 10017
+doctype[2].arraytype[0].idx 10018
+doctype[2].arraytype[0].elementtype 10014
+doctype[2].structtype[0].idx 10017
+doctype[2].structtype[0].name outerdoc.header
+doctype[2].structtype[0].field[0].name "innerdocuments"
+doctype[2].structtype[0].field[0].internalid 1655182511
+doctype[2].structtype[0].field[0].type 10018