From 7b63c31317b2d155db19c44089d51ca0b1586ad0 Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Tue, 11 Dec 2018 10:57:09 -0500
Subject: [PATCH] Revert "Revert "Fix akka applications packaging
configuration""
---
akka-bbb-apps/build.sbt | 4 +---
akka-bbb-apps/src/main/resources/README | 0
.../{main/resources => universal/conf}/application.conf | 0
.../src/{main/resources => universal/conf}/logback.xml | 0
akka-bbb-fsesl/build.sbt | 7 ++-----
akka-bbb-fsesl/src/main/resources/README | 0
.../{main/resources => universal/conf}/application.conf | 0
.../src/{main/resources => universal/conf}/logback.xml | 0
8 files changed, 3 insertions(+), 8 deletions(-)
delete mode 100644 akka-bbb-apps/src/main/resources/README
rename akka-bbb-apps/src/{main/resources => universal/conf}/application.conf (100%)
rename akka-bbb-apps/src/{main/resources => universal/conf}/logback.xml (100%)
delete mode 100644 akka-bbb-fsesl/src/main/resources/README
rename akka-bbb-fsesl/src/{main/resources => universal/conf}/application.conf (100%)
rename akka-bbb-fsesl/src/{main/resources => universal/conf}/logback.xml (100%)
diff --git a/akka-bbb-apps/build.sbt b/akka-bbb-apps/build.sbt
index 1a4da064d3..6ef42ab563 100755
--- a/akka-bbb-apps/build.sbt
+++ b/akka-bbb-apps/build.sbt
@@ -39,6 +39,7 @@ testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console",
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports")
+Seq(Revolver.settings: _*)
lazy val bbbAppsAkka = (project in file(".")).settings(name := "bbb-apps-akka", libraryDependencies ++= Dependencies.runtime).settings(compileSettings)
scalariformAutoformat := false
@@ -73,7 +74,4 @@ daemonUser in Linux := user
// group which will execute the application
daemonGroup in Linux := group
-mappings in(Universal, packageBin) += file("src/main/resources/application.conf") -> "conf/application.conf"
-mappings in(Universal, packageBin) += file("src/main/resources/logback.xml") -> "conf/logback.xml"
-
debianPackageDependencies in Debian ++= Seq("java8-runtime-headless", "bash")
diff --git a/akka-bbb-apps/src/main/resources/README b/akka-bbb-apps/src/main/resources/README
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/akka-bbb-apps/src/main/resources/application.conf b/akka-bbb-apps/src/universal/conf/application.conf
similarity index 100%
rename from akka-bbb-apps/src/main/resources/application.conf
rename to akka-bbb-apps/src/universal/conf/application.conf
diff --git a/akka-bbb-apps/src/main/resources/logback.xml b/akka-bbb-apps/src/universal/conf/logback.xml
similarity index 100%
rename from akka-bbb-apps/src/main/resources/logback.xml
rename to akka-bbb-apps/src/universal/conf/logback.xml
diff --git a/akka-bbb-fsesl/build.sbt b/akka-bbb-fsesl/build.sbt
index 020426a651..98a18e948b 100755
--- a/akka-bbb-fsesl/build.sbt
+++ b/akka-bbb-fsesl/build.sbt
@@ -76,12 +76,9 @@ val user = "bigbluebutton"
val group = "bigbluebutton"
// user which will execute the application
-daemonUser in Linux := user
+daemonUser in Linux := user
// group which will execute the application
-daemonGroup in Linux := group
-
-mappings in(Universal, packageBin) += file("src/main/resources/application.conf") -> "conf/application.conf"
-mappings in(Universal, packageBin) += file("src/main/resources/logback.xml") -> "conf/logback.xml"
+daemonGroup in Linux := group
debianPackageDependencies in Debian ++= Seq("java8-runtime-headless", "bash")
diff --git a/akka-bbb-fsesl/src/main/resources/README b/akka-bbb-fsesl/src/main/resources/README
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/akka-bbb-fsesl/src/main/resources/application.conf b/akka-bbb-fsesl/src/universal/conf/application.conf
similarity index 100%
rename from akka-bbb-fsesl/src/main/resources/application.conf
rename to akka-bbb-fsesl/src/universal/conf/application.conf
diff --git a/akka-bbb-fsesl/src/main/resources/logback.xml b/akka-bbb-fsesl/src/universal/conf/logback.xml
similarity index 100%
rename from akka-bbb-fsesl/src/main/resources/logback.xml
rename to akka-bbb-fsesl/src/universal/conf/logback.xml
--
GitLab