Move it to a less general namespace

7 files changed, 9 insertions, 9 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
index aa6192291d3..12a0d35de5e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
@@ -2,7 +2,7 @@
 package com.yahoo.vespa.model.admin;
 
 import com.yahoo.config.model.producer.AbstractConfigProducer;
-import com.yahoo.vespa.config.StateserverConfig;
+import com.yahoo.vespa.config.core.StateserverConfig;
 import com.yahoo.vespa.model.AbstractService;
 
 /**
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
index a88d3b388a9..2f3dd008a63 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
@@ -17,7 +17,7 @@ import com.yahoo.config.provision.Zone;
 import com.yahoo.container.StatisticsConfig;
 import com.yahoo.container.jdisc.config.HealthMonitorConfig;
 import com.yahoo.net.HostName;
-import com.yahoo.vespa.config.StateserverConfig;
+import com.yahoo.vespa.config.core.StateserverConfig;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.component.Component;
diff --git a/configdefinitions/src/main/java/com/yahoo/vespa/config/package-info.java b/configdefinitions/src/main/java/com/yahoo/vespa/config/core/package-info.java
index 14b6892ca94..4f6c35c00b9 100644
--- a/configdefinitions/src/main/java/com/yahoo/vespa/config/package-info.java
+++ b/configdefinitions/src/main/java/com/yahoo/vespa/config/core/package-info.java
@@ -1,5 +1,5 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
-package com.yahoo.vespa.config;
+package com.yahoo.vespa.config.core;
 
 import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt
index d7023e19622..f578d797f3a 100644
--- a/configdefinitions/src/vespa/CMakeLists.txt
+++ b/configdefinitions/src/vespa/CMakeLists.txt
@@ -75,4 +75,4 @@ install_config_definition(zookeepers.def cloud.config.zookeepers.def)
 vespa_generate_config(configdefinitions bucketspaces.def)
 install_config_definition(bucketspaces.def vespa.config.content.core.bucketspaces.def)
 vespa_generate_config(configdefinitions stateserver.def)
-install_config_definition(stateserver.def vespa.config.stateserver.def)
+install_config_definition(stateserver.def vespa.config.core.stateserver.def)
diff --git a/configdefinitions/src/vespa/stateserver.def b/configdefinitions/src/vespa/stateserver.def
index 5be221efb49..a25844fa148 100644
--- a/configdefinitions/src/vespa/stateserver.def
+++ b/configdefinitions/src/vespa/stateserver.def
@@ -1,5 +1,5 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-namespace=vespa.config
+namespace=vespa.config.core
 
 # Port used for serving the state/vN api
 httpport int default = 0
diff --git a/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp b/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp
index ca6dcad1932..0f2576aa66e 100644
--- a/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp
+++ b/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp
@@ -24,7 +24,7 @@ ReconfigurableStateServer::ReconfigurableStateServer(const config::ConfigUri & c
       _configFetcher(std::make_unique<config::ConfigFetcher>(configUri.getContext())),
       _server()
 {
-    _configFetcher->subscribe<vespa::config::StateserverConfig>(configUri.getConfigId(), this);
+    _configFetcher->subscribe<vespa::config::core::StateserverConfig>(configUri.getConfigId(), this);
     _configFetcher->start();
 }
 
@@ -34,7 +34,7 @@ ReconfigurableStateServer::~ReconfigurableStateServer()
 }
 
 void
-ReconfigurableStateServer::configure(std::unique_ptr<vespa::config::StateserverConfig> config)
+ReconfigurableStateServer::configure(std::unique_ptr<vespa::config::core::StateserverConfig> config)
 {
     _server.reset();
     for (size_t retryTime(1); !_server && (retryTime < 10); retryTime++) {
diff --git a/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.h b/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.h
index a8747d09bfd..a632e6a72fa 100644
--- a/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.h
+++ b/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.h
@@ -12,7 +12,7 @@ namespace vespalib {
 }
 namespace slobrok {
 
-class ReconfigurableStateServer : private config::IFetcherCallback<vespa::config::StateserverConfig> {
+class ReconfigurableStateServer : private config::IFetcherCallback<vespa::config::core::StateserverConfig> {
 public:
     ReconfigurableStateServer(const config::ConfigUri & configUri,
                               vespalib::HealthProducer & healt,
@@ -20,7 +20,7 @@ public:
                               vespalib::ComponentConfigProducer & component);
     ~ReconfigurableStateServer();
 private:
-    void configure(std::unique_ptr<vespa::config::StateserverConfig> config) override;
+    void configure(std::unique_ptr<vespa::config::core::StateserverConfig> config) override;
     vespalib::HealthProducer               & _health;
     vespalib::MetricsProducer              & _metrics;
     vespalib::ComponentConfigProducer      & _components;