summaryrefslogtreecommitdiffstats
path: root/config-application-package
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-06-19 12:42:47 +0200
committerArne H Juul <arnej@yahoo-inc.com>2017-06-19 12:43:41 +0200
commit2ad3de0336757728d7393ef76f04132879e98792 (patch)
tree68959da38f2e32067e0d8d951ff42d9dad87d74b /config-application-package
parent7a2dfe16cf9478af2a98195f6d10e3aca0437706 (diff)
import getDefaults
Diffstat (limited to 'config-application-package')
-rw-r--r--config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidator.java6
1 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 338afe0eb7c..f5c5206d75c 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
@@ -11,7 +11,7 @@ import com.yahoo.config.application.api.DeployLogger;
import com.yahoo.io.IOUtils;
import com.yahoo.io.reader.NamedReader;
import com.yahoo.log.LogLevel;
-import com.yahoo.vespa.defaults.Defaults;
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
import com.yahoo.yolean.Exceptions;
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
@@ -160,9 +160,9 @@ public class SchemaValidator {
if (bundle == null) {
File schemaPath;
if (vespaVersion.getMajor() == 5) {
- schemaPath = new File(Defaults.getDefaults().underVespaHome("share/vespa/schema/version/5.x/schema/"));
+ schemaPath = new File(getDefaults().underVespaHome("share/vespa/schema/version/5.x/schema/"));
} else {
- schemaPath = new File(Defaults.getDefaults().underVespaHome("share/vespa/schema/"));
+ schemaPath = new File(getDefaults().underVespaHome("share/vespa/schema/"));
}
log.log(LogLevel.DEBUG, "Using schemas found in " + schemaPath);
copySchemas(schemaPath, tmpDir);