summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-04-05 23:52:44 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2018-04-05 23:52:44 +0200
commita3c4f8bf29c28384997d7c51b4d6e96801dcdf87 (patch)
treea8184f4cb3510674fed4e067e21ddfc7327ece96 /config-model
parentcc1811b7eab9fd445683835cbced1ab2d042c6f8 (diff)
Remove some even older unused test data.
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/test/cfg/search/data/v2/modularsearchchains/hosts.xml7
-rw-r--r--config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/chain2.xml9
-rw-r--r--config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/chain3.xml10
-rw-r--r--config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/default.xml6
-rw-r--r--config-model/src/test/cfg/search/data/v2/modularsearchchains/services.xml25
-rw-r--r--config-model/src/test/cfg/search/data/v2/proton-yamas/hosts.xml7
-rw-r--r--config-model/src/test/cfg/search/data/v2/proton-yamas/searchdefinitions/music.sd13
-rw-r--r--config-model/src/test/cfg/search/data/v2/proton-yamas/services.xml30
-rw-r--r--config-model/src/test/cfg/search/data/v2/stripped/services.xml32
9 files changed, 0 insertions, 139 deletions
diff --git a/config-model/src/test/cfg/search/data/v2/modularsearchchains/hosts.xml b/config-model/src/test/cfg/search/data/v2/modularsearchchains/hosts.xml
deleted file mode 100644
index 9eafb2106cb..00000000000
--- a/config-model/src/test/cfg/search/data/v2/modularsearchchains/hosts.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<hosts>
- <host name="localhost">
- <alias>node1</alias>
- </host>
-</hosts>
diff --git a/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/chain2.xml b/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/chain2.xml
deleted file mode 100644
index 7153eb71816..00000000000
--- a/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/chain2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<searchchains>
-<searcher class="com.yahoo.search.example.outsidechain2.SimpleSearcher" id="s1" bundle="mybundle"/>
-
-<searchchain id="chain2">
- <searcher id="s1"/>
- <searcher id="com.yahoo.search.example.chain2.SimpleSearcher2" bundle="mybundle"/>
-</searchchain>
-</searchchains>
diff --git a/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/chain3.xml b/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/chain3.xml
deleted file mode 100644
index 9eefecb9c28..00000000000
--- a/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/chain3.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<searchchains>
-<searchchain id="chain3_1">
- <searcher id="com.yahoo.search.example.chain3_1.SimpleSearcher" bundle="mybundle"/>
-</searchchain>
-<searchchain id="chain3_2">
- <searcher id="com.yahoo.search.example.chain3_2.SimpleSearcher" bundle="mybundle"/>
- <searcher id="com.yahoo.search.example.chain3_2.SimpleSearcher2" bundle="mybundle"/>
-</searchchain>
-</searchchains>
diff --git a/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/default.xml b/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/default.xml
deleted file mode 100644
index e030f3f43cc..00000000000
--- a/config-model/src/test/cfg/search/data/v2/modularsearchchains/search/chains/default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<searchchains>
-<searchchain id="default">
- <searcher id="com.yahoo.search.example.default.SimpleSearcher" bundle="mybundle"/>
-</searchchain>
-</searchchains>
diff --git a/config-model/src/test/cfg/search/data/v2/modularsearchchains/services.xml b/config-model/src/test/cfg/search/data/v2/modularsearchchains/services.xml
deleted file mode 100644
index 85a05c10eb3..00000000000
--- a/config-model/src/test/cfg/search/data/v2/modularsearchchains/services.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<services version="1.0">
-
- <admin version="2.0">
-
- <adminserver hostalias="node1"/>
-
- <logserver hostalias="node1"/>
- </admin>
-
- <search version="2.0">
- <qrservers>
- <qrserver hostalias="node1"/>
- <searchchains>
- <searcher id="com.yahoo.search.example.inline.SimpleSearcher3" bundle="mybundle"/>
- <searchchain id="inline">
- <searcher id="com.yahoo.search.example.inline.SimpleSearcher" bundle="mybundle"/>
- <searcher id="com.yahoo.search.example.inline.SimpleSearcher2" bundle="mybundle"/>
- </searchchain>
- </searchchains>
- </qrservers>
- </search>
-
-</services>
diff --git a/config-model/src/test/cfg/search/data/v2/proton-yamas/hosts.xml b/config-model/src/test/cfg/search/data/v2/proton-yamas/hosts.xml
deleted file mode 100644
index 42ac3751853..00000000000
--- a/config-model/src/test/cfg/search/data/v2/proton-yamas/hosts.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<hosts>
- <host name="zarya">
- <alias>node1</alias>
- </host>
-</hosts>
diff --git a/config-model/src/test/cfg/search/data/v2/proton-yamas/searchdefinitions/music.sd b/config-model/src/test/cfg/search/data/v2/proton-yamas/searchdefinitions/music.sd
deleted file mode 100644
index da9e2d14c55..00000000000
--- a/config-model/src/test/cfg/search/data/v2/proton-yamas/searchdefinitions/music.sd
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search music {
- document music {
- field f1 type string {
- indexing: summary | index
- # index-to: f1, all
- }
- field f2 type string {
- indexing: summary | index
- # index-to: f2, all
- }
- }
-}
diff --git a/config-model/src/test/cfg/search/data/v2/proton-yamas/services.xml b/config-model/src/test/cfg/search/data/v2/proton-yamas/services.xml
deleted file mode 100644
index 116b7f6e4c5..00000000000
--- a/config-model/src/test/cfg/search/data/v2/proton-yamas/services.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<services>
- <admin version="2.0">
- <adminserver hostalias="node1"/>
- <logserver hostalias="node1"/>
- <monitoring systemname="news_staging" interval="60"/>
- </admin>
-
- <container version="1.0">
- <nodes>
- <node hostalias="node1"/>
- </nodes>
- <search/>
- </container>
-
- <content id="music" version="1.0">
-
- <redundancy>2</redundancy>
-
- <documents>
- <document type="music" mode="index"/>
- </documents>
-
- <nodes>
- <node hostalias="node1" distribution-key="0"/>
- </nodes>
- </content>
-
-</services>
diff --git a/config-model/src/test/cfg/search/data/v2/stripped/services.xml b/config-model/src/test/cfg/search/data/v2/stripped/services.xml
deleted file mode 100644
index 427ef0d2cbb..00000000000
--- a/config-model/src/test/cfg/search/data/v2/stripped/services.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<services>
- <admin version="2.0">
- <adminserver hostalias="node1"/>
- <logserver hostalias="node1"/>
- </admin>
-
-
- <docproc version="3.0">
- <docprocchains>
- <docprocchain id="standalonechain">
- <documentprocessor id="AppleDocProc"/>
- </docprocchain>
- </docprocchains>
- </docproc>
-
- <storage version="3.0">
- <cluster redundancy="1">
-
- <group index="0" name="0">
- <node hostalias="node0" index="0"/>
- </group>
-
- <fleetcontrollers transitiontime="0">
- <fleetcontroller hostalias="node0" index="0"/>
- </fleetcontrollers>
-
- </cluster>
- </storage>
-
-</services>