From 99d6acfa156dbc0e9d5f87016959b1883e614fe5 Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Mon, 10 Dec 2018 20:19:33 -0500
Subject: [PATCH] Revert "Fix akka applications packaging configuration"
---
akka-bbb-apps/build.sbt | 4 +++-
akka-bbb-apps/src/main/resources/README | 0
.../{universal/conf => main/resources}/application.conf | 0
.../src/{universal/conf => main/resources}/logback.xml | 0
akka-bbb-fsesl/build.sbt | 7 +++++--
akka-bbb-fsesl/src/main/resources/README | 0
.../{universal/conf => main/resources}/application.conf | 0
.../src/{universal/conf => main/resources}/logback.xml | 0
8 files changed, 8 insertions(+), 3 deletions(-)
create mode 100644 akka-bbb-apps/src/main/resources/README
rename akka-bbb-apps/src/{universal/conf => main/resources}/application.conf (100%)
rename akka-bbb-apps/src/{universal/conf => main/resources}/logback.xml (100%)
create mode 100644 akka-bbb-fsesl/src/main/resources/README
rename akka-bbb-fsesl/src/{universal/conf => main/resources}/application.conf (100%)
rename akka-bbb-fsesl/src/{universal/conf => main/resources}/logback.xml (100%)
diff --git a/akka-bbb-apps/build.sbt b/akka-bbb-apps/build.sbt
index 6ef42ab563..1a4da064d3 100755
--- a/akka-bbb-apps/build.sbt
+++ b/akka-bbb-apps/build.sbt
@@ -39,7 +39,6 @@ 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
@@ -74,4 +73,7 @@ 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
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/akka-bbb-apps/src/universal/conf/application.conf b/akka-bbb-apps/src/main/resources/application.conf
similarity index 100%
rename from akka-bbb-apps/src/universal/conf/application.conf
rename to akka-bbb-apps/src/main/resources/application.conf
diff --git a/akka-bbb-apps/src/universal/conf/logback.xml b/akka-bbb-apps/src/main/resources/logback.xml
similarity index 100%
rename from akka-bbb-apps/src/universal/conf/logback.xml
rename to akka-bbb-apps/src/main/resources/logback.xml
diff --git a/akka-bbb-fsesl/build.sbt b/akka-bbb-fsesl/build.sbt
index 98a18e948b..020426a651 100755
--- a/akka-bbb-fsesl/build.sbt
+++ b/akka-bbb-fsesl/build.sbt
@@ -76,9 +76,12 @@ 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
+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-fsesl/src/main/resources/README b/akka-bbb-fsesl/src/main/resources/README
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/akka-bbb-fsesl/src/universal/conf/application.conf b/akka-bbb-fsesl/src/main/resources/application.conf
similarity index 100%
rename from akka-bbb-fsesl/src/universal/conf/application.conf
rename to akka-bbb-fsesl/src/main/resources/application.conf
diff --git a/akka-bbb-fsesl/src/universal/conf/logback.xml b/akka-bbb-fsesl/src/main/resources/logback.xml
similarity index 100%
rename from akka-bbb-fsesl/src/universal/conf/logback.xml
rename to akka-bbb-fsesl/src/main/resources/logback.xml
--
GitLab