Merge pull request #439 from sbt/fix/rpm-postun

FIX #435 Adding loader and control functions

src/main/resources/com/typesafe/sbt/packager/archetypes/java_server/rpm/postinst-template

@@ -1,7 +1,3 @@
 ${{loader-functions}}
-${{control-functions}}
-
-addGroup ${{daemon_group}}
-addUser ${{daemon_user}} ${{daemon_group}} "${{app_name}} user-daemon" "${{daemon_shell}}"
 
 startService ${{app_name}} || echo "${{app_name}} could not be registered or started"

src/main/resources/com/typesafe/sbt/packager/archetypes/java_server/rpm/postun-template

@@ -1,3 +1,5 @@
+${{control-functions}}
+
 # Removing system user/group : ${{daemon_user}} and ${{daemon_group}}
 
 # Scriptlet syntax: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Syntax

src/main/resources/com/typesafe/sbt/packager/archetypes/java_server/rpm/preinst-template

@@ -1,11 +1,6 @@
+${{control-functions}}
+
 # Adding system user/group : ${{daemon_user}} and ${{daemon_group}}
-if ! getent group | grep -q "^${{daemon_group}}:" ;
-then
-    echo "Creating system group: ${{daemon_group}}"
-    groupadd --system ${{daemon_group}}
-fi
-if ! getent passwd | grep -q "^${{daemon_user}}:";
-then
-    echo "Creating system user: ${{daemon_user}}"
-    useradd --gid ${{daemon_group}} --no-create-home --system -c '${{app_name}} daemon-user' ${{daemon_user}}
-fi
+
+addGroup ${{daemon_group}}
+addUser ${{daemon_user}} ${{daemon_group}} "${{app_name}} user-daemon" "${{daemon_shell}}"

src/main/resources/com/typesafe/sbt/packager/archetypes/java_server/rpm/preun-template

@@ -1,3 +1,5 @@
+${{loader-functions}}
+
 # Halting ${{app_name}}
 echo "Shutdown ${{app_name}}"
 service ${{app_name}} stop || echo "Could not stop ${{app_name}}"

test-project-simple/build.sbt

@@ -6,7 +6,7 @@ libraryDependencies ++= Seq(
 
 mainClass in Compile := Some("ExampleApp")
 
-enablePlugins(JavaAppPackaging, JDebPackaging)
+enablePlugins(JavaServerAppPackaging, JDebPackaging)
 
 maintainer := "Josh Suereth <[email protected]>"
 packageSummary := "Minimal Native Packager"

test-project-simple/src/main/scala/ExampleApp.scala

@@ -1,4 +1,18 @@
+import java.util.concurrent._
+
 object ExampleApp extends App {
 
-    println("Hello, world!")
+  val executorService = Executors newFixedThreadPool 2
+
+  while (true) {
+    for(i <- 0 to 5) executorService execute HelloWorld(i)
+    Thread sleep 5000
+  }
+
 }
+
+case class HelloWorld(i: Int) extends Runnable {
+  def run() {
+    println(s"[$i] Hello, world!")
+  }
+}

test-project-simple/src/templates/etc-default

@@ -0,0 +1,2 @@
+-J-Xms64m
+-J-Xmx128m