diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-06-03 08:42:15 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2021-06-03 08:42:15 +0200 |
commit | 2a9e6b4fc298d654f04f23dd0965fb4e221b9ac6 (patch) | |
tree | d54b1b456a9b8e910830302642a8b89bc233ecb3 | |
parent | 6d7ba4368a8d81247fa66bfe60557dadaffb4108 (diff) |
searchdefinitions -> schemas
-rw-r--r-- | application-preprocessor/src/test/resources/simple/schemas/music.sd (renamed from application-preprocessor/src/test/resources/simple/searchdefinitions/music.sd) | 0 | ||||
-rw-r--r-- | application/src/test/app-packages/withcontent/schemas/mydoc.sd (renamed from application/src/test/app-packages/withcontent/searchdefinitions/mydoc.sd) | 0 | ||||
-rw-r--r-- | config-application-package/src/test/resources/app-pinning-major-version/schemas/music.sd (renamed from config-application-package/src/test/resources/app-pinning-major-version/searchdefinitions/music.sd) | 0 | ||||
-rw-r--r-- | config-application-package/src/test/resources/app-with-deployment/schemas/music.sd (renamed from config-application-package/src/test/resources/app-with-deployment/searchdefinitions/music.sd) | 0 | ||||
-rw-r--r-- | config-application-package/src/test/resources/multienvapp/schemas/music.sd (renamed from config-application-package/src/test/resources/multienvapp/searchdefinitions/music.sd) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/app-jdisc-only-restart/schemas/music.sd (renamed from configserver/src/test/apps/app-jdisc-only-restart/searchdefinitions/music.sd) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/app-jdisc-only/schemas/music.sd (renamed from configserver/src/test/apps/app-jdisc-only/searchdefinitions/music.sd) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/app-major-version-2/schemas/music.sd (renamed from configserver/src/test/apps/app-major-version-2/searchdefinitions/music.sd) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/app/schemas/music.sd (renamed from configserver/src/test/apps/app/searchdefinitions/music.sd) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/hosted-no-write-access-control/schemas/music.sd (renamed from configserver/src/test/apps/hosted-no-write-access-control/searchdefinitions/music.sd) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/hosted/schemas/music.sd (renamed from configserver/src/test/apps/hosted/searchdefinitions/music.sd) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/zkapp/schemas/bar.expression (renamed from configserver/src/test/apps/zkapp/searchdefinitions/bar.expression) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/zkapp/schemas/foo.expression (renamed from configserver/src/test/apps/zkapp/searchdefinitions/foo.expression) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/zkapp/schemas/laptop.sd (renamed from configserver/src/test/apps/zkapp/searchdefinitions/laptop.sd) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/zkapp/schemas/music.sd (renamed from configserver/src/test/apps/zkapp/searchdefinitions/music.sd) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/zkapp/schemas/pc.sd (renamed from configserver/src/test/apps/zkapp/searchdefinitions/pc.sd) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/zkapp/schemas/product.sd (renamed from configserver/src/test/apps/zkapp/searchdefinitions/product.sd) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/zkapp/schemas/sock.sd (renamed from configserver/src/test/apps/zkapp/searchdefinitions/sock.sd) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/zkfeed/schemas/bar.expression (renamed from configserver/src/test/apps/zkfeed/searchdefinitions/bar.expression) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/zkfeed/schemas/foo.expression (renamed from configserver/src/test/apps/zkfeed/searchdefinitions/foo.expression) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/zkfeed/schemas/laptop.sd (renamed from configserver/src/test/apps/zkfeed/searchdefinitions/laptop.sd) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/zkfeed/schemas/pc.sd (renamed from configserver/src/test/apps/zkfeed/searchdefinitions/pc.sd) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/zkfeed/schemas/product.sd (renamed from configserver/src/test/apps/zkfeed/searchdefinitions/product.sd) | 0 | ||||
-rw-r--r-- | configserver/src/test/apps/zkfeed/schemas/sock.sd (renamed from configserver/src/test/apps/zkfeed/searchdefinitions/sock.sd) | 0 | ||||
-rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java | 4 | ||||
-rw-r--r-- | configserver/src/test/resources/deploy/advancedapp/schemas/keyvalue.sd (renamed from configserver/src/test/resources/deploy/advancedapp/searchdefinitions/keyvalue.sd) | 0 |
26 files changed, 2 insertions, 2 deletions
diff --git a/application-preprocessor/src/test/resources/simple/searchdefinitions/music.sd b/application-preprocessor/src/test/resources/simple/schemas/music.sd index c0190a4a7a8..c0190a4a7a8 100644 --- a/application-preprocessor/src/test/resources/simple/searchdefinitions/music.sd +++ b/application-preprocessor/src/test/resources/simple/schemas/music.sd diff --git a/application/src/test/app-packages/withcontent/searchdefinitions/mydoc.sd b/application/src/test/app-packages/withcontent/schemas/mydoc.sd index 3a0b829d60c..3a0b829d60c 100644 --- a/application/src/test/app-packages/withcontent/searchdefinitions/mydoc.sd +++ b/application/src/test/app-packages/withcontent/schemas/mydoc.sd diff --git a/config-application-package/src/test/resources/app-pinning-major-version/searchdefinitions/music.sd b/config-application-package/src/test/resources/app-pinning-major-version/schemas/music.sd index c0190a4a7a8..c0190a4a7a8 100644 --- a/config-application-package/src/test/resources/app-pinning-major-version/searchdefinitions/music.sd +++ b/config-application-package/src/test/resources/app-pinning-major-version/schemas/music.sd diff --git a/config-application-package/src/test/resources/app-with-deployment/searchdefinitions/music.sd b/config-application-package/src/test/resources/app-with-deployment/schemas/music.sd index c0190a4a7a8..c0190a4a7a8 100644 --- a/config-application-package/src/test/resources/app-with-deployment/searchdefinitions/music.sd +++ b/config-application-package/src/test/resources/app-with-deployment/schemas/music.sd diff --git a/config-application-package/src/test/resources/multienvapp/searchdefinitions/music.sd b/config-application-package/src/test/resources/multienvapp/schemas/music.sd index c0190a4a7a8..c0190a4a7a8 100644 --- a/config-application-package/src/test/resources/multienvapp/searchdefinitions/music.sd +++ b/config-application-package/src/test/resources/multienvapp/schemas/music.sd 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 |