aboutsummaryrefslogtreecommitdiffstats
path: root/standalone-container
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2016-09-19 16:49:42 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2016-09-19 16:49:42 +0200
commitbb71172f97b9227098a2b452a316e659b05e6340 (patch)
tree06c9fb89e53727cc05270b3afe1af973ff807c8e /standalone-container
parenta8133138b63eea5b48568d71f2902ac560f8f96e (diff)
Allow source directories in standalone application.
This allows Application instances to run tests referencing config definitions without first building the jar containing those config definitions. Application currently instantiates Vespa models directly and (via dependency injection) through standalone container.
Diffstat (limited to 'standalone-container')
-rw-r--r--standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala
index 324de2771f4..8157170e6d1 100644
--- a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala
+++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala
@@ -166,7 +166,7 @@ object StandaloneContainerApplication {
networkingOption: Networking,
configModelRepo: ConfigModelRepo = new ConfigModelRepo): (MockRoot, Container) = {
val logger = new BaseDeployLogger
- val rawApplicationPackage = new FilesApplicationPackage.Builder(applicationPath.toFile).preprocessedDir(preprocessedApplicationDir).build()
+ val rawApplicationPackage = new FilesApplicationPackage.Builder(applicationPath.toFile).includeSourceFiles(true).preprocessedDir(preprocessedApplicationDir).build()
// TODO: Needed until we get rid of semantic rules
val applicationPackage = rawApplicationPackage.preprocess(Zone.defaultZone(), new RuleConfigDeriver {
override def derive(ruleBaseDir: String, outputDir: String): Unit = {}