rename and fix last test

sbt · Mar 25, 2015 · 6082789 · 6082789
1 parent fa22aac
commit 6082789
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/...niversal/jvmopts-makeEtcDefault/build.sbt → ...pplication-ini-from-javaoptions/build.sbt b/...niversal/jvmopts-makeEtcDefault/build.sbt → ...pplication-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/...vmopts-makeEtcDefault/project/plugins.sbt → ...-ini-from-javaoptions/project/plugins.sbt b/...vmopts-makeEtcDefault/project/plugins.sbt → ...-ini-from-javaoptions/project/plugins.sbt
diff --git a/...-makeEtcDefault/src/main/scala/Main.scala → ...rom-javaoptions/src/main/scala/Main.scala b/...-makeEtcDefault/src/main/scala/Main.scala → ...rom-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
@@ -0,0 +1,4 @@
+# Run the zip packaging.
+> stage
+# $ exists target/universal/tmp/conf/application.ini
+> check
diff --git a/src/sbt-test/universal/jvmopts-makeEtcDefault/test b/src/sbt-test/universal/jvmopts-makeEtcDefault/test
diff --git 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",  
     )