From c077dd0046f043c6613663ee04d8156f24c3f4c3 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Sun, 27 Dec 2015 14:40:54 +0900
Subject: [PATCH] Rename logback-test.xml to logback-dev.xml

---
 doc/how_to_run.md                                        | 2 +-
 project/build.scala                                      | 2 ++
 release/build.xml                                        | 2 +-
 src/main/resources/{logback-test.xml => logback-dev.xml} | 0
 4 files changed, 4 insertions(+), 2 deletions(-)
 rename src/main/resources/{logback-test.xml => logback-dev.xml} (100%)

diff --git a/doc/how_to_run.md b/doc/how_to_run.md
index fd1300764..0e18a8f83 100644
--- a/doc/how_to_run.md
+++ b/doc/how_to_run.md
@@ -12,7 +12,7 @@ $ sbt ~jetty:start
 
 Then access to `http://localhost:8080/` by your browser. The default administrator account is `root` and password is `root`.
 
-Source code modification is detected and reloaded automatically. You can modify logging configuration by editing `src/main/resources/logback-test.xml`.
+Source code modification is detected and reloaded automatically. You can modify logging configuration by editing `src/main/resources/logback-dev.xml`.
 
 Build war file
 --------
diff --git a/project/build.scala b/project/build.scala
index 3c2543a9e..a6582dfd1 100644
--- a/project/build.scala
+++ b/project/build.scala
@@ -4,6 +4,7 @@ import sbt.Keys._
 import sbt._
 import sbtassembly.AssemblyKeys._
 import sbtassembly._
+import JettyPlugin.autoImport._
 
 object MyBuild extends Build {
   val Organization = "gitbucket"
@@ -69,6 +70,7 @@ object MyBuild extends Build {
     ),
     play.twirl.sbt.Import.TwirlKeys.templateImports += "gitbucket.core._",
     javacOptions in compile ++= Seq("-target", "7", "-source", "7"),
+    javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml",
     testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "junitxml", "console"),
     javaOptions in Test += "-Dgitbucket.home=target/gitbucket_home_for_test",
     testOptions in Test += Tests.Setup( () => new java.io.File("target/gitbucket_home_for_test").mkdir() ),
diff --git a/release/build.xml b/release/build.xml
index 7746325de..ee0865ebd 100644
--- a/release/build.xml
+++ b/release/build.xml
@@ -47,7 +47,7 @@
     <zip destfile="${target.dir}/scala-${scala.version}/gitbucket_${scala.version}-${gitbucket.version}.war"
          basedir="${target.dir}/scala-${scala.version}/classes"
          update = "true"
-         includes="JettyLauncher.class,HttpsSupportConnector.class,logback.xml"/>
+         includes="JettyLauncher.class,HttpsSupportConnector.class"/>
   </target>
 
   <target name="rename" depends="embed">
diff --git a/src/main/resources/logback-test.xml b/src/main/resources/logback-dev.xml
similarity index 100%
rename from src/main/resources/logback-test.xml
rename to src/main/resources/logback-dev.xml