diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2018-01-19 12:56:17 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2018-01-19 12:56:17 +0100 |
| commit | d7b1c17a9f5c4a656a8bcd0caeca9314ae5212c5 (patch) | |
| tree | 9f62f913eb6ac1bf71414bb98b5ee3910a41c8f2 /config-application-package | |
| parent | b9e38300bf58e9eaa1a1b977f2d8b5303982d8a3 (diff) | |
Refer to generated tensors by absolute path
Diffstat (limited to 'config-application-package')
2 files changed, 3 insertions, 7 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/AppSubDirs.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/AppSubDirs.java index 4f59a9467fb..f64c36cdf3f 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/AppSubDirs.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/AppSubDirs.java @@ -45,10 +45,6 @@ public class AppSubDirs { return root.first; } - public File templates() { - return templates.first; - } - public File rules() { return rules.first; } 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 13d9283d151..3388261c798 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 @@ -666,9 +666,9 @@ public class FilesApplicationPackage implements ApplicationPackage { public ApplicationPackage preprocess(Zone zone, DeployLogger logger) throws IOException, TransformerException, ParserConfigurationException, SAXException { IOUtils.recursiveDeleteDir(preprocessedDir); IOUtils.copyDirectory(appDir, preprocessedDir, -1, (dir, name) -> ! name.equals(".preprocessed") && - ! name.equals(SERVICES) && - ! name.equals(HOSTS) && - ! name.equals(CONFIG_DEFINITIONS_DIR)); + ! name.equals(SERVICES) && + ! name.equals(HOSTS) && + ! name.equals(CONFIG_DEFINITIONS_DIR)); preprocessXML(new File(preprocessedDir, SERVICES), getServicesFile(), zone); if (getHostsFile().exists()) { preprocessXML(new File(preprocessedDir, HOSTS), getHostsFile(), zone); |