diff options
| author | Arne H Juul <arnej@yahoo-inc.com> | 2017-06-19 12:37:51 +0200 |
|---|---|---|
| committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-06-19 12:38:18 +0200 |
| commit | 7a2dfe16cf9478af2a98195f6d10e3aca0437706 (patch) | |
| tree | f270c6639369bd1fde8a30ce75f187d9597a2827 /config-application-package | |
| parent | 5b6faca5f132a290b875c266daf7b19082708b44 (diff) | |
use underVespaHome
Diffstat (limited to 'config-application-package')
2 files changed, 3 insertions, 3 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidator.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidator.java index a2daa8c5afc..338afe0eb7c 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidator.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidator.java @@ -160,9 +160,9 @@ public class SchemaValidator { if (bundle == null) { File schemaPath; if (vespaVersion.getMajor() == 5) { - schemaPath = new File(Defaults.getDefaults().vespaHome() + "share/vespa/schema/version/5.x/schema/"); + schemaPath = new File(Defaults.getDefaults().underVespaHome("share/vespa/schema/version/5.x/schema/")); } else { - schemaPath = new File(Defaults.getDefaults().vespaHome() + "share/vespa/schema/"); + schemaPath = new File(Defaults.getDefaults().underVespaHome("share/vespa/schema/")); } log.log(LogLevel.DEBUG, "Using schemas found in " + schemaPath); copySchemas(schemaPath, tmpDir); diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/StaticConfigDefinitionRepo.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/StaticConfigDefinitionRepo.java index e0962270a82..325f89ea07b 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/StaticConfigDefinitionRepo.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/StaticConfigDefinitionRepo.java @@ -29,7 +29,7 @@ public class StaticConfigDefinitionRepo implements ConfigDefinitionRepo { private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(StaticConfigDefinitionRepo.class.getName()); private final Map<ConfigDefinitionKey, ConfigDefinition> configDefinitions = new LinkedHashMap<>(); - private static final String DEFAULT_SERVER_DEF_DIR = Defaults.getDefaults().vespaHome() + "var/db/vespa/config_server/serverdb/classes"; + private static final String DEFAULT_SERVER_DEF_DIR = Defaults.getDefaults().underVespaHome("var/db/vespa/config_server/serverdb/classes"); public StaticConfigDefinitionRepo() { this(new File(DEFAULT_SERVER_DEF_DIR)); |