From 6a3c6ba874bd1977829f030d9d6f03f783f9e184 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@oath.com>
Date: Mon, 19 Mar 2018 15:17:56 +0100
Subject: Store application type in Admin.

---
 .../src/main/java/com/yahoo/vespa/model/admin/Admin.java         | 9 +++++++++
 .../yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java   | 1 +
 2 files changed, 10 insertions(+)

(limited to 'config-model')

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
index 68030cd47da..1b59818a4bc 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.model.admin;
 import com.yahoo.cloud.config.SlobroksConfig;
 import com.yahoo.cloud.config.ZookeepersConfig;
 import com.yahoo.cloud.config.log.LogdConfig;
+import com.yahoo.config.model.ConfigModelContext.ApplicationType;
 import com.yahoo.config.model.api.ConfigServerSpec;
 import com.yahoo.config.model.deploy.DeployProperties;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
@@ -49,6 +50,8 @@ public class Admin extends AbstractConfigProducer implements Serializable {
     private Logserver logserver;
     private LogForwarder.Config logForwarderConfig = null;
 
+    private ApplicationType applicationType = ApplicationType.DEFAULT;
+
     public void setLogForwarderConfig(LogForwarder.Config cfg) {
         this.logForwarderConfig = cfg;
     }
@@ -273,4 +276,10 @@ public class Admin extends AbstractConfigProducer implements Serializable {
         return multitenant;
     }
 
+    public void setApplicationType(ApplicationType applicationType) {
+        this.applicationType = applicationType;
+    }
+
+    public ApplicationType getApplicationType() { return applicationType; }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
index 64cbcaafd9f..a78e9ad30fc 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
@@ -72,6 +72,7 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu
         FileDistributionConfigProducer fileDistributionConfigProducer = getFileDistributionConfigProducer(parent);
 
         Admin admin = new Admin(parent, monitoring, metrics, legacyMetricsConsumers, multitenant, fileDistributionConfigProducer);
+        admin.setApplicationType(applicationType);
         doBuildAdmin(admin, adminElement);
         new ModelConfigProvider(admin);
 
-- 
cgit v1.2.3