aboutsummaryrefslogtreecommitdiffstats
path: root/configserver/src/main/resources
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2021-03-24 16:36:16 +0100
committerGitHub <noreply@github.com>2021-03-24 16:36:16 +0100
commitd4b36ce082bd794ccd60411106ed4db0e3fefcd3 (patch)
tree425ce29755ffaab73b8c3a39db76d28c76f059d5 /configserver/src/main/resources
parent77429da3edf53f376c53a66e387c550dc42cb3ec (diff)
Revert "Revert "Revert "Bjorncs/convert state ressources to request handler"" [run-systemtest]"
Diffstat (limited to 'configserver/src/main/resources')
-rw-r--r--configserver/src/main/resources/configserver-app/services.xml12
1 files changed, 8 insertions, 4 deletions
diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml
index cb821bfddb3..a4ca7081f0b 100644
--- a/configserver/src/main/resources/configserver-app/services.xml
+++ b/configserver/src/main/resources/configserver-app/services.xml
@@ -41,6 +41,8 @@
<component id="com.yahoo.vespa.config.server.rpc.security.DummyNodeIdentifierProvider" bundle="configserver" />
<component id="com.yahoo.vespa.config.server.rpc.security.DefaultRpcAuthorizerProvider" bundle="configserver" />
+ <component id="com.yahoo.vespa.serviceview.ConfigServerLocation" bundle="configserver" />
+
<components>
<include dir="config-models" />
</components>
@@ -67,10 +69,12 @@
<components bundle="orchestrator" />
</rest-api>
- <handler id="com.yahoo.vespa.serviceview.StateRequestHandler" bundle="configserver">
- <binding>http://*/serviceview/v1/</binding>
- <binding>http://*/serviceview/v1/*</binding>
- </handler>
+ <rest-api path="serviceview" jersey2="true">
+ <components bundle="configserver">
+ <package>com.yahoo.vespa.serviceview</package>
+ </components>
+ </rest-api>
+
<handler id='com.yahoo.vespa.config.server.http.HttpGetConfigHandler' bundle='configserver'>
<binding>http://*/config/v1/*/*</binding>
<binding>http://*/config/v1/*</binding>