diff options
3 files changed, 5 insertions, 5 deletions
diff --git a/application/src/main/java/com/yahoo/application/Application.java b/application/src/main/java/com/yahoo/application/Application.java index 9654a798353..cc1b785ae0b 100644 --- a/application/src/main/java/com/yahoo/application/Application.java +++ b/application/src/main/java/com/yahoo/application/Application.java @@ -102,7 +102,8 @@ public final class Application implements AutoCloseable { private VespaModel createVespaModel() { try { DeployState deployState = new DeployState.Builder() - .applicationPackage(FilesApplicationPackage.fromFile(path.toFile())) + .applicationPackage(FilesApplicationPackage.fromFile(path.toFile(), + /* Include source files */ true)) .deployLogger((level, s) -> { }) .build(); return new VespaModel(new NullConfigModelRegistry(), deployState); 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 60844b57ef0..f8318885646 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 @@ -74,7 +74,7 @@ public class FilesApplicationPackage implements ApplicationPackage { /** Creates from a directory with source files included */ public static FilesApplicationPackage fromFile(File appDir) { - return fromFile(appDir, true); + return fromFile(appDir, false); } /** @@ -661,7 +661,7 @@ public class FilesApplicationPackage implements ApplicationPackage { if (getHostsFile().exists()) { preprocessXML(new File(preprocessedDir, HOSTS), getHostsFile(), zone); } - FilesApplicationPackage preprocessed = FilesApplicationPackage.fromFile(preprocessedDir); + FilesApplicationPackage preprocessed = FilesApplicationPackage.fromFile(preprocessedDir, includeSourceFiles); preprocessed.copyUserDefsIntoApplication(); return preprocessed; } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java index abffb002a76..33671b84d72 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java @@ -24,8 +24,7 @@ public class PermanentApplicationPackage { public PermanentApplicationPackage(ConfigserverConfig config) { File app = new File(Defaults.getDefaults().underVespaHome(config.applicationDirectory())); - applicationPackage = Optional.<ApplicationPackage>ofNullable(app.exists() ? - FilesApplicationPackage.fromFile(app) : null); + applicationPackage = Optional.<ApplicationPackage>ofNullable(app.exists() ? FilesApplicationPackage.fromFile(app) : null); if (applicationPackage.isPresent()) { log.log(LogLevel.DEBUG, "Detected permanent application package in '" + Defaults.getDefaults().underVespaHome(config.applicationDirectory()) + |