doc: -> id:

6 files changed, 13 insertions, 13 deletions

diff --git a/vespaclient-container-plugin/src/test/files/feedhandler/test10.xml b/vespaclient-container-plugin/src/test/files/feedhandler/test10.xml
index fcbf7622ab8..3c05dabc401 100644
--- a/vespaclient-container-plugin/src/test/files/feedhandler/test10.xml
+++ b/vespaclient-container-plugin/src/test/files/feedhandler/test10.xml
@@ -11,7 +11,7 @@
 
 <vespafeed>
 
-    <document documenttype="news" documentid="doc:news:http://news10a">
+    <document documenttype="news" documentid="id:ns:news::http://news10a">
         <url>testUrl</url>
         <title>testTitle</title>
         <last_downloaded>1</last_downloaded>
@@ -47,11 +47,11 @@
         </weightedsetstring>
     </document>
 
-    <document documenttype="news" documentid="doc:news:http://news10b">
+    <document documenttype="news" documentid="id:ns:news::http://news10b">
         <url>testUrl2</url>
     </document>
 
-    <update documenttype="news" documentid="doc:news:http://news10c">
+    <update documenttype="news" documentid="id:ns:news::http://news10c">
         <add field="stringarr">
             <item>addString1</item>
             <item>addString2</item>
@@ -70,7 +70,7 @@
         <add field="weightedsetstring">add14</add>
     </update>
 
-    <update documenttype="news" documentid="doc:news:http://news10d">
+    <update documenttype="news" documentid="id:ns:news::http://news10d">
         <assign field="url">assignUrl</assign>
         <assign field="value_long">2</assign>
         <assign field="stringarr">
@@ -87,5 +87,5 @@
         </assign>
     </update>
 
-    <remove documentid="doc:news:http://news10e"/>
+    <remove documentid="id:ns:news::http://news10e"/>
 </vespafeed>
diff --git a/vespaclient-container-plugin/src/test/files/feedhandler/test10b.xml b/vespaclient-container-plugin/src/test/files/feedhandler/test10b.xml
index 47aa1b7cdd8..bd33d365e2f 100644
--- a/vespaclient-container-plugin/src/test/files/feedhandler/test10b.xml
+++ b/vespaclient-container-plugin/src/test/files/feedhandler/test10b.xml
@@ -11,7 +11,7 @@
 
 <vespafeed>
 
-    <document documenttype="news" documentid="doc:news:http://news10a">
+    <document documenttype="news" documentid="id:ns:news::http://news10a">
         <url>testUrl</url>
         <title>testTitle</title>
         <last_downloaded>1</last_downloaded>
@@ -47,7 +47,7 @@
         </weightedsetstring>
     </document>
 
-    <document documenttype="news" documentid="doc:news:http://news10b">
+    <document documenttype="news" documentid="id:ns:news::http://news10b">
         <url>testUrl2</url>
     </document>
 </vespafeed>
diff --git a/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_docid.xml b/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_docid.xml
index 9c07a731b19..25a19319206 100644
--- a/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_docid.xml
+++ b/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_docid.xml
@@ -2,7 +2,7 @@
 <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <vespafeed>
 
-    <document documenttype="news" documentid="doc:news:http://news10a">
+    <document documenttype="news" documentid="id:ns:news::http://news10a">
         <url>testUrl</url>
         <title>testTitle</title>
         <last_downloaded>1</last_downloaded>
@@ -42,7 +42,7 @@
         <url>testUrl2</url>
     </document>
 
-    <document documenttype="news" documentid="doc:news:ok">
+    <document documenttype="news" documentid="id:ns:news::ok">
         <url>testUrl2</url>
     </document>
 </vespafeed>
diff --git a/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_docid_first.xml b/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_docid_first.xml
index bea7176a9b7..cfff6f3d8fb 100755
--- a/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_docid_first.xml
+++ b/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_docid_first.xml
@@ -5,7 +5,7 @@
         <url>testUrl2</url>
     </document>
 
-    <document documenttype="news" documentid="doc:news:http://news10a">
+    <document documenttype="news" documentid="id:ns:news::http://news10a">
         <url>testUrl</url>
         <title>testTitle</title>
         <last_downloaded>1</last_downloaded>
diff --git a/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_xml.xml b/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_xml.xml
index f6afeee1ed4..bd705d50b57 100755
--- a/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_xml.xml
+++ b/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_xml.xml
@@ -2,7 +2,7 @@
 <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <vespafeed>
 
-    <document documenttype="news" documentid="doc:news:http://news10a">
+    <document documenttype="news" documentid="id:ns:news::http://news10a">
         <url>testUrl</url>
         <title>testTitle</title>
         <last_downloaded>1</last_downloaded>
diff --git a/vespaclient-container-plugin/src/test/files/feedhandler/test_removes b/vespaclient-container-plugin/src/test/files/feedhandler/test_removes
index 0232970ed4f..4b06be99477 100755
--- a/vespaclient-container-plugin/src/test/files/feedhandler/test_removes
+++ b/vespaclient-container-plugin/src/test/files/feedhandler/test_removes
@@ -1,2 +1,2 @@
-doc:test:remove1
-doc:test:remove2
+id:ns:news::remove1
+id:ns:news::remove2