diff options
Diffstat (limited to 'config-application-package')
3 files changed, 7 insertions, 12 deletions
diff --git a/config-application-package/pom.xml b/config-application-package/pom.xml index 869e161f57d..3d471f1c94b 100644 --- a/config-application-package/pom.xml +++ b/config-application-package/pom.xml @@ -6,12 +6,12 @@ <parent> <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> - <version>7-SNAPSHOT</version> + <version>8-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>config-application-package</artifactId> <packaging>container-plugin</packaging> - <version>7-SNAPSHOT</version> + <version>8-SNAPSHOT</version> <dependencies> <dependency> <groupId>com.yahoo.vespa</groupId> 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 9e72efab07b..826cf85798a 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 @@ -166,12 +166,6 @@ public class FilesApplicationPackage extends AbstractApplicationPackage { } @Override - @SuppressWarnings("deprecation") - public String getApplicationName() { - return metaData.getApplicationId().application().value(); - } - - @Override public ApplicationId getApplicationId() { return metaData.getApplicationId(); } @Override diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidators.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidators.java index 9ba150af245..57dca2293e6 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidators.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidators.java @@ -3,10 +3,8 @@ package com.yahoo.config.model.application.provider; import com.yahoo.component.Version; import com.yahoo.io.IOUtils; -import java.util.logging.Level; import org.osgi.framework.Bundle; import org.xml.sax.SAXException; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -16,6 +14,7 @@ import java.net.URL; import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; +import java.util.logging.Level; import java.util.logging.Logger; import static com.yahoo.vespa.defaults.Defaults.getDefaults; @@ -133,9 +132,11 @@ public class SchemaValidators { String pathPrefix = getDefaults().underVespaHome("share/vespa/schema/"); File schemaPath = new File(pathPrefix + "version/" + vespaVersion.getMajor() + ".x/schema/"); // Fallback to path without version if path with version does not exist - if (! schemaPath.exists()) + if (! schemaPath.exists()) { + log.log(Level.INFO, "Found no schemas in " + schemaPath + ", fallback to schemas in " + pathPrefix); schemaPath = new File(pathPrefix); - log.log(Level.FINE, "Using schemas found in %s", schemaPath); + } + log.log(Level.FINE, "Using schemas found in " + schemaPath); copySchemas(schemaPath, tmpDir); } else { log.log(Level.FINE, () -> String.format("Saving schemas for model bundle %s:%s", bundle.getSymbolicName(), bundle.getVersion())); |