diff options
| author | Arnstein Ressem <aressem@yahoo-inc.com> | 2017-10-20 09:42:57 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2017-10-20 09:42:57 +0200 |
| commit | f576f75daf93e49a122ae9148449a522e362bdc6 (patch) | |
| tree | fe1c49840211bb5b10b3261c57ebdd031b8ee629 /config-application-package | |
| parent | 58907c9e2345b01daa4908ed009d1603366203c4 (diff) | |
Config definitions moved to another location.
Diffstat (limited to 'config-application-package')
2 files changed, 2 insertions, 2 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java index f1565d1fa4b..97322fc1c55 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java @@ -111,7 +111,7 @@ public class FilesApplicationPackage implements ApplicationPackage { /** * New package from given path on local file system. Retrieves config definition files from - * the default location 'serverdb/classes'. + * the default location '$VESPA_HOME/share/vespa/configdefinitions'. * * @param appDir application package directory * @param preprocessedDir preprocessed application package output directory 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 325f89ea07b..7640a20d09c 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().underVespaHome("var/db/vespa/config_server/serverdb/classes"); + private static final String DEFAULT_SERVER_DEF_DIR = Defaults.getDefaults().underVespaHome("share/vespa/configdefinitions"); public StaticConfigDefinitionRepo() { this(new File(DEFAULT_SERVER_DEF_DIR)); |