summaryrefslogtreecommitdiffstats
path: root/config-application-package
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2016-09-27 13:08:26 +0200
committerHarald Musum <musum@yahoo-inc.com>2016-09-27 13:08:26 +0200
commit8d7a025c11e90e3e99335f226036e7091b1afa30 (patch)
tree6fbc130918e0bb627c9d317a388985d057d0ed9c /config-application-package
parent391ead017845f5d12d343570922099229475f92b (diff)
Do not remove old method yet
Diffstat (limited to 'config-application-package')
-rw-r--r--config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java14
1 files changed, 14 insertions, 0 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 1f39e2474da..912b4ad2707 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
@@ -628,6 +628,12 @@ public class FilesApplicationPackage implements ApplicationPackage {
validateXML(Optional.empty());
}
+ // TODO: Remove when no version older than 6.33 is used
+ @Override
+ public void validateXML(DeployLogger logger) throws IOException {
+ validateXML(Optional.empty());
+ }
+
@Override
public void validateXML(Optional<Version> vespaVersion) throws IOException {
ApplicationPackageXmlFilesValidator xmlFilesValidator = ApplicationPackageXmlFilesValidator.createDefaultXMLValidator(appDir, vespaVersion);
@@ -635,6 +641,14 @@ public class FilesApplicationPackage implements ApplicationPackage {
ApplicationPackageXmlFilesValidator.checkIncludedDirs(this);
}
+ // TODO: Remove when no version older than 6.33 is used
+ @Override
+ public void validateXML(DeployLogger logger, Optional<Version> vespaVersion) throws IOException {
+ ApplicationPackageXmlFilesValidator xmlFilesValidator = ApplicationPackageXmlFilesValidator.createDefaultXMLValidator(appDir, vespaVersion);
+ xmlFilesValidator.checkApplication();
+ ApplicationPackageXmlFilesValidator.checkIncludedDirs(this);
+ }
+
@Override
public void writeMetaData() throws IOException {
File metaFile = new File(appDir, META_FILE_NAME);