summaryrefslogtreecommitdiffstats
path: root/standalone-container/src
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-01-17 08:14:18 +0100
committerHarald Musum <musum@oath.com>2018-01-17 08:14:18 +0100
commit4d5cd477e8bb42c4ffe14f41bfc0a39a98a5d09e (patch)
tree4fb09a75929dfffcd0829580bddbaf8079fcac6d /standalone-container/src
parentcdee0b6682d9a3ff88eae6d001c10c4613db6c40 (diff)
Prepare for removal of RuleConfigDeriver
Diffstat (limited to 'standalone-container/src')
-rw-r--r--standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneContainerApplication.scala9
1 files changed, 3 insertions, 6 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 1d4b83ce7d3..1f3ff652224 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
@@ -8,7 +8,7 @@ import java.nio.file.{FileSystems, Files, Path, Paths}
import com.google.inject.name.Names
import com.google.inject.{AbstractModule, Inject, Injector, Key}
import com.yahoo.collections.CollectionUtil.first
-import com.yahoo.config.application.api.{ApplicationPackage, FileRegistry, RuleConfigDeriver}
+import com.yahoo.config.application.api.{ApplicationPackage, FileRegistry}
import com.yahoo.config.model.application.provider._
import com.yahoo.config.model.builder.xml.XmlHelper
import com.yahoo.config.model.deploy.DeployState
@@ -33,7 +33,7 @@ import scala.collection.JavaConverters._
import scala.util.Try
/**
- * @author tonytv
+ * @author Tony Vaagenes
* @author gjoranv
*/
class StandaloneContainerApplication @Inject()(injector: Injector) extends Application {
@@ -157,10 +157,7 @@ object StandaloneContainerApplication {
configModelRepo: ConfigModelRepo = new ConfigModelRepo): (VespaModel, Container) = {
val logger = new BaseDeployLogger
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 = {}
- }, logger)
+ val applicationPackage = rawApplicationPackage.preprocess(Zone.defaultZone(), logger)
validateApplication(applicationPackage)
val deployState = new DeployState.Builder().
applicationPackage(applicationPackage).