From 60827895facff4f08e97bc4c5e2618f84c32fd2c Mon Sep 17 00:00:00 2001
From: Nepomuk Seiler <nepomuk.seiler@mukis.de>
Date: Wed, 25 Mar 2015 20:00:31 +0100
Subject: [PATCH] rename and fix last test

---
 .../build.sbt                                               | 6 +++---
 .../project/plugins.sbt                                     | 0
 .../src/main/scala/Main.scala                               | 0
 .../universal/application-ini-from-javaoptions/test         | 4 ++++
 src/sbt-test/universal/jvmopts-makeEtcDefault/test          | 4 ----
 src/sphinx/archetypes/java_server/customize.rst             | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename src/sbt-test/universal/{jvmopts-makeEtcDefault => application-ini-from-javaoptions}/build.sbt (66%)
 rename src/sbt-test/universal/{jvmopts-makeEtcDefault => application-ini-from-javaoptions}/project/plugins.sbt (100%)
 rename src/sbt-test/universal/{jvmopts-makeEtcDefault => application-ini-from-javaoptions}/src/main/scala/Main.scala (100%)
 create mode 100644 src/sbt-test/universal/application-ini-from-javaoptions/test
 delete mode 100644 src/sbt-test/universal/jvmopts-makeEtcDefault/test

diff --git a/src/sbt-test/universal/jvmopts-makeEtcDefault/build.sbt b/src/sbt-test/universal/application-ini-from-javaoptions/build.sbt
similarity index 66%
rename from src/sbt-test/universal/jvmopts-makeEtcDefault/build.sbt
rename to src/sbt-test/universal/application-ini-from-javaoptions/build.sbt
index 367189dd9..a1baf397f 100644
--- a/src/sbt-test/universal/jvmopts-makeEtcDefault/build.sbt
+++ b/src/sbt-test/universal/application-ini-from-javaoptions/build.sbt
@@ -4,13 +4,13 @@ name := "simple-test"
 
 version := "0.1.0"
 
-javaOptions in Linux ++= Seq(
+javaOptions in Universal ++= Seq(
   "-J-Xmx64m", "-J-Xms64m", "-Dproperty=true"
 )
 
 TaskKey[Unit]("check") := {
-  val etc = (target in Universal).value / "tmp" / "etc" / "default" / name.value
-  val content = IO.read(etc)
+  val application = (target in Universal).value / "tmp" / "conf" / "application.ini"
+  val content = IO.read(application)
   val options = (javaOptions in Linux).value
   options.foreach { opt => 
     assert(content.contains(opt), "Option [" + opt + "] is missing")
diff --git a/src/sbt-test/universal/jvmopts-makeEtcDefault/project/plugins.sbt b/src/sbt-test/universal/application-ini-from-javaoptions/project/plugins.sbt
similarity index 100%
rename from src/sbt-test/universal/jvmopts-makeEtcDefault/project/plugins.sbt
rename to src/sbt-test/universal/application-ini-from-javaoptions/project/plugins.sbt
diff --git a/src/sbt-test/universal/jvmopts-makeEtcDefault/src/main/scala/Main.scala b/src/sbt-test/universal/application-ini-from-javaoptions/src/main/scala/Main.scala
similarity index 100%
rename from src/sbt-test/universal/jvmopts-makeEtcDefault/src/main/scala/Main.scala
rename to src/sbt-test/universal/application-ini-from-javaoptions/src/main/scala/Main.scala
diff --git a/src/sbt-test/universal/application-ini-from-javaoptions/test b/src/sbt-test/universal/application-ini-from-javaoptions/test
new file mode 100644
index 000000000..0ceec277e
--- /dev/null
+++ b/src/sbt-test/universal/application-ini-from-javaoptions/test
@@ -0,0 +1,4 @@
+# Run the zip packaging.
+> stage
+# $ exists target/universal/tmp/conf/application.ini
+> check
\ No newline at end of file
diff --git a/src/sbt-test/universal/jvmopts-makeEtcDefault/test b/src/sbt-test/universal/jvmopts-makeEtcDefault/test
deleted file mode 100644
index 23a7a0bb9..000000000
--- a/src/sbt-test/universal/jvmopts-makeEtcDefault/test
+++ /dev/null
@@ -1,4 +0,0 @@
-# Run the zip packaging.
-> show makeEtcDefault
-$ exists target/universal/tmp/etc/default/simple-test
-> check
\ No newline at end of file
diff --git a/src/sphinx/archetypes/java_server/customize.rst b/src/sphinx/archetypes/java_server/customize.rst
index ae49204c7..2d30204bb 100644
--- a/src/sphinx/archetypes/java_server/customize.rst
+++ b/src/sphinx/archetypes/java_server/customize.rst
@@ -22,7 +22,7 @@ You have three options. First, you can specify your options via the ``build.sbt`
 
 .. code-block :: scala
 
-    javaOptions in Linux ++= Seq(
+    javaOptions in Universal ++= Seq(
         "-J-Xmx64m", "-J-Xms64m", "-Dproperty=true",  
     )