(refs #341) Fix compile errors.

src/main/scala/app/AccountController.scala

@@ -5,6 +5,7 @@ import util._
 import util.StringUtil._
 import util.Directory._
 import util.ControlUtil._
+import util.Implicits._
 import ssh.SshUtil
 import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils

src/main/scala/app/ControllerBase.scala

@@ -9,8 +9,7 @@ import org.scalatra.json._
 import org.json4s._
 import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
-import slick.jdbc.JdbcBackend
+import model._
-import model.Account
 import service.{SystemSettingsService, AccountService}
 import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
 import javax.servlet.{FilterChain, ServletResponse, ServletRequest}
@@ -25,10 +24,6 @@ abstract class ControllerBase extends ScalatraFilter
 
   implicit val jsonFormats = DefaultFormats
 
-  // Convert to slick session.
-  implicit def request2Session(implicit request: HttpServletRequest): JdbcBackend#Session =
-    request.getAttribute(Keys.Request.DBSession).asInstanceOf[JdbcBackend#Session]
-
   // Don't set content type via Accept header.
   override def format(implicit request: HttpServletRequest) = ""
 

src/main/scala/app/IndexController.scala

@@ -1,6 +1,7 @@
 package app
 
 import util._
+import util.Implicits._
 import service._
 import jp.sf.amateras.scalatra.forms._
 

src/main/scala/app/LabelsController.scala

@@ -3,6 +3,7 @@ package app
 import jp.sf.amateras.scalatra.forms._
 import service._
 import util.CollaboratorsAuthenticator
+import util.Implicits._
 import org.scalatra.i18n.Messages
 
 class LabelsController extends LabelsControllerBase

src/main/scala/app/RepositorySettingsController.scala

@@ -2,13 +2,14 @@ package app
 
 import service._
 import util.Directory._
+import util.ControlUtil._
+import util.Implicits._
 import util.{UsersAuthenticator, OwnerAuthenticator}
+import util.JGitUtil.CommitInfo
 import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.scalatra.i18n.Messages
 import service.WebHookService.WebHookPayload
-import util.JGitUtil.CommitInfo
-import util.ControlUtil._
 import org.eclipse.jgit.api.Git
 
 class RepositorySettingsController extends RepositorySettingsControllerBase

src/main/scala/app/UserManagementController.scala

@@ -4,10 +4,11 @@ import service._
 import util.AdminAuthenticator
 import util.StringUtil._
 import util.ControlUtil._
+import util.Directory._
+import util.Implicits._
 import jp.sf.amateras.scalatra.forms._
 import org.scalatra.i18n.Messages
 import org.apache.commons.io.FileUtils
-import util.Directory._
 
 class UserManagementController extends UserManagementControllerBase
   with AccountService with RepositoryService with AdminAuthenticator

src/main/scala/app/WikiController.scala

@@ -4,10 +4,10 @@ import service._
 import util._
 import util.Directory._
 import util.ControlUtil._
+import util.Implicits._
 import jp.sf.amateras.scalatra.forms._
 import org.eclipse.jgit.api.Git
 import org.scalatra.i18n.Messages
-import scala.Some
 import java.util.ResourceBundle
 
 class WikiController extends WikiControllerBase 

src/main/scala/service/RequestCache.scala

@@ -2,6 +2,7 @@ package service
 
 import model._
 import slick.jdbc.JdbcBackend
+import util.Implicits.request2Session
 
 /**
  * This service is used for a view helper mainly.
@@ -11,22 +12,25 @@ import slick.jdbc.JdbcBackend
  */
 trait RequestCache extends SystemSettingsService with AccountService with IssuesService {
 
+  private implicit def context2Session(implicit context: app.Context): JdbcBackend#Session =
+    request2Session(context.request)
+
   def getIssue(userName: String, repositoryName: String, issueId: String)
-              (implicit context: app.Context, session: JdbcBackend#Session): Option[Issue] = {
+              (implicit context: app.Context): Option[Issue] = {
     context.cache(s"issue.${userName}/${repositoryName}#${issueId}"){
       super.getIssue(userName, repositoryName, issueId)
     }
   }
 
   def getAccountByUserName(userName: String)
-                          (implicit context: app.Context, session: JdbcBackend#Session): Option[Account] = {
+                          (implicit context: app.Context): Option[Account] = {
     context.cache(s"account.${userName}"){
       super.getAccountByUserName(userName)
     }
   }
 
   def getAccountByMailAddress(mailAddress: String)
-                             (implicit context: app.Context, session: JdbcBackend#Session): Option[Account] = {
+                             (implicit context: app.Context): Option[Account] = {
     context.cache(s"account.${mailAddress}"){
       super.getAccountByMailAddress(mailAddress)
     }

src/main/scala/servlet/BasicAuthenticationFilter.scala

@@ -3,7 +3,7 @@ package servlet
 import javax.servlet._
 import javax.servlet.http._
 import service.{SystemSettingsService, AccountService, RepositoryService}
-import model.Account
+import model._
 import org.slf4j.LoggerFactory
 import slick.jdbc.JdbcBackend
 import util.Implicits._
@@ -22,9 +22,8 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
   def destroy(): Unit = {}
   
   def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain): Unit = {
-    val request  = req.asInstanceOf[HttpServletRequest]
+    implicit val request  = req.asInstanceOf[HttpServletRequest]
     val response = res.asInstanceOf[HttpServletResponse]
-    implicit val session = req.getAttribute(Keys.Request.DBSession).asInstanceOf[JdbcBackend#Session]
 
     val wrappedResponse = new HttpServletResponseWrapper(response){
       override def setCharacterEncoding(encoding: String) = {}

src/main/scala/servlet/GitRepositoryServlet.scala

@@ -17,6 +17,7 @@ import WebHookService._
 import org.eclipse.jgit.api.Git
 import util.JGitUtil.CommitInfo
 import service.IssuesService.IssueSearchCondition
+import slick.jdbc.JdbcBackend
 
 /**
  * Provides Git repository via HTTP.
@@ -81,10 +82,12 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
       logger.debug("repository:" + owner + "/" + repository)
 
       if(!repository.endsWith(".wiki")){
-        val hook = new CommitLogHook(owner, repository, pusher, baseUrl(request))
+        defining(request) { implicit r =>
+          val hook = new CommitLogHook(owner, repository, pusher, baseUrl)
           receivePack.setPreReceiveHook(hook)
           receivePack.setPostReceiveHook(hook)
         }
+      }
       receivePack
     }
   }
@@ -92,7 +95,8 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
 
 import scala.collection.JavaConverters._
 
-class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String) extends PostReceiveHook with PreReceiveHook
+class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String)(implicit session: JdbcBackend#Session)
+  extends PostReceiveHook with PreReceiveHook
   with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService {
   
   private val logger = LoggerFactory.getLogger(classOf[CommitLogHook])