searchdefinitions -> schemas

21 files changed, 2 insertions, 2 deletions

diff --git a/configserver/src/test/apps/app-jdisc-only-restart/searchdefinitions/music.sd b/configserver/src/test/apps/app-jdisc-only-restart/schemas/music.sd
index a2d4614c657..a2d4614c657 100644
--- a/configserver/src/test/apps/app-jdisc-only-restart/searchdefinitions/music.sd
+++ b/configserver/src/test/apps/app-jdisc-only-restart/schemas/music.sd
diff --git a/configserver/src/test/apps/app-jdisc-only/searchdefinitions/music.sd b/configserver/src/test/apps/app-jdisc-only/schemas/music.sd
index a2d4614c657..a2d4614c657 100644
--- a/configserver/src/test/apps/app-jdisc-only/searchdefinitions/music.sd
+++ b/configserver/src/test/apps/app-jdisc-only/schemas/music.sd
diff --git a/configserver/src/test/apps/app-major-version-2/searchdefinitions/music.sd b/configserver/src/test/apps/app-major-version-2/schemas/music.sd
index 7670e78f22b..7670e78f22b 100644
--- a/configserver/src/test/apps/app-major-version-2/searchdefinitions/music.sd
+++ b/configserver/src/test/apps/app-major-version-2/schemas/music.sd
diff --git a/configserver/src/test/apps/app/searchdefinitions/music.sd b/configserver/src/test/apps/app/schemas/music.sd
index 7670e78f22b..7670e78f22b 100644
--- a/configserver/src/test/apps/app/searchdefinitions/music.sd
+++ b/configserver/src/test/apps/app/schemas/music.sd
diff --git a/configserver/src/test/apps/hosted-no-write-access-control/searchdefinitions/music.sd b/configserver/src/test/apps/hosted-no-write-access-control/schemas/music.sd
index 78d58b27d4a..78d58b27d4a 100644
--- a/configserver/src/test/apps/hosted-no-write-access-control/searchdefinitions/music.sd
+++ b/configserver/src/test/apps/hosted-no-write-access-control/schemas/music.sd
diff --git a/configserver/src/test/apps/hosted/searchdefinitions/music.sd b/configserver/src/test/apps/hosted/schemas/music.sd
index 78d58b27d4a..78d58b27d4a 100644
--- a/configserver/src/test/apps/hosted/searchdefinitions/music.sd
+++ b/configserver/src/test/apps/hosted/schemas/music.sd
diff --git a/configserver/src/test/apps/zkapp/searchdefinitions/bar.expression b/configserver/src/test/apps/zkapp/schemas/bar.expression
index eed496e6aeb..eed496e6aeb 100644
--- a/configserver/src/test/apps/zkapp/searchdefinitions/bar.expression
+++ b/configserver/src/test/apps/zkapp/schemas/bar.expression
diff --git a/configserver/src/test/apps/zkapp/searchdefinitions/foo.expression b/configserver/src/test/apps/zkapp/schemas/foo.expression
index ce26aa75dcb..ce26aa75dcb 100644
--- a/configserver/src/test/apps/zkapp/searchdefinitions/foo.expression
+++ b/configserver/src/test/apps/zkapp/schemas/foo.expression
diff --git a/configserver/src/test/apps/zkapp/searchdefinitions/laptop.sd b/configserver/src/test/apps/zkapp/schemas/laptop.sd
index 21a76ad605c..21a76ad605c 100644
--- a/configserver/src/test/apps/zkapp/searchdefinitions/laptop.sd
+++ b/configserver/src/test/apps/zkapp/schemas/laptop.sd
diff --git a/configserver/src/test/apps/zkapp/searchdefinitions/music.sd b/configserver/src/test/apps/zkapp/schemas/music.sd
index bdf4c060cf7..bdf4c060cf7 100644
--- a/configserver/src/test/apps/zkapp/searchdefinitions/music.sd
+++ b/configserver/src/test/apps/zkapp/schemas/music.sd
diff --git a/configserver/src/test/apps/zkapp/searchdefinitions/pc.sd b/configserver/src/test/apps/zkapp/schemas/pc.sd
index bdc90328cdb..bdc90328cdb 100644
--- a/configserver/src/test/apps/zkapp/searchdefinitions/pc.sd
+++ b/configserver/src/test/apps/zkapp/schemas/pc.sd
diff --git a/configserver/src/test/apps/zkapp/searchdefinitions/product.sd b/configserver/src/test/apps/zkapp/schemas/product.sd
index 588a1d544c6..588a1d544c6 100644
--- a/configserver/src/test/apps/zkapp/searchdefinitions/product.sd
+++ b/configserver/src/test/apps/zkapp/schemas/product.sd
diff --git a/configserver/src/test/apps/zkapp/searchdefinitions/sock.sd b/configserver/src/test/apps/zkapp/schemas/sock.sd
index 9331c0caf54..9331c0caf54 100644
--- a/configserver/src/test/apps/zkapp/searchdefinitions/sock.sd
+++ b/configserver/src/test/apps/zkapp/schemas/sock.sd
diff --git a/configserver/src/test/apps/zkfeed/searchdefinitions/bar.expression b/configserver/src/test/apps/zkfeed/schemas/bar.expression
index eed496e6aeb..eed496e6aeb 100644
--- a/configserver/src/test/apps/zkfeed/searchdefinitions/bar.expression
+++ b/configserver/src/test/apps/zkfeed/schemas/bar.expression
diff --git a/configserver/src/test/apps/zkfeed/searchdefinitions/foo.expression b/configserver/src/test/apps/zkfeed/schemas/foo.expression
index ce26aa75dcb..ce26aa75dcb 100644
--- a/configserver/src/test/apps/zkfeed/searchdefinitions/foo.expression
+++ b/configserver/src/test/apps/zkfeed/schemas/foo.expression
diff --git a/configserver/src/test/apps/zkfeed/searchdefinitions/laptop.sd b/configserver/src/test/apps/zkfeed/schemas/laptop.sd
index 21a76ad605c..21a76ad605c 100644
--- a/configserver/src/test/apps/zkfeed/searchdefinitions/laptop.sd
+++ b/configserver/src/test/apps/zkfeed/schemas/laptop.sd
diff --git a/configserver/src/test/apps/zkfeed/searchdefinitions/pc.sd b/configserver/src/test/apps/zkfeed/schemas/pc.sd
index bdc90328cdb..bdc90328cdb 100644
--- a/configserver/src/test/apps/zkfeed/searchdefinitions/pc.sd
+++ b/configserver/src/test/apps/zkfeed/schemas/pc.sd
diff --git a/configserver/src/test/apps/zkfeed/searchdefinitions/product.sd b/configserver/src/test/apps/zkfeed/schemas/product.sd
index 588a1d544c6..588a1d544c6 100644
--- a/configserver/src/test/apps/zkfeed/searchdefinitions/product.sd
+++ b/configserver/src/test/apps/zkfeed/schemas/product.sd
diff --git a/configserver/src/test/apps/zkfeed/searchdefinitions/sock.sd b/configserver/src/test/apps/zkfeed/schemas/sock.sd
index 9331c0caf54..9331c0caf54 100644
--- a/configserver/src/test/apps/zkfeed/searchdefinitions/sock.sd
+++ b/configserver/src/test/apps/zkfeed/schemas/sock.sd
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java
index 016192e3281..2a18a1b2221 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java
@@ -141,9 +141,9 @@ public class CompressedApplicationInputStreamTest {
         assertTrue(files.contains(new File(outApp, "services.xml")));
         assertTrue(files.contains(new File(outApp, "hosts.xml")));
         assertTrue(files.contains(new File(outApp, "deployment.xml")));
-        assertTrue(files.contains(new File(outApp, "searchdefinitions")));
+        assertTrue(files.contains(new File(outApp, "schemas")));
         assertTrue(files.contains(new File(outApp, "external")));
-        File sd = files.get(files.indexOf(new File(outApp, "searchdefinitions")));
+        File sd = files.get(files.indexOf(new File(outApp, "schemas")));
         assertTrue(sd.isDirectory());
         assertThat(sd.listFiles().length, is(1));
         assertThat(sd.listFiles()[0].getAbsolutePath(), is(new File(sd, "keyvalue.sd").getAbsolutePath()));
diff --git a/configserver/src/test/resources/deploy/advancedapp/searchdefinitions/keyvalue.sd b/configserver/src/test/resources/deploy/advancedapp/schemas/keyvalue.sd
index 2d0f1ef0b75..2d0f1ef0b75 100644
--- a/configserver/src/test/resources/deploy/advancedapp/searchdefinitions/keyvalue.sd
+++ b/configserver/src/test/resources/deploy/advancedapp/schemas/keyvalue.sd