Refactor startWar to use WarRunner from war-runner

earldouglas · Oct 16, 2024 · 403967d · 403967d
1 parent 92d762a
commit 403967d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 15 deletions.
diff --git a/build.sbt b/build.sbt
@@ -20,11 +20,11 @@ semanticdbVersion := scalafixSemanticdb.revision
 scalacOptions += "-Ywarn-unused-import"
 scalacOptions += s"-P:semanticdb:sourceroot:${baseDirectory.value}"
 
-// webapp-components-runner
+// war-runner
 lazy val warRunnerVersion =
-  settingKey[String]("webapp-components-runner version")
-warRunnerVersion := "10.1.28.0.0-M1"
-libraryDependencies += "com.earldouglas" % "webapp-components-runner" % warRunnerVersion.value % Provided
+  settingKey[String]("war-runner version")
+warRunnerVersion := "10.1.28.0.0-M2"
+libraryDependencies += "com.earldouglas" % "war-runner" % warRunnerVersion.value % Provided
 
 // sbt-buildinfo
 enablePlugins(BuildInfoPlugin)

diff --git a/src/main/scala/com/earldouglas/sbt/war/SbtWar.scala b/src/main/scala/com/earldouglas/sbt/war/SbtWar.scala
@@ -62,6 +62,22 @@ object SbtWar extends AutoPlugin {
 
     val startWar: Initialize[Task[Unit]] =
       Def.task {
+
+        val runnerConfigFile: File = {
+
+          val configurationFile: File =
+            (Compile / target).value / "war.properties"
+
+          Files
+            .writeString(
+              Paths.get(configurationFile.getPath()),
+              s"""|port=${warPort.value}
+                  |warFile=${pkg.value.getPath()}
+                  |""".stripMargin
+            )
+            .toFile()
+        }
+
         stopContainerInstance(streams.value.log.info(_))
 
         streams.value.log.info("[sbt-war] Starting server")
@@ -71,10 +87,8 @@ object SbtWar extends AutoPlugin {
             Seq(
               "-cp",
               Path.makeString(runnerJars.value),
-              "webapp.runner.launch.Main",
-              "--port",
-              warPort.value.toString(),
-              pkg.value.getPath()
+              "com.earldouglas.WarRunner",
+              runnerConfigFile.getPath()
             )
           )
         containerInstance.set(Some(process))
@@ -103,7 +117,7 @@ object SbtWar extends AutoPlugin {
     val runnerLibraries: Initialize[Seq[ModuleID]] =
       Def.setting {
         Seq(
-          "com.earldouglas" % "webapp-components-runner" % BuildInfo.warRunnerVersion % War
+          "com.earldouglas" % "war-runner" % BuildInfo.warRunnerVersion % War
         )
       }
 
@@ -128,12 +142,12 @@ object SbtWar extends AutoPlugin {
             .writeString(
               Paths.get(configurationFile.getPath()),
               s"""|hostname=localhost
-                    |port=${warPort.value}
-                    |contextPath=
-                    |emptyWebappDir=${emptyDir}
-                    |emptyClassesDir=${emptyDir}
-                    |resourceMap=${resourceMapString}
-                    |""".stripMargin
+                  |port=${warPort.value}
+                  |contextPath=
+                  |emptyWebappDir=${emptyDir}
+                  |emptyClassesDir=${emptyDir}
+                  |resourceMap=${resourceMapString}
+                  |""".stripMargin
             )
             .toFile()
         }