Merge branch 'master' into feature-tasklist

Conflicts:
	src/main/scala/app/IssuesController.scala
	src/main/twirl/issues/create.scala.html

src/main/scala/ScalatraBootstrap.scala

@@ -1,4 +1,4 @@
-import _root_.servlet.{BasicAuthenticationFilter, TransactionFilter}
+import _root_.servlet.{PluginActionInvokeFilter, BasicAuthenticationFilter, TransactionFilter}
 import app._
 //import jp.sf.amateras.scalatra.forms.ValidationJavaScriptProvider
 import org.scalatra._
@@ -10,6 +10,8 @@ class ScalatraBootstrap extends LifeCycle {
     // Register TransactionFilter and BasicAuthenticationFilter at first
     context.addFilter("transactionFilter", new TransactionFilter)
     context.getFilterRegistration("transactionFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
+    context.addFilter("pluginActionInvokeFilter", new PluginActionInvokeFilter)
+    context.getFilterRegistration("pluginActionInvokeFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
     context.addFilter("basicAuthenticationFilter", new BasicAuthenticationFilter)
     context.getFilterRegistration("basicAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
 

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
@@ -291,7 +292,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    * Create new repository.
    */
   post("/new", newRepositoryForm)(usersOnly { form =>
-    LockUtil.lock(s"${form.owner}/${form.name}/create"){
+    LockUtil.lock(s"${form.owner}/${form.name}"){
       if(getRepository(form.owner, form.name, context.baseUrl).isEmpty){
         val ownerAccount  = getAccountByUserName(form.owner).get
         val loginAccount  = context.loginAccount.get
@@ -334,7 +335,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
             builder.finish()
 
             JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
-              loginAccount.fullName, loginAccount.mailAddress, "Initial commit")
+              Constants.HEAD, loginAccount.fullName, loginAccount.mailAddress, "Initial commit")
           }
         }
 
@@ -354,7 +355,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     val loginAccount   = context.loginAccount.get
     val loginUserName  = loginAccount.userName
 
-    LockUtil.lock(s"${loginUserName}/${repository.name}/create"){
+    LockUtil.lock(s"${loginUserName}/${repository.name}"){
       if(repository.owner == loginUserName || getRepository(loginAccount.userName, repository.name, baseUrl).isDefined){
         // redirect to the repository if repository already exists
         redirect(s"/${loginUserName}/${repository.name}")

src/main/scala/app/ControllerBase.scala

@@ -9,7 +9,7 @@ import org.scalatra.json._
 import org.json4s._
 import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
-import model.Account
+import model._
 import service.{SystemSettingsService, AccountService}
 import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
 import javax.servlet.{FilterChain, ServletResponse, ServletRequest}
@@ -24,8 +24,9 @@ abstract class ControllerBase extends ScalatraFilter
 
   implicit val jsonFormats = DefaultFormats
 
-  // Don't set content type via Accept header.
-  override def format(implicit request: HttpServletRequest) = ""
+// TODO Scala 2.11
+//  // Don't set content type via Accept header.
+//  override def format(implicit request: HttpServletRequest) = ""
 
   override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = try {
     val httpRequest  = request.asInstanceOf[HttpServletRequest]
@@ -125,11 +126,13 @@ abstract class ControllerBase extends ScalatraFilter
       }
     }
 
-  override def fullUrl(path: String, params: Iterable[(String, Any)] = Iterable.empty,
-                       includeContextPath: Boolean = true, includeServletPath: Boolean = true)
-                      (implicit request: HttpServletRequest, response: HttpServletResponse) =
+  // TODO Scala 2.11
+  override def url(path: String, params: Iterable[(String, Any)] = Iterable.empty,
+                   includeContextPath: Boolean = true, includeServletPath: Boolean = true,
+                   absolutize: Boolean = true, withSessionId: Boolean = true)
+                  (implicit request: HttpServletRequest, response: HttpServletResponse): String =
     if (path.startsWith("http")) path
-    else baseUrl + url(path, params, false, false, false)
+    else baseUrl + super.url(path, params, false, false, false)
 
 }
 

src/main/scala/app/DashboardController.scala

@@ -1,109 +1,110 @@
-package app
-
-import service._
-import util.{UsersAuthenticator, Keys}
-import util.Implicits._
-
-class DashboardController extends DashboardControllerBase
-  with IssuesService with PullRequestService with RepositoryService with AccountService
-  with UsersAuthenticator
-
-trait DashboardControllerBase extends ControllerBase {
-  self: IssuesService with PullRequestService with RepositoryService with UsersAuthenticator =>
-
-  get("/dashboard/issues/repos")(usersOnly {
-    searchIssues("all")
-  })
-
-  get("/dashboard/issues/assigned")(usersOnly {
-    searchIssues("assigned")
-  })
-
-  get("/dashboard/issues/created_by")(usersOnly {
-    searchIssues("created_by")
-  })
-
-  get("/dashboard/pulls")(usersOnly {
-    searchPullRequests("created_by", None)
-  })
-
-  get("/dashboard/pulls/owned")(usersOnly {
-    searchPullRequests("created_by", None)
-  })
-
-  get("/dashboard/pulls/public")(usersOnly {
-    searchPullRequests("not_created_by", None)
-  })
-
-  get("/dashboard/pulls/for/:owner/:repository")(usersOnly {
-    searchPullRequests("all", Some(params("owner") + "/" + params("repository")))
-  })
-
-  private def searchIssues(filter: String) = {
-    import IssuesService._
-
-    // condition
-    val condition = session.putAndGet(Keys.Session.DashboardIssues,
-      if(request.hasQueryString) IssueSearchCondition(request)
-      else session.getAs[IssueSearchCondition](Keys.Session.DashboardIssues).getOrElse(IssueSearchCondition())
-    )
-
-    val userName = context.loginAccount.get.userName
-    val repositories = getUserRepositories(userName, context.baseUrl).map(repo => repo.owner -> repo.name)
-    val filterUser = Map(filter -> userName)
-    val page = IssueSearchCondition.page(request)
-    // 
-    dashboard.html.issues(
-        issues.html.listparts(
-            searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, repositories: _*),
-            page,
-            countIssue(condition.copy(state = "open"), filterUser, false, repositories: _*),
-            countIssue(condition.copy(state = "closed"), filterUser, false, repositories: _*),
-            condition),
-        countIssue(condition, Map.empty, false, repositories: _*),
-        countIssue(condition, Map("assigned" -> userName), false, repositories: _*),
-        countIssue(condition, Map("created_by" -> userName), false, repositories: _*),
-        countIssueGroupByRepository(condition, filterUser, false, repositories: _*),
-        condition,
-        filter)    
-    
-  }
-
-  private def searchPullRequests(filter: String, repository: Option[String]) = {
-    import IssuesService._
-    import PullRequestService._
-
-    // condition
-    val condition = session.putAndGet(Keys.Session.DashboardPulls, {
-      if(request.hasQueryString) IssueSearchCondition(request)
-      else session.getAs[IssueSearchCondition](Keys.Session.DashboardPulls).getOrElse(IssueSearchCondition())
-    }.copy(repo = repository))
-
-    val userName = context.loginAccount.get.userName
-    val repositories = getUserRepositories(userName, context.baseUrl).map(repo => repo.owner -> repo.name)
-    val filterUser = Map(filter -> userName)
-    val page = IssueSearchCondition.page(request)
-
-    val counts = countIssueGroupByRepository(
-      IssueSearchCondition().copy(state = condition.state), Map.empty, true, repositories: _*)
-
-    dashboard.html.pulls(
-      pulls.html.listparts(
-        searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, repositories: _*),
-        page,
-        countIssue(condition.copy(state = "open"), filterUser, true, repositories: _*),
-        countIssue(condition.copy(state = "closed"), filterUser, true, repositories: _*),
-        condition,
-        None,
-        false),
-      getPullRequestCountGroupByUser(condition.state == "closed", userName, None),
-      getRepositoryNamesOfUser(userName).map { RepoName =>
-        (userName, RepoName, counts.collectFirst { case (_, RepoName, count) => count }.getOrElse(0))
-      }.sortBy(_._3).reverse,
-      condition,
-      filter)
-
-  }
-
-
-}
+package app
+
+import service._
+import util.{UsersAuthenticator, Keys}
+import util.Implicits._
+
+class DashboardController extends DashboardControllerBase
+  with IssuesService with PullRequestService with RepositoryService with AccountService
+  with UsersAuthenticator
+
+trait DashboardControllerBase extends ControllerBase {
+  self: IssuesService with PullRequestService with RepositoryService with UsersAuthenticator =>
+
+  get("/dashboard/issues/repos")(usersOnly {
+    searchIssues("all")
+  })
+
+  get("/dashboard/issues/assigned")(usersOnly {
+    searchIssues("assigned")
+  })
+
+  get("/dashboard/issues/created_by")(usersOnly {
+    searchIssues("created_by")
+  })
+
+  get("/dashboard/pulls")(usersOnly {
+    searchPullRequests("created_by", None)
+  })
+
+  get("/dashboard/pulls/owned")(usersOnly {
+    searchPullRequests("created_by", None)
+  })
+
+  get("/dashboard/pulls/public")(usersOnly {
+    searchPullRequests("not_created_by", None)
+  })
+
+  get("/dashboard/pulls/for/:owner/:repository")(usersOnly {
+    searchPullRequests("all", Some(params("owner") + "/" + params("repository")))
+  })
+
+  private def searchIssues(filter: String) = {
+    import IssuesService._
+
+    // condition
+    val condition = session.putAndGet(Keys.Session.DashboardIssues,
+      if(request.hasQueryString) IssueSearchCondition(request)
+      else session.getAs[IssueSearchCondition](Keys.Session.DashboardIssues).getOrElse(IssueSearchCondition())
+    )
+
+    val userName   = context.loginAccount.get.userName
+    val userRepos  = getUserRepositories(userName, context.baseUrl, true).map(repo => repo.owner -> repo.name)
+    val filterUser = Map(filter -> userName)
+    val page = IssueSearchCondition.page(request)
+
+    dashboard.html.issues(
+        issues.html.listparts(
+            searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, userRepos: _*),
+            page,
+            countIssue(condition.copy(state = "open"  ), filterUser, false, userRepos: _*),
+            countIssue(condition.copy(state = "closed"), filterUser, false, userRepos: _*),
+            condition),
+        countIssue(condition, Map.empty, false, userRepos: _*),
+        countIssue(condition, Map("assigned"   -> userName), false, userRepos: _*),
+        countIssue(condition, Map("created_by" -> userName), false, userRepos: _*),
+        countIssueGroupByRepository(condition, filterUser, false, userRepos: _*),
+        condition,
+        filter)    
+    
+  }
+
+  private def searchPullRequests(filter: String, repository: Option[String]) = {
+    import IssuesService._
+    import PullRequestService._
+
+    // condition
+    val condition = session.putAndGet(Keys.Session.DashboardPulls, {
+      if(request.hasQueryString) IssueSearchCondition(request)
+      else session.getAs[IssueSearchCondition](Keys.Session.DashboardPulls).getOrElse(IssueSearchCondition())
+    }.copy(repo = repository))
+
+    val userName   = context.loginAccount.get.userName
+    val allRepos   = getAllRepositories()
+    val userRepos  = getUserRepositories(userName, context.baseUrl, true).map(repo => repo.owner -> repo.name)
+    val filterUser = Map(filter -> userName)
+    val page = IssueSearchCondition.page(request)
+
+    val counts = countIssueGroupByRepository(
+      IssueSearchCondition().copy(state = condition.state), Map.empty, true, userRepos: _*)
+
+    dashboard.html.pulls(
+      pulls.html.listparts(
+        searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, allRepos: _*),
+        page,
+        countIssue(condition.copy(state = "open"  ), filterUser, true, allRepos: _*),
+        countIssue(condition.copy(state = "closed"), filterUser, true, allRepos: _*),
+        condition,
+        None,
+        false),
+      getPullRequestCountGroupByUser(condition.state == "closed", None, None),
+      userRepos.map { case (userName, repoName) =>
+        (userName, repoName, counts.find { x => x._1 == userName && x._2 == repoName }.map(_._3).getOrElse(0))
+      }.sortBy(_._3).reverse,
+      condition,
+      filter)
+
+  }
+
+
+}

src/main/scala/app/IndexController.scala

@@ -1,85 +1,106 @@
-package app
-
-import util._
-import service._
-import jp.sf.amateras.scalatra.forms._
-
-class IndexController extends IndexControllerBase 
-  with RepositoryService with ActivityService with AccountService with UsersAuthenticator
-
-trait IndexControllerBase extends ControllerBase {
-  self: RepositoryService with ActivityService with AccountService with UsersAuthenticator =>
-
-  case class SignInForm(userName: String, password: String)
-
-  val form = mapping(
-    "userName" -> trim(label("Username", text(required))),
-    "password" -> trim(label("Password", text(required)))
-  )(SignInForm.apply)
-
-  get("/"){
-    val loginAccount = context.loginAccount
-
-    html.index(getRecentActivities(),
-      getVisibleRepositories(loginAccount, context.baseUrl),
-      loginAccount.map{ account => getUserRepositories(account.userName, context.baseUrl) }.getOrElse(Nil)
-    )
-  }
-
-  get("/signin"){
-    val redirect = params.get("redirect")
-    if(redirect.isDefined && redirect.get.startsWith("/")){
-      flash += Keys.Flash.Redirect -> redirect.get
-    }
-    html.signin()
-  }
-
-  post("/signin", form){ form =>
-    authenticate(context.settings, form.userName, form.password) match {
-      case Some(account) => signin(account)
-      case None          => redirect("/signin")
-    }
-  }
-
-  get("/signout"){
-    session.invalidate
-    redirect("/")
-  }
-
-  get("/activities.atom"){
-    contentType = "application/atom+xml; type=feed"
-    helper.xml.feed(getRecentActivities())
-  }
-
-  /**
-   * Set account information into HttpSession and redirect.
-   */
-  private def signin(account: model.Account) = {
-    session.setAttribute(Keys.Session.LoginAccount, account)
-    updateLastLoginDate(account.userName)
-
-    flash.get(Keys.Flash.Redirect).asInstanceOf[Option[String]].map { redirectUrl =>
-      if(redirectUrl.replaceFirst("/$", "") == request.getContextPath){
-        redirect("/")
-      } else {
-        redirect(redirectUrl)
-      }
-    }.getOrElse {
-      redirect("/")
-    }
-  }
-
-  /**
-   * JSON API for collaborator completion.
-   *
-   * TODO Move to other controller?
-   */
-  get("/_user/proposals")(usersOnly {
-    contentType = formats("json")
-    org.json4s.jackson.Serialization.write(
-      Map("options" -> getAllUsers().filter(!_.isGroupAccount).map(_.userName).toArray)
-    )
-  })
-
-
-}
+package app
+
+import util._
+import util.Implicits._
+import service._
+import jp.sf.amateras.scalatra.forms._
+
+class IndexController extends IndexControllerBase 
+  with RepositoryService with ActivityService with AccountService with UsersAuthenticator
+
+trait IndexControllerBase extends ControllerBase {
+  self: RepositoryService with ActivityService with AccountService with UsersAuthenticator =>
+
+  case class SignInForm(userName: String, password: String)
+
+  val form = mapping(
+    "userName" -> trim(label("Username", text(required))),
+    "password" -> trim(label("Password", text(required)))
+  )(SignInForm.apply)
+
+  get("/"){
+    val loginAccount = context.loginAccount
+    if(loginAccount.isEmpty) {
+        html.index(getRecentActivities(),
+            getVisibleRepositories(loginAccount, context.baseUrl, withoutPhysicalInfo = true),
+            loginAccount.map{ account => getUserRepositories(account.userName, context.baseUrl, withoutPhysicalInfo = true) }.getOrElse(Nil)
+        )
+    } else {
+        val loginUserName = loginAccount.get.userName
+        val loginUserGroups = getGroupsByUserName(loginUserName)
+        var visibleOwnerSet : Set[String] = Set(loginUserName)
+        
+        visibleOwnerSet ++= loginUserGroups
+
+        html.index(getRecentActivitiesByOwners(visibleOwnerSet),
+            getVisibleRepositories(loginAccount, context.baseUrl, withoutPhysicalInfo = true),
+            loginAccount.map{ account => getUserRepositories(account.userName, context.baseUrl, withoutPhysicalInfo = true) }.getOrElse(Nil) 
+        )
+    }
+  }
+
+  get("/signin"){
+    val redirect = params.get("redirect")
+    if(redirect.isDefined && redirect.get.startsWith("/")){
+      flash += Keys.Flash.Redirect -> redirect.get
+    }
+    html.signin()
+  }
+
+  post("/signin", form){ form =>
+    authenticate(context.settings, form.userName, form.password) match {
+      case Some(account) => signin(account)
+      case None          => redirect("/signin")
+    }
+  }
+
+  get("/signout"){
+    session.invalidate
+    redirect("/")
+  }
+
+  get("/activities.atom"){
+    contentType = "application/atom+xml; type=feed"
+    helper.xml.feed(getRecentActivities())
+  }
+
+  /**
+   * Set account information into HttpSession and redirect.
+   */
+  private def signin(account: model.Account) = {
+    session.setAttribute(Keys.Session.LoginAccount, account)
+    updateLastLoginDate(account.userName)
+
+    if(LDAPUtil.isDummyMailAddress(account)) {
+      redirect("/" + account.userName + "/_edit")
+    }
+
+    flash.get(Keys.Flash.Redirect).asInstanceOf[Option[String]].map { redirectUrl =>
+      if(redirectUrl.stripSuffix("/") == request.getContextPath){
+        redirect("/")
+      } else {
+        redirect(redirectUrl)
+      }
+    }.getOrElse {
+      redirect("/")
+    }
+  }
+
+  /**
+   * JSON API for collaborator completion.
+   */
+  get("/_user/proposals")(usersOnly {
+    contentType = formats("json")
+    org.json4s.jackson.Serialization.write(
+      Map("options" -> getAllUsers().filter(!_.isGroupAccount).map(_.userName).toArray)
+    )
+  })
+
+  /**
+   * JSON APU for checking user existence.
+   */
+  post("/_user/existence")(usersOnly {
+    getAccountByUserName(params("userName")).isDefined
+  })
+
+}

src/main/scala/app/IssuesController.scala

@@ -9,6 +9,7 @@ import util.Implicits._
 import util.ControlUtil._
 import org.scalatra.Ok
 import model.Issue
+import plugin.PluginSystem
 
 class IssuesController extends IssuesControllerBase
   with IssuesService with RepositoryService with AccountService with LabelsService with MilestonesService with ActivityService

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
@@ -53,7 +54,7 @@ trait LabelsControllerBase extends ControllerBase {
    */
   private def labelName: Constraint = new Constraint(){
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(!value.matches("^[^,]+$")){
+      if(value.contains(',')){
         Some(s"${name} contains invalid character.")
       } else if(value.startsWith("_") || value.startsWith("-")){
         Some(s"${name} starts with invalid character.")
@@ -62,4 +63,4 @@ trait LabelsControllerBase extends ControllerBase {
       }
   }
 
-}
+}

src/main/scala/app/PullRequestsController.scala

@@ -13,7 +13,6 @@ import org.eclipse.jgit.lib.{ObjectId, CommitBuilder, PersonIdent}
 import service.IssuesService._
 import service.PullRequestService._
 import util.JGitUtil.DiffInfo
-import service.RepositoryService.RepositoryTreeNode
 import util.JGitUtil.CommitInfo
 import org.slf4j.LoggerFactory
 import org.eclipse.jgit.merge.MergeStrategy
@@ -124,7 +123,7 @@ trait PullRequestsControllerBase extends ControllerBase {
     params("id").toIntOpt.flatMap { issueId =>
       val owner = repository.owner
       val name  = repository.name
-      LockUtil.lock(s"${owner}/${name}/merge"){
+      LockUtil.lock(s"${owner}/${name}"){
         getPullRequest(owner, name, issueId).map { case (issue, pullreq) =>
           using(Git.open(getRepositoryDir(owner, name))) { git =>
             // mark issue as merged and close.
@@ -157,7 +156,7 @@ trait PullRequestsControllerBase extends ControllerBase {
             val personIdent = new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
             mergeCommit.setAuthor(personIdent)
             mergeCommit.setCommitter(personIdent)
-            mergeCommit.setMessage(s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestRepositoryName}\n\n" +
+            mergeCommit.setMessage(s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestBranch}\n\n" +
                                    form.message)
 
             // insertObject and got mergeCommit Object Id
@@ -367,7 +366,7 @@ trait PullRequestsControllerBase extends ControllerBase {
    */
   private def checkConflict(userName: String, repositoryName: String, branch: String,
                             requestUserName: String, requestRepositoryName: String, requestBranch: String): Boolean = {
-    LockUtil.lock(s"${userName}/${repositoryName}/merge-check"){
+    LockUtil.lock(s"${userName}/${repositoryName}"){
       using(Git.open(getRepositoryDir(requestUserName, requestRepositoryName))) { git =>
         val remoteRefName = s"refs/heads/${branch}"
         val tmpRefName = s"refs/merge-check/${userName}/${branch}"
@@ -403,7 +402,7 @@ trait PullRequestsControllerBase extends ControllerBase {
   private def checkConflictInPullRequest(userName: String, repositoryName: String, branch: String,
                                          requestUserName: String, requestRepositoryName: String, requestBranch: String,
                                          issueId: Int): Boolean = {
-    LockUtil.lock(s"${userName}/${repositoryName}/merge") {
+    LockUtil.lock(s"${userName}/${repositoryName}") {
       using(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
         // merge
         val merger = MergeStrategy.RECURSIVE.newMerger(git.getRepository, true)
@@ -444,7 +443,7 @@ trait PullRequestsControllerBase extends ControllerBase {
       val commits = newGit.log.addRange(oldId, newId).call.iterator.asScala.map { revCommit =>
         new CommitInfo(revCommit)
       }.toList.splitWith { (commit1, commit2) =>
-        view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
+        view.helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
       }
 
       val diffs = JGitUtil.getDiffs(newGit, oldId.getName, newId.getName, true)
@@ -466,7 +465,7 @@ trait PullRequestsControllerBase extends ControllerBase {
 
       pulls.html.list(
         searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName),
-        getPullRequestCountGroupByUser(condition.state == "closed", owner, Some(repoName)),
+        getPullRequestCountGroupByUser(condition.state == "closed", Some(owner), Some(repoName)),
         userName,
         page,
         countIssue(condition.copy(state = "open"  ), filterUser, true, owner -> repoName),

src/main/scala/app/RepositorySettingsController.scala

@@ -1,266 +1,274 @@
-package app
-
-import service._
-import util.Directory._
-import util.{UsersAuthenticator, OwnerAuthenticator}
-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
-  with RepositoryService with AccountService with WebHookService
-  with OwnerAuthenticator with UsersAuthenticator
-
-trait RepositorySettingsControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with WebHookService
-    with OwnerAuthenticator with UsersAuthenticator =>
-
-  // for repository options
-  case class OptionsForm(repositoryName: String, description: Option[String], defaultBranch: String, isPrivate: Boolean)
-  
-  val optionsForm = mapping(
-    "repositoryName" -> trim(label("Description"    , text(required, maxlength(40), identifier, renameRepositoryName))),
-    "description"    -> trim(label("Description"    , optional(text()))),
-    "defaultBranch"  -> trim(label("Default Branch" , text(required, maxlength(100)))),
-    "isPrivate"      -> trim(label("Repository Type", boolean()))
-  )(OptionsForm.apply)
-
-  // for collaborator addition
-  case class CollaboratorForm(userName: String)
-
-  val collaboratorForm = mapping(
-    "userName" -> trim(label("Username", text(required, collaborator)))
-  )(CollaboratorForm.apply)
-
-  // for web hook url addition
-  case class WebHookForm(url: String)
-
-  val webHookForm = mapping(
-    "url" -> trim(label("url", text(required, webHook)))
-  )(WebHookForm.apply)
-
-  // for transfer ownership
-  case class TransferOwnerShipForm(newOwner: String)
-
-  val transferForm = mapping(
-    "newOwner" -> trim(label("New owner", text(required, transferUser)))
-  )(TransferOwnerShipForm.apply)
-
-  /**
-   * Redirect to the Options page.
-   */
-  get("/:owner/:repository/settings")(ownerOnly { repository =>
-    redirect(s"/${repository.owner}/${repository.name}/settings/options")
-  })
-  
-  /**
-   * Display the Options page.
-   */
-  get("/:owner/:repository/settings/options")(ownerOnly {
-    settings.html.options(_, flash.get("info"))
-  })
-  
-  /**
-   * Save the repository options.
-   */
-  post("/:owner/:repository/settings/options", optionsForm)(ownerOnly { (form, repository) =>
-    saveRepositoryOptions(
-      repository.owner,
-      repository.name,
-      form.description,
-      if(repository.branchList.isEmpty) "master" else form.defaultBranch,
-      repository.repository.parentUserName.map { _ =>
-        repository.repository.isPrivate
-      } getOrElse form.isPrivate
-    )
-    // Change repository name
-    if(repository.name != form.repositoryName){
-      // Update database
-      renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
-      // Move git repository
-      defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
-        FileUtils.moveDirectory(dir, getRepositoryDir(repository.owner, form.repositoryName))
-      }
-      // Move wiki repository
-      defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
-        FileUtils.moveDirectory(dir, getWikiRepositoryDir(repository.owner, form.repositoryName))
-      }
-    }
-    flash += "info" -> "Repository settings has been updated."
-    redirect(s"/${repository.owner}/${form.repositoryName}/settings/options")
-  })
-  
-  /**
-   * Display the Collaborators page.
-   */
-  get("/:owner/:repository/settings/collaborators")(ownerOnly { repository =>
-    settings.html.collaborators(
-      getCollaborators(repository.owner, repository.name),
-      getAccountByUserName(repository.owner).get.isGroupAccount,
-      repository)
-  })
-
-  /**
-   * Add the collaborator.
-   */
-  post("/:owner/:repository/settings/collaborators/add", collaboratorForm)(ownerOnly { (form, repository) =>
-    if(!getAccountByUserName(repository.owner).get.isGroupAccount){
-      addCollaborator(repository.owner, repository.name, form.userName)
-    }
-    redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
-  })
-
-  /**
-   * Add the collaborator.
-   */
-  get("/:owner/:repository/settings/collaborators/remove")(ownerOnly { repository =>
-    if(!getAccountByUserName(repository.owner).get.isGroupAccount){
-      removeCollaborator(repository.owner, repository.name, params("name"))
-    }
-    redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
-  })
-
-  /**
-   * Display the web hook page.
-   */
-  get("/:owner/:repository/settings/hooks")(ownerOnly { repository =>
-    settings.html.hooks(getWebHookURLs(repository.owner, repository.name), repository, flash.get("info"))
-  })
-
-  /**
-   * Add the web hook URL.
-   */
-  post("/:owner/:repository/settings/hooks/add", webHookForm)(ownerOnly { (form, repository) =>
-    addWebHookURL(repository.owner, repository.name, form.url)
-    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
-  })
-
-  /**
-   * Delete the web hook URL.
-   */
-  get("/:owner/:repository/settings/hooks/delete")(ownerOnly { repository =>
-    deleteWebHookURL(repository.owner, repository.name, params("url"))
-    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
-  })
-
-  /**
-   * Send the test request to registered web hook URLs.
-   */
-  get("/:owner/:repository/settings/hooks/test")(ownerOnly { repository =>
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-      import scala.collection.JavaConverters._
-      val commits = git.log
-        .add(git.getRepository.resolve(repository.repository.defaultBranch))
-        .setMaxCount(3)
-        .call.iterator.asScala.map(new CommitInfo(_))
-
-      getWebHookURLs(repository.owner, repository.name) match {
-        case webHookURLs if(webHookURLs.nonEmpty) =>
-          for(ownerAccount <- getAccountByUserName(repository.owner)){
-            callWebHook(repository.owner, repository.name, webHookURLs,
-              WebHookPayload(git, ownerAccount, "refs/heads/" + repository.repository.defaultBranch, repository, commits.toList, ownerAccount))
-          }
-        case _ =>
-      }
-
-      flash += "info" -> "Test payload deployed!"
-    }
-    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
-  })
-
-  /**
-   * Display the danger zone.
-   */
-  get("/:owner/:repository/settings/danger")(ownerOnly {
-    settings.html.danger(_)
-  })
-
-  /**
-   * Transfer repository ownership.
-   */
-  post("/:owner/:repository/settings/transfer", transferForm)(ownerOnly { (form, repository) =>
-    // Change repository owner
-    if(repository.owner != form.newOwner){
-      // Update database
-      renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
-      // Move git repository
-      defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
-        FileUtils.moveDirectory(dir, getRepositoryDir(form.newOwner, repository.name))
-      }
-      // Move wiki repository
-      defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
-        FileUtils.moveDirectory(dir, getWikiRepositoryDir(form.newOwner, repository.name))
-      }
-    }
-    redirect(s"/${form.newOwner}/${repository.name}")
-  })
-
-  /**
-   * Delete the repository.
-   */
-  post("/:owner/:repository/settings/delete")(ownerOnly { repository =>
-    deleteRepository(repository.owner, repository.name)
-
-    FileUtils.deleteDirectory(getRepositoryDir(repository.owner, repository.name))
-    FileUtils.deleteDirectory(getWikiRepositoryDir(repository.owner, repository.name))
-    FileUtils.deleteDirectory(getTemporaryDir(repository.owner, repository.name))
-
-    redirect(s"/${repository.owner}")
-  })
-
-  /**
-   * Provides duplication check for web hook url.
-   */
-  private def webHook: Constraint = new Constraint(){
-    override def validate(name: String, value: String, messages: Messages): Option[String] =
-      getWebHookURLs(params("owner"), params("repository")).map(_.url).find(_ == value).map(_ => "URL had been registered already.")
-  }
-
-  /**
-   * Provides Constraint to validate the collaborator name.
-   */
-  private def collaborator: Constraint = new Constraint(){
-    override def validate(name: String, value: String, messages: Messages): Option[String] =
-      getAccountByUserName(value) match {
-        case None => Some("User does not exist.")
-        case Some(x) if(x.isGroupAccount)
-                  => Some("User does not exist.")
-        case Some(x) if(x.userName == params("owner") || getCollaborators(params("owner"), params("repository")).contains(x.userName))
-                  => Some("User can access this repository already.")
-        case _    => None
-      }
-  }
-
-  /**
-   * Duplicate check for the rename repository name.
-   */
-  private def renameRepositoryName: Constraint = new Constraint(){
-    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
-      params.get("repository").filter(_ != value).flatMap { _ =>
-        params.get("owner").flatMap { userName =>
-          getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
-        }
-      }
-  }
-
-  /**
-   * Provides Constraint to validate the repository transfer user.
-   */
-  private def transferUser: Constraint = new Constraint(){
-    override def validate(name: String, value: String, messages: Messages): Option[String] =
-      getAccountByUserName(value) match {
-        case None    => Some("User does not exist.")
-        case Some(x) => if(x.userName == params("owner")){
-          Some("This is current repository owner.")
-        } else {
-          params.get("repository").flatMap { repositoryName =>
-            getRepositoryNamesOfUser(x.userName).find(_ == repositoryName).map{ _ => "User already has same repository." }
-          }
-        }
-      }
-  }
+package app
+
+import service._
+import util.Directory._
+import util.Implicits._
+import util.{LockUtil, UsersAuthenticator, OwnerAuthenticator}
+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
+import org.eclipse.jgit.lib.Constants
+
+class RepositorySettingsController extends RepositorySettingsControllerBase
+  with RepositoryService with AccountService with WebHookService
+  with OwnerAuthenticator with UsersAuthenticator
+
+trait RepositorySettingsControllerBase extends ControllerBase {
+  self: RepositoryService with AccountService with WebHookService
+    with OwnerAuthenticator with UsersAuthenticator =>
+
+  // for repository options
+  case class OptionsForm(repositoryName: String, description: Option[String], defaultBranch: String, isPrivate: Boolean)
+  
+  val optionsForm = mapping(
+    "repositoryName" -> trim(label("Description"    , text(required, maxlength(40), identifier, renameRepositoryName))),
+    "description"    -> trim(label("Description"    , optional(text()))),
+    "defaultBranch"  -> trim(label("Default Branch" , text(required, maxlength(100)))),
+    "isPrivate"      -> trim(label("Repository Type", boolean()))
+  )(OptionsForm.apply)
+
+  // for collaborator addition
+  case class CollaboratorForm(userName: String)
+
+  val collaboratorForm = mapping(
+    "userName" -> trim(label("Username", text(required, collaborator)))
+  )(CollaboratorForm.apply)
+
+  // for web hook url addition
+  case class WebHookForm(url: String)
+
+  val webHookForm = mapping(
+    "url" -> trim(label("url", text(required, webHook)))
+  )(WebHookForm.apply)
+
+  // for transfer ownership
+  case class TransferOwnerShipForm(newOwner: String)
+
+  val transferForm = mapping(
+    "newOwner" -> trim(label("New owner", text(required, transferUser)))
+  )(TransferOwnerShipForm.apply)
+
+  /**
+   * Redirect to the Options page.
+   */
+  get("/:owner/:repository/settings")(ownerOnly { repository =>
+    redirect(s"/${repository.owner}/${repository.name}/settings/options")
+  })
+  
+  /**
+   * Display the Options page.
+   */
+  get("/:owner/:repository/settings/options")(ownerOnly {
+    settings.html.options(_, flash.get("info"))
+  })
+  
+  /**
+   * Save the repository options.
+   */
+  post("/:owner/:repository/settings/options", optionsForm)(ownerOnly { (form, repository) =>
+    val defaultBranch = if(repository.branchList.isEmpty) "master" else form.defaultBranch
+    saveRepositoryOptions(
+      repository.owner,
+      repository.name,
+      form.description,
+      defaultBranch,
+      repository.repository.parentUserName.map { _ =>
+        repository.repository.isPrivate
+      } getOrElse form.isPrivate
+    )
+    // Change repository name
+    if(repository.name != form.repositoryName){
+      // Update database
+      renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
+      // Move git repository
+      defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
+        FileUtils.moveDirectory(dir, getRepositoryDir(repository.owner, form.repositoryName))
+      }
+      // Move wiki repository
+      defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
+        FileUtils.moveDirectory(dir, getWikiRepositoryDir(repository.owner, form.repositoryName))
+      }
+    }
+    // Change repository HEAD
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+      git.getRepository.updateRef(Constants.HEAD, true).link(Constants.R_HEADS + defaultBranch)
+    }
+    flash += "info" -> "Repository settings has been updated."
+    redirect(s"/${repository.owner}/${form.repositoryName}/settings/options")
+  })
+  
+  /**
+   * Display the Collaborators page.
+   */
+  get("/:owner/:repository/settings/collaborators")(ownerOnly { repository =>
+    settings.html.collaborators(
+      getCollaborators(repository.owner, repository.name),
+      getAccountByUserName(repository.owner).get.isGroupAccount,
+      repository)
+  })
+
+  /**
+   * Add the collaborator.
+   */
+  post("/:owner/:repository/settings/collaborators/add", collaboratorForm)(ownerOnly { (form, repository) =>
+    if(!getAccountByUserName(repository.owner).get.isGroupAccount){
+      addCollaborator(repository.owner, repository.name, form.userName)
+    }
+    redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
+  })
+
+  /**
+   * Add the collaborator.
+   */
+  get("/:owner/:repository/settings/collaborators/remove")(ownerOnly { repository =>
+    if(!getAccountByUserName(repository.owner).get.isGroupAccount){
+      removeCollaborator(repository.owner, repository.name, params("name"))
+    }
+    redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
+  })
+
+  /**
+   * Display the web hook page.
+   */
+  get("/:owner/:repository/settings/hooks")(ownerOnly { repository =>
+    settings.html.hooks(getWebHookURLs(repository.owner, repository.name), flash.get("url"), repository, flash.get("info"))
+  })
+
+  /**
+   * Add the web hook URL.
+   */
+  post("/:owner/:repository/settings/hooks/add", webHookForm)(ownerOnly { (form, repository) =>
+    addWebHookURL(repository.owner, repository.name, form.url)
+    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
+  })
+
+  /**
+   * Delete the web hook URL.
+   */
+  get("/:owner/:repository/settings/hooks/delete")(ownerOnly { repository =>
+    deleteWebHookURL(repository.owner, repository.name, params("url"))
+    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
+  })
+
+  /**
+   * Send the test request to registered web hook URLs.
+   */
+  post("/:owner/:repository/settings/hooks/test", webHookForm)(ownerOnly { (form, repository) =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      import scala.collection.JavaConverters._
+      val commits = git.log
+        .add(git.getRepository.resolve(repository.repository.defaultBranch))
+        .setMaxCount(3)
+        .call.iterator.asScala.map(new CommitInfo(_))
+
+      getAccountByUserName(repository.owner).foreach { ownerAccount =>
+        callWebHook(repository.owner, repository.name,
+          List(model.WebHook(repository.owner, repository.name, form.url)),
+          WebHookPayload(git, ownerAccount, "refs/heads/" + repository.repository.defaultBranch, repository, commits.toList, ownerAccount)
+        )
+      }
+      flash += "url"  -> form.url
+      flash += "info" -> "Test payload deployed!"
+    }
+    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
+  })
+
+  /**
+   * Display the danger zone.
+   */
+  get("/:owner/:repository/settings/danger")(ownerOnly {
+    settings.html.danger(_)
+  })
+
+  /**
+   * Transfer repository ownership.
+   */
+  post("/:owner/:repository/settings/transfer", transferForm)(ownerOnly { (form, repository) =>
+    // Change repository owner
+    if(repository.owner != form.newOwner){
+      LockUtil.lock(s"${repository.owner}/${repository.name}"){
+        // Update database
+        renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
+        // Move git repository
+        defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
+          FileUtils.moveDirectory(dir, getRepositoryDir(form.newOwner, repository.name))
+        }
+        // Move wiki repository
+        defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
+          FileUtils.moveDirectory(dir, getWikiRepositoryDir(form.newOwner, repository.name))
+        }
+      }
+    }
+    redirect(s"/${form.newOwner}/${repository.name}")
+  })
+
+  /**
+   * Delete the repository.
+   */
+  post("/:owner/:repository/settings/delete")(ownerOnly { repository =>
+    LockUtil.lock(s"${repository.owner}/${repository.name}"){
+      deleteRepository(repository.owner, repository.name)
+
+      FileUtils.deleteDirectory(getRepositoryDir(repository.owner, repository.name))
+      FileUtils.deleteDirectory(getWikiRepositoryDir(repository.owner, repository.name))
+      FileUtils.deleteDirectory(getTemporaryDir(repository.owner, repository.name))
+    }
+    redirect(s"/${repository.owner}")
+  })
+
+  /**
+   * Provides duplication check for web hook url.
+   */
+  private def webHook: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      getWebHookURLs(params("owner"), params("repository")).map(_.url).find(_ == value).map(_ => "URL had been registered already.")
+  }
+
+  /**
+   * Provides Constraint to validate the collaborator name.
+   */
+  private def collaborator: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      getAccountByUserName(value) match {
+        case None => Some("User does not exist.")
+        case Some(x) if(x.isGroupAccount)
+                  => Some("User does not exist.")
+        case Some(x) if(x.userName == params("owner") || getCollaborators(params("owner"), params("repository")).contains(x.userName))
+                  => Some("User can access this repository already.")
+        case _    => None
+      }
+  }
+
+  /**
+   * Duplicate check for the rename repository name.
+   */
+  private def renameRepositoryName: Constraint = new Constraint(){
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+      params.get("repository").filter(_ != value).flatMap { _ =>
+        params.get("owner").flatMap { userName =>
+          getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
+        }
+      }
+  }
+
+  /**
+   * Provides Constraint to validate the repository transfer user.
+   */
+  private def transferUser: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      getAccountByUserName(value) match {
+        case None    => Some("User does not exist.")
+        case Some(x) => if(x.userName == params("owner")){
+          Some("This is current repository owner.")
+        } else {
+          params.get("repository").flatMap { repositoryName =>
+            getRepositoryNamesOfUser(x.userName).find(_ == repositoryName).map{ _ => "User already has same repository." }
+          }
+        }
+      }
+  }
 }

src/main/scala/app/RepositoryViewerController.scala

@@ -8,23 +8,31 @@ import _root_.util._
 import service._
 import org.scalatra._
 import java.io.File
-import org.eclipse.jgit.api.Git
+
+import org.eclipse.jgit.api.{ArchiveCommand, Git}
+import org.eclipse.jgit.archive.{TgzFormat, ZipFormat}
 import org.eclipse.jgit.lib._
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.treewalk._
-import java.util.zip.{ZipEntry, ZipOutputStream}
 import jp.sf.amateras.scalatra.forms._
 import org.eclipse.jgit.dircache.DirCache
-import org.eclipse.jgit.revwalk.{RevCommit, RevWalk}
+import org.eclipse.jgit.revwalk.RevCommit
+import service.WebHookService.WebHookPayload
 
 class RepositoryViewerController extends RepositoryViewerControllerBase
-  with RepositoryService with AccountService with ActivityService with ReferrerAuthenticator with CollaboratorsAuthenticator
+  with RepositoryService with AccountService with ActivityService with IssuesService with WebHookService
+  with ReferrerAuthenticator with CollaboratorsAuthenticator
+
 
 /**
  * The repository viewer.
  */
 trait RepositoryViewerControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with ActivityService with ReferrerAuthenticator with CollaboratorsAuthenticator =>
+  self: RepositoryService with AccountService with ActivityService with IssuesService with WebHookService
+    with ReferrerAuthenticator with CollaboratorsAuthenticator =>
+
+  ArchiveCommand.registerFormat("zip", new ZipFormat)
+  ArchiveCommand.registerFormat("tar.gz", new TgzFormat)
 
   case class EditorForm(
     branch: String,
@@ -32,6 +40,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     content: String,
     message: Option[String],
     charset: String,
+    lineSeparator: String,
     newFileName: String,
     oldFileName: Option[String]
   )
@@ -44,13 +53,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   )
 
   val editorForm = mapping(
-    "branch"      -> trim(label("Branch", text(required))),
-    "path"        -> trim(label("Path", text())),
-    "content"     -> trim(label("Content", text(required))),
-    "message"     -> trim(label("Message", optional(text()))),
-    "charset"     -> trim(label("Charset", text(required))),
-    "newFileName" -> trim(label("Filename", text(required))),
-    "oldFileName" -> trim(label("Old filename", optional(text())))
+    "branch"        -> trim(label("Branch", text(required))),
+    "path"          -> trim(label("Path", text())),
+    "content"       -> trim(label("Content", text(required))),
+    "message"       -> trim(label("Message", optional(text()))),
+    "charset"       -> trim(label("Charset", text(required))),
+    "lineSeparator" -> trim(label("Line Separator", text(required))),
+    "newFileName"   -> trim(label("Filename", text(required))),
+    "oldFileName"   -> trim(label("Old filename", optional(text())))
   )(EditorForm.apply)
 
   val deleteForm = mapping(
@@ -102,7 +112,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         case Right((logs, hasNext)) =>
           repo.html.commits(if(path.isEmpty) Nil else path.split("/").toList, branchName, repository,
             logs.splitWith{ (commit1, commit2) =>
-              view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
+              view.helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
             }, page, hasNext)
         case Left(_) => NotFound
       }
@@ -143,7 +153,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/create", editorForm)(collaboratorsOnly { (form, repository) =>
-    commitFile(repository, form.branch, form.path, Some(form.newFileName), None, form.content, form.charset,
+    commitFile(repository, form.branch, form.path, Some(form.newFileName), None,
+      StringUtil.convertLineSeparator(form.content, form.lineSeparator), form.charset,
       form.message.getOrElse(s"Create ${form.newFileName}"))
 
     redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
@@ -152,7 +163,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/update", editorForm)(collaboratorsOnly { (form, repository) =>
-    commitFile(repository, form.branch, form.path, Some(form.newFileName), form.oldFileName, form.content, form.charset,
+    commitFile(repository, form.branch, form.path, Some(form.newFileName), form.oldFileName,
+      StringUtil.convertLineSeparator(form.content, form.lineSeparator), form.charset,
       if(form.oldFileName.exists(_ == form.newFileName)){
         form.message.getOrElse(s"Update ${form.newFileName}")
       } else {
@@ -180,6 +192,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
     using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
       val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
+      val lastModifiedCommit = JGitUtil.getLastModifiedCommit(git, revCommit, path)
       getPathObjectId(git, path, revCommit).map { objectId =>
         if(raw){
           // Download
@@ -189,7 +202,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
           }
         } else {
           repo.html.blob(id, repository, path.split("/").toList, JGitUtil.getContentInfo(git, path, objectId),
-            new JGitUtil.CommitInfo(revCommit), hasWritePermission(repository.owner, repository.name, context.loginAccount))
+            new JGitUtil.CommitInfo(lastModifiedCommit), hasWritePermission(repository.owner, repository.name, context.loginAccount))
         }
       } getOrElse NotFound
     }
@@ -253,50 +266,12 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    * Download repository contents as an archive.
    */
   get("/:owner/:repository/archive/*")(referrersOnly { repository =>
-    val name = multiParams("splat").head
-
-    if(name.endsWith(".zip")){
-      val revision = name.replaceFirst("\\.zip$", "")
-      val workDir = getDownloadWorkDir(repository.owner, repository.name, session.getId)
-      if(workDir.exists){
-        FileUtils.deleteDirectory(workDir)
-      }
-      workDir.mkdirs
-
-      val zipFile = new File(workDir, repository.name + "-" +
-        (if(revision.length == 40) revision.substring(0, 10) else revision).replace('/', '_') + ".zip")
-
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-        val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
-        using(new TreeWalk(git.getRepository)){ walk =>
-          val reader   = walk.getObjectReader
-          val objectId = new MutableObjectId
-
-          using(new ZipOutputStream(new java.io.FileOutputStream(zipFile))){ out =>
-            walk.addTree(revCommit.getTree)
-            walk.setRecursive(true)
-
-            while(walk.next){
-              val name = walk.getPathString
-              val mode = walk.getFileMode(0)
-              if(mode == FileMode.REGULAR_FILE || mode == FileMode.EXECUTABLE_FILE){
-                walk.getObjectId(objectId, 0)
-                val entry = new ZipEntry(name)
-                val loader = reader.open(objectId)
-                entry.setSize(loader.getSize)
-                out.putNextEntry(entry)
-                loader.copyTo(out)
-              }
-            }
-          }
-        }
-      }
-
-      contentType = "application/octet-stream"
-      response.setHeader("Content-Disposition", s"attachment; filename=${zipFile.getName}")
-      zipFile
-    } else {
-      BadRequest
+    multiParams("splat").head match {
+      case name if name.endsWith(".zip") =>
+        archiveRepository(name, ".zip", repository)
+      case name if name.endsWith(".tar.gz") =>
+        archiveRepository(name, ".tar.gz", repository)
+      case _ => BadRequest
     }
   })
 
@@ -317,9 +292,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       case branch if(path == branch || path.startsWith(branch + "/")) => branch
     } orElse repository.tags.collectFirst {
       case tag if(path == tag.name || path.startsWith(tag.name + "/")) => tag.name
-    } orElse Some(path.split("/")(0)) get
+    } getOrElse path.split("/")(0)
 
-    (id, path.substring(id.length).replaceFirst("^/", ""))
+    (id, path.substring(id.length).stripPrefix("/"))
   }
 
 
@@ -338,10 +313,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       repo.html.guide(repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
     } else {
       using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-        //val revisions = Seq(if(revstr.isEmpty) repository.repository.defaultBranch else revstr, repository.branchList.head)
         // get specified commit
         JGitUtil.getDefaultBranch(git, repository, revstr).map { case (objectId, revision) =>
           defining(JGitUtil.getRevCommitFromId(git, objectId)) { revCommit =>
+            val lastModifiedCommit = if(path == ".") revCommit else JGitUtil.getLastModifiedCommit(git, revCommit, path)
             // get files
             val files = JGitUtil.getFileList(git, revision, path)
             val parentPath = if (path == ".") Nil else path.split("/").toList
@@ -356,7 +331,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
             repo.html.files(revision, repository,
               if(path == ".") Nil else path.split("/").toList, // current path
-              new JGitUtil.CommitInfo(revCommit), // latest commit
+              new JGitUtil.CommitInfo(lastModifiedCommit), // last modified commit
               files, readme, hasWritePermission(repository.owner, repository.name, context.loginAccount))
           }
         } getOrElse NotFound
@@ -377,7 +352,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         val builder  = DirCache.newInCore.builder()
         val inserter = git.getRepository.newObjectInserter()
         val headName = s"refs/heads/${branch}"
-        val headTip  = git.getRepository.resolve(s"refs/heads/${branch}")
+        val headTip  = git.getRepository.resolve(headName)
 
         JGitUtil.processTree(git, headTip){ (path, tree) =>
           if(!newPath.exists(_ == path) && !oldPath.exists(_ == path)){
@@ -392,7 +367,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         builder.finish()
 
         val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter),
-          loginAccount.fullName, loginAccount.mailAddress, message)
+          headName, loginAccount.fullName, loginAccount.mailAddress, message)
 
         inserter.flush()
         inserter.release()
@@ -409,8 +384,19 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch,
           List(new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))))
 
-        // TODO invoke hook
+        // close issue by commit message
+        closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
 
+        // call web hook
+        val commit = new JGitUtil.CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+        getWebHookURLs(repository.owner, repository.name) match {
+          case webHookURLs if(webHookURLs.nonEmpty) =>
+            for(ownerAccount <- getAccountByUserName(repository.owner)){
+              callWebHook(repository.owner, repository.name, webHookURLs,
+                WebHookPayload(git, loginAccount, headName, repository, List(commit), ownerAccount))
+            }
+          case _ =>
+        }
       }
     }
   }
@@ -430,4 +416,29 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     }
   }
 
+  private def archiveRepository(name: String, suffix: String, repository: RepositoryService.RepositoryInfo): File = {
+    val revision = name.stripSuffix(suffix)
+    val workDir = getDownloadWorkDir(repository.owner, repository.name, session.getId)
+    if(workDir.exists) {
+      FileUtils.deleteDirectory(workDir)
+    }
+    workDir.mkdirs
+
+    val file = new File(workDir, repository.name + "-" +
+      (if(revision.length == 40) revision.substring(0, 10) else revision).replace('/', '_') + suffix)
+
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
+      using(new java.io.FileOutputStream(file))  { out =>
+        git.archive
+           .setFormat(suffix.tail)
+           .setTree(revCommit.getTree)
+           .setOutputStream(out)
+           .call()
+      }
+      contentType = "application/octet-stream"
+      response.setHeader("Content-Disposition", s"attachment; filename=${file.getName}")
+      file
+    }
+  }
 }

src/main/scala/app/SearchController.scala

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

src/main/scala/app/SystemSettingsController.scala

@@ -3,8 +3,15 @@ package app
 import service.{AccountService, SystemSettingsService}
 import SystemSettingsService._
 import util.AdminAuthenticator
+import util.Directory._
+import util.ControlUtil._
 import jp.sf.amateras.scalatra.forms._
 import ssh.SshServer
+import org.apache.commons.io.FileUtils
+import java.io.FileInputStream
+import plugin.{Plugin, PluginSystem}
+import org.scalatra.Ok
+import util.Implicits._
 
 class SystemSettingsController extends SystemSettingsControllerBase
   with AccountService with AdminAuthenticator
@@ -36,8 +43,9 @@ trait SystemSettingsControllerBase extends ControllerBase {
         "bindPassword"             -> trim(label("Bind Password", optional(text()))),
         "baseDN"                   -> trim(label("Base DN", text(required))),
         "userNameAttribute"        -> trim(label("User name attribute", text(required))),
+        "additionalFilterCondition"-> trim(label("Additional filter condition", optional(text()))),
         "fullNameAttribute"        -> trim(label("Full name attribute", optional(text()))),
-        "mailAttribute"            -> trim(label("Mail address attribute", text(required))),
+        "mailAttribute"            -> trim(label("Mail address attribute", optional(text()))),
         "tls"                      -> trim(label("Enable TLS", optional(boolean()))),
         "keystore"                 -> trim(label("Keystore", optional(text())))
     )(Ldap.apply))
@@ -47,6 +55,11 @@ trait SystemSettingsControllerBase extends ControllerBase {
     } else Nil
   }
 
+  private val pluginForm = mapping(
+    "pluginId" -> list(trim(label("", text())))
+  )(PluginForm.apply)
+
+  case class PluginForm(pluginIds: List[String])
 
   get("/admin/system")(adminOnly {
     admin.html.system(flash.get("info"))
@@ -71,4 +84,104 @@ trait SystemSettingsControllerBase extends ControllerBase {
     redirect("/admin/system")
   })
 
+  get("/admin/plugins")(adminOnly {
+    val installedPlugins = plugin.PluginSystem.plugins
+    val updatablePlugins = getAvailablePlugins(installedPlugins).filter(_.status == "updatable")
+    admin.plugins.html.installed(installedPlugins, updatablePlugins)
+  })
+
+  post("/admin/plugins/_update", pluginForm)(adminOnly { form =>
+    deletePlugins(form.pluginIds)
+    installPlugins(form.pluginIds)
+    redirect("/admin/plugins")
+  })
+
+  post("/admin/plugins/_delete", pluginForm)(adminOnly { form =>
+    deletePlugins(form.pluginIds)
+    redirect("/admin/plugins")
+  })
+
+  get("/admin/plugins/available")(adminOnly {
+    val installedPlugins = plugin.PluginSystem.plugins
+    val availablePlugins = getAvailablePlugins(installedPlugins).filter(_.status == "available")
+    admin.plugins.html.available(availablePlugins)
+  })
+
+  post("/admin/plugins/_install", pluginForm)(adminOnly { form =>
+    installPlugins(form.pluginIds)
+    redirect("/admin/plugins")
+  })
+
+  get("/admin/plugins/console")(adminOnly {
+    admin.plugins.html.console()
+  })
+
+  post("/admin/plugins/console")(adminOnly {
+    val script = request.getParameter("script")
+    val result = plugin.ScalaPlugin.eval(script)
+    Ok()
+  })
+
+  // TODO Move these methods to PluginSystem or Service?
+  private def deletePlugins(pluginIds: List[String]): Unit = {
+    pluginIds.foreach { pluginId =>
+      plugin.PluginSystem.uninstall(pluginId)
+      val dir = new java.io.File(PluginHome, pluginId)
+      if(dir.exists && dir.isDirectory){
+        FileUtils.deleteQuietly(dir)
+        PluginSystem.uninstall(pluginId)
+      }
+    }
+  }
+
+  private def installPlugins(pluginIds: List[String]): Unit = {
+    val dir = getPluginCacheDir()
+    val installedPlugins = plugin.PluginSystem.plugins
+    getAvailablePlugins(installedPlugins).filter(x => pluginIds.contains(x.id)).foreach { plugin =>
+      val pluginDir = new java.io.File(PluginHome, plugin.id)
+      if(pluginDir.exists){
+        FileUtils.deleteDirectory(pluginDir)
+      }
+      FileUtils.copyDirectory(new java.io.File(dir, plugin.repository + "/" + plugin.id), pluginDir)
+      PluginSystem.installPlugin(plugin.id)
+    }
+  }
+
+  private def getAvailablePlugins(installedPlugins: List[Plugin]): List[SystemSettingsControllerBase.AvailablePlugin] = {
+    val repositoryRoot = getPluginCacheDir()
+
+    if(repositoryRoot.exists && repositoryRoot.isDirectory){
+      PluginSystem.repositories.flatMap { repo =>
+        val repoDir = new java.io.File(repositoryRoot, repo.id)
+        if(repoDir.exists && repoDir.isDirectory){
+          repoDir.listFiles.filter(d => d.isDirectory && !d.getName.startsWith(".")).map { plugin =>
+            val propertyFile = new java.io.File(plugin, "plugin.properties")
+            val properties = new java.util.Properties()
+            if(propertyFile.exists && propertyFile.isFile){
+              using(new FileInputStream(propertyFile)){ in =>
+                properties.load(in)
+              }
+            }
+            SystemSettingsControllerBase.AvailablePlugin(
+              repository  = repo.id,
+              id          = properties.getProperty("id"),
+              version     = properties.getProperty("version"),
+              author      = properties.getProperty("author"),
+              url         = properties.getProperty("url"),
+              description = properties.getProperty("description"),
+              status      = installedPlugins.find(_.id == properties.getProperty("id")) match {
+                case Some(x) if(PluginSystem.isUpdatable(x.version, properties.getProperty("version")))=> "updatable"
+                case Some(x) => "installed"
+                case None    => "available"
+              })
+          }
+        } else Nil
+      }
+    } else Nil
+  }
+}
+
+object SystemSettingsControllerBase {
+  case class AvailablePlugin(repository: String, id: String, version: String,
+                             author: String, url: String, description: String, status: String)
 }

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
@@ -181,11 +182,6 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
     }
   })
 
-  // TODO Move to other generic controller?
-  post("/admin/users/_usercheck"){
-    getAccountByUserName(params("userName")).isDefined
-  }
-
   private def members: Constraint = new Constraint(){
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
       if(value.split(",").exists {

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/model/Account.scala

@@ -1,34 +1,39 @@
-package model
-
-import scala.slick.driver.H2Driver.simple._
-
-object Accounts extends Table[Account]("ACCOUNT") {
-  def userName = column[String]("USER_NAME", O PrimaryKey)
-  def fullName = column[String]("FULL_NAME")
-  def mailAddress = column[String]("MAIL_ADDRESS")
-  def password = column[String]("PASSWORD")
-  def isAdmin = column[Boolean]("ADMINISTRATOR")
-  def url = column[String]("URL")
-  def registeredDate = column[java.util.Date]("REGISTERED_DATE")
-  def updatedDate = column[java.util.Date]("UPDATED_DATE")
-  def lastLoginDate = column[java.util.Date]("LAST_LOGIN_DATE")
-  def image = column[String]("IMAGE")
-  def groupAccount = column[Boolean]("GROUP_ACCOUNT")
-  def removed = column[Boolean]("REMOVED")
-  def * = userName ~ fullName ~ mailAddress ~ password ~ isAdmin ~ url.? ~ registeredDate ~ updatedDate ~ lastLoginDate.? ~ image.? ~ groupAccount ~ removed <> (Account, Account.unapply _)
-}
-
-case class Account(
-    userName: String,
-    fullName: String,
-    mailAddress: String,
-    password: String,
-    isAdmin: Boolean,
-    url: Option[String],
-    registeredDate: java.util.Date,
-    updatedDate: java.util.Date,
-    lastLoginDate: Option[java.util.Date],
-    image: Option[String],
-    isGroupAccount: Boolean,
-    isRemoved: Boolean
-)
+package model
+
+trait AccountComponent { self: Profile =>
+  import profile.simple._
+  import self._
+
+  lazy val Accounts = TableQuery[Accounts]
+
+  class Accounts(tag: Tag) extends Table[Account](tag, "ACCOUNT") {
+    val userName = column[String]("USER_NAME", O PrimaryKey)
+    val fullName = column[String]("FULL_NAME")
+    val mailAddress = column[String]("MAIL_ADDRESS")
+    val password = column[String]("PASSWORD")
+    val isAdmin = column[Boolean]("ADMINISTRATOR")
+    val url = column[String]("URL")
+    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
+    val updatedDate = column[java.util.Date]("UPDATED_DATE")
+    val lastLoginDate = column[java.util.Date]("LAST_LOGIN_DATE")
+    val image = column[String]("IMAGE")
+    val groupAccount = column[Boolean]("GROUP_ACCOUNT")
+    val removed = column[Boolean]("REMOVED")
+    def * = (userName, fullName, mailAddress, password, isAdmin, url.?, registeredDate, updatedDate, lastLoginDate.?, image.?, groupAccount, removed) <> (Account.tupled, Account.unapply)
+  }
+}
+
+case class Account(
+  userName: String,
+  fullName: String,
+  mailAddress: String,
+  password: String,
+  isAdmin: Boolean,
+  url: Option[String],
+  registeredDate: java.util.Date,
+  updatedDate: java.util.Date,
+  lastLoginDate: Option[java.util.Date],
+  image: Option[String],
+  isGroupAccount: Boolean,
+  isRemoved: Boolean
+)

src/main/scala/model/Activity.scala

@@ -1,25 +1,29 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait ActivityComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._
 
-object Activities extends Table[Activity]("ACTIVITY") with BasicTemplate {
-  def activityId = column[Int]("ACTIVITY_ID", O AutoInc)
-  def activityUserName = column[String]("ACTIVITY_USER_NAME")
-  def activityType = column[String]("ACTIVITY_TYPE")
-  def message = column[String]("MESSAGE")
-  def additionalInfo = column[String]("ADDITIONAL_INFO")
-  def activityDate = column[java.util.Date]("ACTIVITY_DATE")
-  def * = activityId ~ userName ~ repositoryName ~ activityUserName ~ activityType ~ message ~ additionalInfo.? ~ activityDate <> (Activity, Activity.unapply _)
-  def autoInc = userName ~ repositoryName ~ activityUserName ~ activityType ~ message ~ additionalInfo.? ~ activityDate returning activityId
+  lazy val Activities = TableQuery[Activities]
+
+  class Activities(tag: Tag) extends Table[Activity](tag, "ACTIVITY") with BasicTemplate {
+    val activityId = column[Int]("ACTIVITY_ID", O AutoInc)
+    val activityUserName = column[String]("ACTIVITY_USER_NAME")
+    val activityType = column[String]("ACTIVITY_TYPE")
+    val message = column[String]("MESSAGE")
+    val additionalInfo = column[String]("ADDITIONAL_INFO")
+    val activityDate = column[java.util.Date]("ACTIVITY_DATE")
+    def * = (userName, repositoryName, activityUserName, activityType, message, additionalInfo.?, activityDate, activityId) <> (Activity.tupled, Activity.unapply)
+  }
 }
 
 case class Activity(
-  activityId: Int,
   userName: String,
   repositoryName: String,
   activityUserName: String,
   activityType: String,
   message: String,
   additionalInfo: Option[String],
-  activityDate: java.util.Date
+  activityDate: java.util.Date,
+  activityId: Int = 0
 )

src/main/scala/model/BasicTemplate.scala

@@ -1,44 +1,47 @@
-package model
-
-import scala.slick.driver.H2Driver.simple._
-
-protected[model] trait BasicTemplate { self: Table[_] =>
-  def userName = column[String]("USER_NAME")
-  def repositoryName = column[String]("REPOSITORY_NAME")
-
-  def byRepository(owner: String, repository: String) =
-    (userName is owner.bind) && (repositoryName is repository.bind)
-
-  def byRepository(userName: Column[String], repositoryName: Column[String]) =
-    (this.userName is userName) && (this.repositoryName is repositoryName)
-}
-
-protected[model] trait IssueTemplate extends BasicTemplate { self: Table[_] =>
-  def issueId = column[Int]("ISSUE_ID")
-
-  def byIssue(owner: String, repository: String, issueId: Int) =
-    byRepository(owner, repository) && (this.issueId is issueId.bind)
-
-  def byIssue(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) =
-    byRepository(userName, repositoryName) && (this.issueId is issueId)
-}
-
-protected[model] trait LabelTemplate extends BasicTemplate { self: Table[_] =>
-  def labelId = column[Int]("LABEL_ID")
-
-  def byLabel(owner: String, repository: String, labelId: Int) =
-    byRepository(owner, repository) && (this.labelId is labelId.bind)
-
-  def byLabel(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) =
-    byRepository(userName, repositoryName) && (this.labelId is labelId)
-}
-
-protected[model] trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>
-  def milestoneId = column[Int]("MILESTONE_ID")
-
-  def byMilestone(owner: String, repository: String, milestoneId: Int) =
-    byRepository(owner, repository) && (this.milestoneId is milestoneId.bind)
-
-  def byMilestone(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) =
-    byRepository(userName, repositoryName) && (this.milestoneId is milestoneId)
-}
+package model
+
+protected[model] trait TemplateComponent { self: Profile =>
+  import profile.simple._
+
+  trait BasicTemplate { self: Table[_] =>
+    val userName = column[String]("USER_NAME")
+    val repositoryName = column[String]("REPOSITORY_NAME")
+
+    def byRepository(owner: String, repository: String) =
+      (userName === owner.bind) && (repositoryName === repository.bind)
+
+    def byRepository(userName: Column[String], repositoryName: Column[String]) =
+      (this.userName === userName) && (this.repositoryName === repositoryName)
+  }
+
+  trait IssueTemplate extends BasicTemplate { self: Table[_] =>
+    val issueId = column[Int]("ISSUE_ID")
+
+    def byIssue(owner: String, repository: String, issueId: Int) =
+      byRepository(owner, repository) && (this.issueId === issueId.bind)
+
+    def byIssue(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) =
+      byRepository(userName, repositoryName) && (this.issueId === issueId)
+  }
+
+  trait LabelTemplate extends BasicTemplate { self: Table[_] =>
+    val labelId = column[Int]("LABEL_ID")
+
+    def byLabel(owner: String, repository: String, labelId: Int) =
+      byRepository(owner, repository) && (this.labelId === labelId.bind)
+
+    def byLabel(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) =
+      byRepository(userName, repositoryName) && (this.labelId === labelId)
+  }
+
+  trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>
+    val milestoneId = column[Int]("MILESTONE_ID")
+
+    def byMilestone(owner: String, repository: String, milestoneId: Int) =
+      byRepository(owner, repository) && (this.milestoneId === milestoneId.bind)
+
+    def byMilestone(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) =
+      byRepository(userName, repositoryName) && (this.milestoneId === milestoneId)
+  }
+
+}

src/main/scala/model/Collaborator.scala

@@ -1,13 +1,17 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait CollaboratorComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
 
-object Collaborators extends Table[Collaborator]("COLLABORATOR") with BasicTemplate {
-  def collaboratorName = column[String]("COLLABORATOR_NAME")
-  def * = userName ~ repositoryName ~ collaboratorName <> (Collaborator, Collaborator.unapply _)
+  lazy val Collaborators = TableQuery[Collaborators]
 
-  def byPrimaryKey(owner: String, repository: String, collaborator: String) =
-    byRepository(owner, repository) && (collaboratorName is collaborator.bind)
+  class Collaborators(tag: Tag) extends Table[Collaborator](tag, "COLLABORATOR") with BasicTemplate {
+    val collaboratorName = column[String]("COLLABORATOR_NAME")
+    def * = (userName, repositoryName, collaboratorName) <> (Collaborator.tupled, Collaborator.unapply)
+
+    def byPrimaryKey(owner: String, repository: String, collaborator: String) =
+      byRepository(owner, repository) && (collaboratorName === collaborator.bind)
+  }
 }
 
 case class Collaborator(

src/main/scala/model/GroupMembers.scala

@@ -1,16 +1,20 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait GroupMemberComponent { self: Profile =>
+  import profile.simple._
 
-object GroupMembers extends Table[GroupMember]("GROUP_MEMBER") {
-  def groupName = column[String]("GROUP_NAME", O PrimaryKey)
-  def userName = column[String]("USER_NAME", O PrimaryKey)
-  def isManager = column[Boolean]("MANAGER")
-  def * = groupName ~ userName ~ isManager <> (GroupMember, GroupMember.unapply _)
+  lazy val GroupMembers = TableQuery[GroupMembers]
+
+  class GroupMembers(tag: Tag) extends Table[GroupMember](tag, "GROUP_MEMBER") {
+    val groupName = column[String]("GROUP_NAME", O PrimaryKey)
+    val userName = column[String]("USER_NAME", O PrimaryKey)
+    val isManager = column[Boolean]("MANAGER")
+    def * = (groupName, userName, isManager) <> (GroupMember.tupled, GroupMember.unapply)
+  }
 }
 
 case class GroupMember(
   groupName: String,
   userName: String,
   isManager: Boolean
-)
+)

src/main/scala/model/Issue.scala

@@ -1,41 +1,49 @@
-package model
-
-import scala.slick.driver.H2Driver.simple._
-
-object IssueId extends Table[(String, String, Int)]("ISSUE_ID") with IssueTemplate {
-  def * = userName ~ repositoryName ~ issueId
-  def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
-}
-
-object IssueOutline extends Table[(String, String, Int, Int)]("ISSUE_OUTLINE_VIEW") with IssueTemplate {
-  def commentCount = column[Int]("COMMENT_COUNT")
-  def * = userName ~ repositoryName ~ issueId ~ commentCount
-}
-
-object Issues extends Table[Issue]("ISSUE") with IssueTemplate with MilestoneTemplate {
-  def openedUserName = column[String]("OPENED_USER_NAME")
-  def assignedUserName = column[String]("ASSIGNED_USER_NAME")
-  def title = column[String]("TITLE")
-  def content = column[String]("CONTENT")
-  def closed = column[Boolean]("CLOSED")
-  def registeredDate = column[java.util.Date]("REGISTERED_DATE")
-  def updatedDate = column[java.util.Date]("UPDATED_DATE")
-  def pullRequest = column[Boolean]("PULL_REQUEST")
-  def * = userName ~ repositoryName ~ issueId ~ openedUserName ~ milestoneId.? ~ assignedUserName.? ~ title ~ content.? ~ closed ~ registeredDate ~ updatedDate ~ pullRequest <> (Issue, Issue.unapply _)
-
-  def byPrimaryKey(owner: String, repository: String, issueId: Int) = byIssue(owner, repository, issueId)
-}
-
-case class Issue(
-    userName: String,
-    repositoryName: String,
-    issueId: Int,
-    openedUserName: String,
-    milestoneId: Option[Int],
-    assignedUserName: Option[String],
-    title: String,
-    content: Option[String],
-    closed: Boolean,
-    registeredDate: java.util.Date,
-    updatedDate: java.util.Date,
-    isPullRequest: Boolean)
+package model
+
+trait IssueComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._
+
+  lazy val IssueId = TableQuery[IssueId]
+  lazy val IssueOutline = TableQuery[IssueOutline]
+  lazy val Issues = TableQuery[Issues]
+
+  class IssueId(tag: Tag) extends Table[(String, String, Int)](tag, "ISSUE_ID") with IssueTemplate {
+    def * = (userName, repositoryName, issueId)
+    def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
+  }
+
+  class IssueOutline(tag: Tag) extends Table[(String, String, Int, Int)](tag, "ISSUE_OUTLINE_VIEW") with IssueTemplate {
+    val commentCount = column[Int]("COMMENT_COUNT")
+    def * = (userName, repositoryName, issueId, commentCount)
+  }
+
+  class Issues(tag: Tag) extends Table[Issue](tag, "ISSUE") with IssueTemplate with MilestoneTemplate {
+    val openedUserName = column[String]("OPENED_USER_NAME")
+    val assignedUserName = column[String]("ASSIGNED_USER_NAME")
+    val title = column[String]("TITLE")
+    val content = column[String]("CONTENT")
+    val closed = column[Boolean]("CLOSED")
+    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
+    val updatedDate = column[java.util.Date]("UPDATED_DATE")
+    val pullRequest = column[Boolean]("PULL_REQUEST")
+    def * = (userName, repositoryName, issueId, openedUserName, milestoneId.?, assignedUserName.?, title, content.?, closed, registeredDate, updatedDate, pullRequest) <> (Issue.tupled, Issue.unapply)
+
+    def byPrimaryKey(owner: String, repository: String, issueId: Int) = byIssue(owner, repository, issueId)
+  }
+}
+
+case class Issue(
+  userName: String,
+  repositoryName: String,
+  issueId: Int,
+  openedUserName: String,
+  milestoneId: Option[Int],
+  assignedUserName: Option[String],
+  title: String,
+  content: Option[String],
+  closed: Boolean,
+  registeredDate: java.util.Date,
+  updatedDate: java.util.Date,
+  isPullRequest: Boolean
+)

src/main/scala/model/IssueComment.scala

@@ -1,28 +1,34 @@
-package model
-
-import scala.slick.driver.H2Driver.simple._
-
-object IssueComments extends Table[IssueComment]("ISSUE_COMMENT") with IssueTemplate {
-  def commentId = column[Int]("COMMENT_ID", O AutoInc)
-  def action = column[String]("ACTION")
-  def commentedUserName = column[String]("COMMENTED_USER_NAME")
-  def content = column[String]("CONTENT")
-  def registeredDate = column[java.util.Date]("REGISTERED_DATE")
-  def updatedDate = column[java.util.Date]("UPDATED_DATE")
-  def * = userName ~ repositoryName ~ issueId ~ commentId ~ action ~ commentedUserName ~ content ~ registeredDate ~ updatedDate <> (IssueComment, IssueComment.unapply _)
-
-  def autoInc = userName ~ repositoryName ~ issueId ~ action ~ commentedUserName ~ content ~ registeredDate ~ updatedDate returning commentId
-  def byPrimaryKey(commentId: Int) = this.commentId is commentId.bind
-}
-
-case class IssueComment(
-    userName: String,
-    repositoryName: String,
-    issueId: Int,
-    commentId: Int,
-    action: String,
-    commentedUserName: String,
-    content: String,
-    registeredDate: java.util.Date,
-    updatedDate: java.util.Date
-)
+package model
+
+trait IssueCommentComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._
+
+  lazy val IssueComments = new TableQuery(tag => new IssueComments(tag)){
+    def autoInc = this returning this.map(_.commentId)
+  }
+
+  class IssueComments(tag: Tag) extends Table[IssueComment](tag, "ISSUE_COMMENT") with IssueTemplate {
+    val commentId = column[Int]("COMMENT_ID", O AutoInc)
+    val action = column[String]("ACTION")
+    val commentedUserName = column[String]("COMMENTED_USER_NAME")
+    val content = column[String]("CONTENT")
+    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
+    val updatedDate = column[java.util.Date]("UPDATED_DATE")
+    def * = (userName, repositoryName, issueId, commentId, action, commentedUserName, content, registeredDate, updatedDate) <> (IssueComment.tupled, IssueComment.unapply)
+
+    def byPrimaryKey(commentId: Int) = this.commentId === commentId.bind
+  }
+}
+
+case class IssueComment(
+  userName: String,
+  repositoryName: String,
+  issueId: Int,
+  commentId: Int = 0,
+  action: String,
+  commentedUserName: String,
+  content: String,
+  registeredDate: java.util.Date,
+  updatedDate: java.util.Date
+)

src/main/scala/model/IssueLabels.scala

@@ -1,15 +1,20 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait IssueLabelComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
 
-object IssueLabels extends Table[IssueLabel]("ISSUE_LABEL") with IssueTemplate with LabelTemplate {
-  def * = userName ~ repositoryName ~ issueId ~ labelId <> (IssueLabel, IssueLabel.unapply _)
-  def byPrimaryKey(owner: String, repository: String, issueId: Int, labelId: Int) =
-    byIssue(owner, repository, issueId) && (this.labelId is labelId.bind)
+  lazy val IssueLabels = TableQuery[IssueLabels]
+
+  class IssueLabels(tag: Tag) extends Table[IssueLabel](tag, "ISSUE_LABEL") with IssueTemplate with LabelTemplate {
+    def * = (userName, repositoryName, issueId, labelId) <> (IssueLabel.tupled, IssueLabel.unapply)
+    def byPrimaryKey(owner: String, repository: String, issueId: Int, labelId: Int) =
+      byIssue(owner, repository, issueId) && (this.labelId === labelId.bind)
+  }
 }
 
 case class IssueLabel(
   userName: String,
   repositoryName: String,
   issueId: Int,
-  labelId: Int)
+  labelId: Int
+)

src/main/scala/model/Labels.scala

@@ -1,21 +1,25 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait LabelComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
 
-object Labels extends Table[Label]("LABEL") with LabelTemplate {
-  def labelName = column[String]("LABEL_NAME")
-  def color = column[String]("COLOR")
-  def * = userName ~ repositoryName ~ labelId ~ labelName ~ color <> (Label, Label.unapply _)
+  lazy val Labels = TableQuery[Labels]
 
-  def ins = userName ~ repositoryName ~ labelName ~ color
-  def byPrimaryKey(owner: String, repository: String, labelId: Int) = byLabel(owner, repository, labelId)
-  def byPrimaryKey(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) = byLabel(userName, repositoryName, labelId)
+  class Labels(tag: Tag) extends Table[Label](tag, "LABEL") with LabelTemplate {
+    override val labelId = column[Int]("LABEL_ID", O AutoInc)
+    val labelName = column[String]("LABEL_NAME")
+    val color = column[String]("COLOR")
+    def * = (userName, repositoryName, labelId, labelName, color) <> (Label.tupled, Label.unapply)
+
+    def byPrimaryKey(owner: String, repository: String, labelId: Int) = byLabel(owner, repository, labelId)
+    def byPrimaryKey(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) = byLabel(userName, repositoryName, labelId)
+  }
 }
 
 case class Label(
   userName: String,
   repositoryName: String,
-  labelId: Int,
+  labelId: Int = 0,
   labelName: String,
   color: String){
 
@@ -30,5 +34,4 @@ case class Label(
       "FFFFFF"
     }
   }
-
-}
+}

src/main/scala/model/Milestone.scala

@@ -1,24 +1,30 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait MilestoneComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._
 
-object Milestones extends Table[Milestone]("MILESTONE") with MilestoneTemplate {
-  def title = column[String]("TITLE")
-  def description = column[String]("DESCRIPTION")
-  def dueDate = column[java.util.Date]("DUE_DATE")
-  def closedDate = column[java.util.Date]("CLOSED_DATE")
-  def * = userName ~ repositoryName ~ milestoneId ~ title ~ description.? ~ dueDate.? ~ closedDate.? <> (Milestone, Milestone.unapply _)
+  lazy val Milestones = TableQuery[Milestones]
 
-  def ins = userName ~ repositoryName ~ title ~ description.? ~ dueDate.? ~ closedDate.?
-  def byPrimaryKey(owner: String, repository: String, milestoneId: Int) = byMilestone(owner, repository, milestoneId)
-  def byPrimaryKey(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) = byMilestone(userName, repositoryName, milestoneId)
+  class Milestones(tag: Tag) extends Table[Milestone](tag, "MILESTONE") with MilestoneTemplate {
+    override val milestoneId = column[Int]("MILESTONE_ID", O AutoInc)
+    val title = column[String]("TITLE")
+    val description = column[String]("DESCRIPTION")
+    val dueDate = column[java.util.Date]("DUE_DATE")
+    val closedDate = column[java.util.Date]("CLOSED_DATE")
+    def * = (userName, repositoryName, milestoneId, title, description.?, dueDate.?, closedDate.?) <> (Milestone.tupled, Milestone.unapply)
+
+    def byPrimaryKey(owner: String, repository: String, milestoneId: Int) = byMilestone(owner, repository, milestoneId)
+    def byPrimaryKey(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) = byMilestone(userName, repositoryName, milestoneId)
+  }
 }
 
 case class Milestone(
   userName: String,
   repositoryName: String,
-  milestoneId: Int,
+  milestoneId: Int = 0,
   title: String,
   description: Option[String],
   dueDate: Option[java.util.Date],
-  closedDate: Option[java.util.Date])
+  closedDate: Option[java.util.Date]
+)

src/main/scala/model/Plugin.scala

@@ -0,0 +1,19 @@
+package model
+
+trait PluginComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._
+
+  lazy val Plugins = TableQuery[Plugins]
+
+  class Plugins(tag: Tag) extends Table[Plugin](tag, "PLUGIN"){
+    val pluginId = column[String]("PLUGIN_ID", O PrimaryKey)
+    val version = column[String]("VERSION")
+    def * = (pluginId, version) <> (Plugin.tupled, Plugin.unapply)
+  }
+}
+
+case class Plugin(
+  pluginId: String,
+  version: String
+)

src/main/scala/model/Profile.scala

@@ -0,0 +1,42 @@
+package model
+
+trait Profile {
+  val profile: slick.driver.JdbcProfile
+  import profile.simple._
+
+  // java.util.Date Mapped Column Types
+  implicit val dateColumnType = MappedColumnType.base[java.util.Date, java.sql.Timestamp](
+      d => new java.sql.Timestamp(d.getTime),
+      t => new java.util.Date(t.getTime)
+  )
+
+  implicit class RichColumn(c1: Column[Boolean]){
+    def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1
+  }
+
+}
+
+object Profile extends {
+  val profile = slick.driver.H2Driver
+
+} with AccountComponent
+  with ActivityComponent
+  with CollaboratorComponent
+  with GroupMemberComponent
+  with IssueComponent
+  with IssueCommentComponent
+  with IssueLabelComponent
+  with LabelComponent
+  with MilestoneComponent
+  with PullRequestComponent
+  with RepositoryComponent
+  with SshKeyComponent
+  with WebHookComponent
+  with PluginComponent with Profile {
+
+  /**
+   * Returns system date.
+   */
+  def currentDate = new java.util.Date()
+
+}

src/main/scala/model/PullRequest.scala

@@ -1,18 +1,22 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait PullRequestComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
 
-object PullRequests extends Table[PullRequest]("PULL_REQUEST") with IssueTemplate {
-  def branch = column[String]("BRANCH")
-  def requestUserName = column[String]("REQUEST_USER_NAME")
-  def requestRepositoryName = column[String]("REQUEST_REPOSITORY_NAME")
-  def requestBranch = column[String]("REQUEST_BRANCH")
-  def commitIdFrom = column[String]("COMMIT_ID_FROM")
-  def commitIdTo = column[String]("COMMIT_ID_TO")
-  def * = userName ~ repositoryName ~ issueId ~ branch ~ requestUserName ~ requestRepositoryName ~ requestBranch ~ commitIdFrom ~ commitIdTo <> (PullRequest, PullRequest.unapply _)
+  lazy val PullRequests = TableQuery[PullRequests]
 
-  def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) = byIssue(userName, repositoryName, issueId)
-  def byPrimaryKey(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) = byIssue(userName, repositoryName, issueId)
+  class PullRequests(tag: Tag) extends Table[PullRequest](tag, "PULL_REQUEST") with IssueTemplate {
+    val branch = column[String]("BRANCH")
+    val requestUserName = column[String]("REQUEST_USER_NAME")
+    val requestRepositoryName = column[String]("REQUEST_REPOSITORY_NAME")
+    val requestBranch = column[String]("REQUEST_BRANCH")
+    val commitIdFrom = column[String]("COMMIT_ID_FROM")
+    val commitIdTo = column[String]("COMMIT_ID_TO")
+    def * = (userName, repositoryName, issueId, branch, requestUserName, requestRepositoryName, requestBranch, commitIdFrom, commitIdTo) <> (PullRequest.tupled, PullRequest.unapply)
+
+    def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) = byIssue(userName, repositoryName, issueId)
+    def byPrimaryKey(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) = byIssue(userName, repositoryName, issueId)
+  }
 }
 
 case class PullRequest(
@@ -25,4 +29,4 @@ case class PullRequest(
   requestBranch: String,
   commitIdFrom: String,
   commitIdTo: String
-)
+)

src/main/scala/model/Repository.scala

@@ -1,21 +1,26 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait RepositoryComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
+  import self._
 
-object Repositories extends Table[Repository]("REPOSITORY") with BasicTemplate {
-  def isPrivate = column[Boolean]("PRIVATE")
-  def description = column[String]("DESCRIPTION")
-  def defaultBranch = column[String]("DEFAULT_BRANCH")
-  def registeredDate = column[java.util.Date]("REGISTERED_DATE")
-  def updatedDate = column[java.util.Date]("UPDATED_DATE")
-  def lastActivityDate = column[java.util.Date]("LAST_ACTIVITY_DATE")
-  def originUserName = column[String]("ORIGIN_USER_NAME")
-  def originRepositoryName = column[String]("ORIGIN_REPOSITORY_NAME")
-  def parentUserName = column[String]("PARENT_USER_NAME")
-  def parentRepositoryName = column[String]("PARENT_REPOSITORY_NAME")
-  def * = userName ~ repositoryName ~ isPrivate ~ description.? ~ defaultBranch ~ registeredDate ~ updatedDate ~ lastActivityDate ~ originUserName.? ~ originRepositoryName.? ~ parentUserName.? ~ parentRepositoryName.? <> (Repository, Repository.unapply _)
+  lazy val Repositories = TableQuery[Repositories]
 
-  def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
+  class Repositories(tag: Tag) extends Table[Repository](tag, "REPOSITORY") with BasicTemplate {
+    val isPrivate = column[Boolean]("PRIVATE")
+    val description = column[String]("DESCRIPTION")
+    val defaultBranch = column[String]("DEFAULT_BRANCH")
+    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
+    val updatedDate = column[java.util.Date]("UPDATED_DATE")
+    val lastActivityDate = column[java.util.Date]("LAST_ACTIVITY_DATE")
+    val originUserName = column[String]("ORIGIN_USER_NAME")
+    val originRepositoryName = column[String]("ORIGIN_REPOSITORY_NAME")
+    val parentUserName = column[String]("PARENT_USER_NAME")
+    val parentRepositoryName = column[String]("PARENT_REPOSITORY_NAME")
+    def * = (userName, repositoryName, isPrivate, description.?, defaultBranch, registeredDate, updatedDate, lastActivityDate, originUserName.?, originRepositoryName.?, parentUserName.?, parentRepositoryName.?) <> (Repository.tupled, Repository.unapply)
+
+    def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
+  }
 }
 
 case class Repository(

src/main/scala/model/SshKey.scala

@@ -1,22 +1,24 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait SshKeyComponent { self: Profile =>
+  import profile.simple._
 
-object SshKeys extends Table[SshKey]("SSH_KEY") {
-  def userName = column[String]("USER_NAME")
-  def sshKeyId = column[Int]("SSH_KEY_ID", O AutoInc)
-  def title = column[String]("TITLE")
-  def publicKey = column[String]("PUBLIC_KEY")
+  lazy val SshKeys = TableQuery[SshKeys]
 
-  def ins = userName ~ title ~ publicKey returning sshKeyId
-  def * = userName ~ sshKeyId ~ title ~ publicKey <> (SshKey, SshKey.unapply _)
+  class SshKeys(tag: Tag) extends Table[SshKey](tag, "SSH_KEY") {
+    val userName = column[String]("USER_NAME")
+    val sshKeyId = column[Int]("SSH_KEY_ID", O AutoInc)
+    val title = column[String]("TITLE")
+    val publicKey = column[String]("PUBLIC_KEY")
+    def * = (userName, sshKeyId, title, publicKey) <> (SshKey.tupled, SshKey.unapply)
 
-  def byPrimaryKey(userName: String, sshKeyId: Int) = (this.userName is userName.bind) && (this.sshKeyId is sshKeyId.bind)
+    def byPrimaryKey(userName: String, sshKeyId: Int) = (this.userName === userName.bind) && (this.sshKeyId === sshKeyId.bind)
+  }
 }
 
 case class SshKey(
   userName: String,
-  sshKeyId: Int,
+  sshKeyId: Int = 0,
   title: String,
   publicKey: String
 )

src/main/scala/model/WebHook.scala

@@ -1,12 +1,16 @@
 package model
 
-import scala.slick.driver.H2Driver.simple._
+trait WebHookComponent extends TemplateComponent { self: Profile =>
+  import profile.simple._
 
-object WebHooks extends Table[WebHook]("WEB_HOOK") with BasicTemplate {
-  def url = column[String]("URL")
-  def * = userName ~ repositoryName ~ url <> (WebHook, WebHook.unapply _)
+  lazy val WebHooks = TableQuery[WebHooks]
 
-  def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url is url.bind)
+  class WebHooks(tag: Tag) extends Table[WebHook](tag, "WEB_HOOK") with BasicTemplate {
+    val url = column[String]("URL")
+    def * = (userName, repositoryName, url) <> (WebHook.tupled, WebHook.unapply)
+
+    def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
+  }
 }
 
 case class WebHook(

src/main/scala/model/package.scala

@@ -1,20 +1,3 @@
-package object model {
-  import scala.slick.driver.BasicDriver.Implicit._
-  import scala.slick.lifted.{Column, MappedTypeMapper}
-
-  // java.util.Date TypeMapper
-  implicit val dateTypeMapper = MappedTypeMapper.base[java.util.Date, java.sql.Timestamp](
-      d => new java.sql.Timestamp(d.getTime),
-      t => new java.util.Date(t.getTime)
-  )
-
-  implicit class RichColumn(c1: Column[Boolean]){
-    def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1
-  }
-
-  /**
-   * Returns system date.
-   */
-  def currentDate = new java.util.Date()
-
-}
+package object model {
+  type Session = slick.jdbc.JdbcBackend#Session
+}

src/main/scala/plugin/Plugin.scala

@@ -0,0 +1,22 @@
+package plugin
+
+import plugin.PluginSystem._
+import java.sql.Connection
+
+trait Plugin {
+  val id: String
+  val version: String
+  val author: String
+  val url: String
+  val description: String
+
+  def repositoryMenus       : List[RepositoryMenu]
+  def globalMenus           : List[GlobalMenu]
+  def repositoryActions     : List[RepositoryAction]
+  def globalActions         : List[Action]
+  def javaScripts           : List[JavaScript]
+}
+
+object PluginConnectionHolder {
+  val threadLocal = new ThreadLocal[Connection]
+}

src/main/scala/plugin/PluginSystem.scala

@@ -0,0 +1,194 @@
+package plugin
+
+import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
+import org.slf4j.LoggerFactory
+import java.util.concurrent.atomic.AtomicBoolean
+import util.Directory._
+import util.ControlUtil._
+import org.apache.commons.io.{IOUtils, FileUtils}
+import Security._
+import service.PluginService
+import model.Profile._
+import profile.simple._
+import java.io.FileInputStream
+import java.sql.Connection
+import app.Context
+import service.RepositoryService.RepositoryInfo
+
+/**
+ * Provides extension points to plug-ins.
+ */
+object PluginSystem extends PluginService {
+
+  private val logger = LoggerFactory.getLogger(PluginSystem.getClass)
+
+  private val initialized = new AtomicBoolean(false)
+  private val pluginsMap = scala.collection.mutable.Map[String, Plugin]()
+  private val repositoriesList = scala.collection.mutable.ListBuffer[PluginRepository]()
+
+  def install(plugin: Plugin): Unit = {
+    pluginsMap.put(plugin.id, plugin)
+  }
+
+  def plugins: List[Plugin] = pluginsMap.values.toList
+
+  def uninstall(id: String)(implicit session: Session): Unit = {
+    pluginsMap.remove(id)
+
+    // Delete from PLUGIN table
+    deletePlugin(id)
+
+    // Drop tables
+    val pluginDir = new java.io.File(PluginHome)
+    val sqlFile = new java.io.File(pluginDir, s"${id}/sql/drop.sql")
+    if(sqlFile.exists){
+      val sql = IOUtils.toString(new FileInputStream(sqlFile), "UTF-8")
+      using(session.conn.createStatement()){ stmt =>
+        stmt.executeUpdate(sql)
+      }
+    }
+  }
+
+  def repositories: List[PluginRepository] = repositoriesList.toList
+
+  /**
+   * Initializes the plugin system. Load scripts from GITBUCKET_HOME/plugins.
+   */
+  def init()(implicit session: Session): Unit = {
+    if(initialized.compareAndSet(false, true)){
+      // Load installed plugins
+      val pluginDir = new java.io.File(PluginHome)
+      if(pluginDir.exists && pluginDir.isDirectory){
+        pluginDir.listFiles.filter(f => f.isDirectory && !f.getName.startsWith(".")).foreach { dir =>
+          installPlugin(dir.getName)
+        }
+      }
+      // Add default plugin repositories
+      repositoriesList += PluginRepository("central", "https://github.com/takezoe/gitbucket_plugins.git")
+    }
+  }
+
+  // TODO Method name seems to not so good.
+  def installPlugin(id: String)(implicit session: Session): Unit = {
+    val pluginHome = new java.io.File(PluginHome)
+    val pluginDir  = new java.io.File(pluginHome, id)
+
+    val scalaFile = new java.io.File(pluginDir, "plugin.scala")
+    if(scalaFile.exists && scalaFile.isFile){
+      val properties = new java.util.Properties()
+      using(new java.io.FileInputStream(new java.io.File(pluginDir, "plugin.properties"))){ in =>
+        properties.load(in)
+      }
+
+      val pluginId     = properties.getProperty("id")
+      val version      = properties.getProperty("version")
+      val author       = properties.getProperty("author")
+      val url          = properties.getProperty("url")
+      val description  = properties.getProperty("description")
+
+      val source = s"""
+        |val id          = "${pluginId}"
+        |val version     = "${version}"
+        |val author      = "${author}"
+        |val url         = "${url}"
+        |val description = "${description}"
+      """.stripMargin + FileUtils.readFileToString(scalaFile, "UTF-8")
+
+      try {
+        // Compile and eval Scala source code
+        ScalaPlugin.eval(pluginDir.listFiles.filter(_.getName.endsWith(".scala.html")).map { file =>
+          ScalaPlugin.compileTemplate(
+            id.replaceAll("-", ""),
+            file.getName.replaceAll("\\.scala\\.html$", ""),
+            IOUtils.toString(new FileInputStream(file)))
+        }.mkString("\n") + source)
+
+        // Migrate database
+        val plugin = getPlugin(pluginId)
+        if(plugin.isEmpty){
+          registerPlugin(model.Plugin(pluginId, version))
+          migrate(session.conn, pluginId, "0.0")
+        } else {
+          updatePlugin(model.Plugin(pluginId, version))
+          migrate(session.conn, pluginId, plugin.get.version)
+        }
+      } catch {
+        case e: Throwable => logger.warn(s"Error in plugin loading for ${scalaFile.getAbsolutePath}", e)
+      }
+    }
+  }
+
+  // TODO Should PluginSystem provide a way to migrate resources other than H2?
+  private def migrate(conn: Connection, pluginId: String, current: String): Unit = {
+    val pluginDir = new java.io.File(PluginHome)
+
+    // TODO Is ot possible to use this migration system in GitBucket migration?
+    val dim = current.split("\\.")
+    val currentVersion = Version(dim(0).toInt, dim(1).toInt)
+
+    val sqlDir = new java.io.File(pluginDir, s"${pluginId}/sql")
+    if(sqlDir.exists && sqlDir.isDirectory){
+      sqlDir.listFiles.filter(_.getName.endsWith(".sql")).map { file =>
+        val array = file.getName.replaceFirst("\\.sql", "").split("_")
+        Version(array(0).toInt, array(1).toInt)
+      }
+      .sorted.reverse.takeWhile(_ > currentVersion)
+      .reverse.foreach { version =>
+        val sqlFile = new java.io.File(pluginDir, s"${pluginId}/sql/${version.major}_${version.minor}.sql")
+        val sql = IOUtils.toString(new FileInputStream(sqlFile), "UTF-8")
+        using(conn.createStatement()){ stmt =>
+          stmt.executeUpdate(sql)
+        }
+      }
+    }
+  }
+
+  case class Version(major: Int, minor: Int) extends Ordered[Version] {
+
+    override def compare(that: Version): Int = {
+      if(major != that.major){
+        major.compare(that.major)
+      } else{
+        minor.compare(that.minor)
+      }
+    }
+
+    def displayString: String = major + "." + minor
+  }
+
+  def repositoryMenus       : List[RepositoryMenu]   = pluginsMap.values.flatMap(_.repositoryMenus).toList
+  def globalMenus           : List[GlobalMenu]       = pluginsMap.values.flatMap(_.globalMenus).toList
+  def repositoryActions     : List[RepositoryAction] = pluginsMap.values.flatMap(_.repositoryActions).toList
+  def globalActions         : List[Action]           = pluginsMap.values.flatMap(_.globalActions).toList
+  def javaScripts           : List[JavaScript]       = pluginsMap.values.flatMap(_.javaScripts).toList
+
+  // Case classes to hold plug-ins information internally in GitBucket
+  case class PluginRepository(id: String, url: String)
+  case class GlobalMenu(label: String, url: String, icon: String, condition: Context => Boolean)
+  case class RepositoryMenu(label: String, name: String, url: String, icon: String, condition: Context => Boolean)
+  case class Action(method: String, path: String, security: Security, function: (HttpServletRequest, HttpServletResponse, Context) => Any)
+  case class RepositoryAction(method: String, path: String, security: Security, function: (HttpServletRequest, HttpServletResponse, Context, RepositoryInfo) => Any)
+  case class Button(label: String, href: String)
+  case class JavaScript(filter: String => Boolean, script: String)
+
+  /**
+   * Checks whether the plugin is updatable.
+   */
+  def isUpdatable(oldVersion: String, newVersion: String): Boolean = {
+    if(oldVersion == newVersion){
+      false
+    } else {
+      val dim1 = oldVersion.split("\\.").map(_.toInt)
+      val dim2 = newVersion.split("\\.").map(_.toInt)
+      dim1.zip(dim2).foreach { case (a, b) =>
+        if(a < b){
+          return true
+        } else if(a > b){
+          return false
+        }
+      }
+      return false
+    }
+  }
+
+}

src/main/scala/plugin/PluginUpdateJob.scala

@@ -0,0 +1,66 @@
+package plugin
+
+import util.Directory._
+import org.eclipse.jgit.api.Git
+import org.slf4j.LoggerFactory
+import org.quartz.{Scheduler, JobExecutionContext, Job}
+import org.quartz.JobBuilder._
+import org.quartz.TriggerBuilder._
+import org.quartz.SimpleScheduleBuilder._
+
+class PluginUpdateJob extends Job {
+
+  private val logger = LoggerFactory.getLogger(classOf[PluginUpdateJob])
+  private var failedCount = 0
+
+  /**
+   * Clone or pull all plugin repositories
+   *
+   * TODO Support plugin repository access through the proxy server
+   */
+  override def execute(context: JobExecutionContext): Unit = {
+    try {
+      if(failedCount > 3){
+        logger.error("Skip plugin information updating because failed count is over limit")
+      } else {
+        logger.info("Start plugin information updating")
+        PluginSystem.repositories.foreach { repository =>
+          logger.info(s"Updating ${repository.id}: ${repository.url}...")
+          val dir = getPluginCacheDir()
+          val repo = new java.io.File(dir, repository.id)
+          if(repo.exists){
+            // pull if the repository is already cloned
+            Git.open(repo).pull().call()
+          } else {
+            // clone if the repository is not exist
+            Git.cloneRepository().setURI(repository.url).setDirectory(repo).call()
+          }
+        }
+        logger.info("End plugin information updating")
+      }
+    } catch {
+      case e: Exception => {
+        failedCount = failedCount + 1
+        logger.error("Failed to update plugin information", e)
+      }
+    }
+  }
+}
+
+object PluginUpdateJob {
+
+  def schedule(scheduler: Scheduler): Unit = {
+    val job = newJob(classOf[PluginUpdateJob])
+      .withIdentity("pluginUpdateJob")
+      .build()
+
+    val trigger = newTrigger()
+      .withIdentity("pluginUpdateTrigger")
+      .startNow()
+      .withSchedule(simpleSchedule().withIntervalInHours(24).repeatForever())
+      .build()
+
+    scheduler.scheduleJob(job, trigger)
+  }
+
+}

src/main/scala/plugin/ScalaPlugin.scala

@@ -0,0 +1,77 @@
+package plugin
+
+import scala.collection.mutable.ListBuffer
+import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
+import app.Context
+import plugin.PluginSystem._
+import plugin.PluginSystem.RepositoryMenu
+import plugin.Security._
+import service.RepositoryService.RepositoryInfo
+import scala.reflect.runtime.currentMirror
+import scala.tools.reflect.ToolBox
+import play.twirl.compiler.TwirlCompiler
+import scala.io.Codec
+
+// TODO This is a sample implementation for Scala based plug-ins.
+class ScalaPlugin(val id: String, val version: String,
+                  val author: String, val url: String, val description: String) extends Plugin {
+
+  private val repositoryMenuList   = ListBuffer[RepositoryMenu]()
+  private val globalMenuList       = ListBuffer[GlobalMenu]()
+  private val repositoryActionList = ListBuffer[RepositoryAction]()
+  private val globalActionList     = ListBuffer[Action]()
+  private val javaScriptList       = ListBuffer[JavaScript]()
+
+  def repositoryMenus       : List[RepositoryMenu]   = repositoryMenuList.toList
+  def globalMenus           : List[GlobalMenu]       = globalMenuList.toList
+  def repositoryActions     : List[RepositoryAction] = repositoryActionList.toList
+  def globalActions         : List[Action]           = globalActionList.toList
+  def javaScripts           : List[JavaScript]       = javaScriptList.toList
+
+  def addRepositoryMenu(label: String, name: String, url: String, icon: String)(condition: (Context) => Boolean): Unit = {
+    repositoryMenuList += RepositoryMenu(label, name, url, icon, condition)
+  }
+
+  def addGlobalMenu(label: String, url: String, icon: String)(condition: (Context) => Boolean): Unit = {
+    globalMenuList += GlobalMenu(label, url, icon, condition)
+  }
+
+  def addGlobalAction(method: String, path: String, security: Security = All())(function: (HttpServletRequest, HttpServletResponse, Context) => Any): Unit = {
+    globalActionList += Action(method, path, security, function)
+  }
+
+  def addRepositoryAction(method: String, path: String, security: Security = All())(function: (HttpServletRequest, HttpServletResponse, Context, RepositoryInfo) => Any): Unit = {
+    repositoryActionList += RepositoryAction(method, path, security, function)
+  }
+
+  def addJavaScript(filter: String => Boolean, script: String): Unit = {
+    javaScriptList += JavaScript(filter, script)
+  }
+
+}
+
+object ScalaPlugin {
+
+  def define(id: String, version: String, author: String, url: String, description: String)
+    = new ScalaPlugin(id, version, author, url, description)
+
+  def eval(source: String): Any = {
+    val toolbox = currentMirror.mkToolBox()
+    val tree = toolbox.parse(source)
+    toolbox.eval(tree)
+  }
+
+  def compileTemplate(packageName: String, name: String, source: String): String = {
+    val result = TwirlCompiler.parseAndGenerateCodeNewParser(
+      Array(packageName, name),
+      source.getBytes("UTF-8"),
+      Codec(scala.util.Properties.sourceEncoding),
+      "",
+      "play.twirl.api.HtmlFormat.Appendable",
+      "play.twirl.api.HtmlFormat",
+      "",
+      false)
+
+    result.replaceFirst("package .*", "")
+  }
+}

src/main/scala/plugin/Security.scala

@@ -0,0 +1,36 @@
+package plugin
+
+/**
+ * Defines enum case classes to specify permission for actions which is provided by plugin.
+ */
+object Security {
+
+  sealed trait Security
+
+  /**
+   * All users and guests
+   */
+  case class All() extends Security
+
+  /**
+   * Only signed-in users
+   */
+  case class Login() extends Security
+
+  /**
+   * Only repository owner and collaborators
+   */
+  case class Member() extends Security
+
+  /**
+   * Only repository owner and managers of group repository
+   */
+  case class Owner() extends Security
+
+  /**
+   * Only administrators
+   */
+  case class Admin() extends Security
+
+}
+

src/main/scala/plugin/package.scala

@@ -0,0 +1,56 @@
+import java.sql.PreparedStatement
+import play.twirl.api.Html
+import util.ControlUtil._
+import scala.collection.mutable.ListBuffer
+
+package object plugin {
+
+  case class Redirect(path: String)
+  case class Fragment(html: Html)
+  case class RawData(contentType: String, content: Array[Byte])
+
+  object db {
+    // TODO labelled place holder support
+    def select(sql: String, params: Any*): Seq[Map[String, String]] = {
+      defining(PluginConnectionHolder.threadLocal.get){ conn =>
+        using(conn.prepareStatement(sql)){ stmt =>
+          setParams(stmt, params: _*)
+          using(stmt.executeQuery()){ rs =>
+            val list = new ListBuffer[Map[String, String]]()
+            while(rs.next){
+              defining(rs.getMetaData){ meta =>
+                val map = Range(1, meta.getColumnCount + 1).map { i =>
+                  val name = meta.getColumnName(i)
+                  (name, rs.getString(name))
+                }.toMap
+                list += map
+              }
+            }
+            list
+          }
+        }
+      }
+    }
+
+    // TODO labelled place holder support
+    def update(sql: String, params: Any*): Int = {
+      defining(PluginConnectionHolder.threadLocal.get){ conn =>
+        using(conn.prepareStatement(sql)){ stmt =>
+          setParams(stmt, params: _*)
+          stmt.executeUpdate()
+        }
+      }
+    }
+
+    private def setParams(stmt: PreparedStatement, params: Any*): Unit = {
+      params.zipWithIndex.foreach { case (p, i) =>
+        p match {
+          case x: String  => stmt.setString(i + 1, x)
+          case x: Int     => stmt.setInt(i + 1, x)
+          case x: Boolean => stmt.setBoolean(i + 1, x)
+        }
+      }
+    }
+  }
+
+}

src/main/scala/service/AccountService.scala

@@ -1,13 +1,12 @@
 package service
 
-import model._
-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
+import model.Profile._
+import profile.simple._
+import model.{Account, GroupMember}
+// TODO [Slick 2.0]NOT import directly?
+import model.Profile.dateColumnType
 import service.SystemSettingsService.SystemSettings
 import util.StringUtil._
-import model.GroupMember
-import scala.Some
-import model.Account
 import util.LDAPUtil
 import org.slf4j.LoggerFactory
 
@@ -15,7 +14,7 @@ trait AccountService {
 
   private val logger = LoggerFactory.getLogger(classOf[AccountService])
 
-  def authenticate(settings: SystemSettings, userName: String, password: String): Option[Account] =
+  def authenticate(settings: SystemSettings, userName: String, password: String)(implicit s: Session): Option[Account] =
     if(settings.ldapAuthentication){
       ldapAuthentication(settings, userName, password)
     } else {
@@ -25,7 +24,7 @@ trait AccountService {
   /**
    * Authenticate by internal database.
    */
-  private def defaultAuthentication(userName: String, password: String) = {
+  private def defaultAuthentication(userName: String, password: String)(implicit s: Session) = {
     getAccountByUserName(userName).collect {
       case account if(!account.isGroupAccount && account.password == sha1(password)) => Some(account)
     } getOrElse None
@@ -34,17 +33,22 @@ trait AccountService {
   /**
    * Authenticate by LDAP.
    */
-  private def ldapAuthentication(settings: SystemSettings, userName: String, password: String): Option[Account] = {
+  private def ldapAuthentication(settings: SystemSettings, userName: String, password: String)
+                                (implicit s: Session): Option[Account] = {
     LDAPUtil.authenticate(settings.ldap.get, userName, password) match {
       case Right(ldapUserInfo) => {
         // Create or update account by LDAP information
         getAccountByUserName(ldapUserInfo.userName, true) match {
           case Some(x) if(!x.isRemoved) => {
-            updateAccount(x.copy(mailAddress = ldapUserInfo.mailAddress, fullName = ldapUserInfo.fullName))
+            if(settings.ldap.get.mailAttribute.getOrElse("").isEmpty) {
+              updateAccount(x.copy(fullName = ldapUserInfo.fullName))
+            } else {
+              updateAccount(x.copy(mailAddress = ldapUserInfo.mailAddress, fullName = ldapUserInfo.fullName))
+            }
             getAccountByUserName(ldapUserInfo.userName)
           }
           case Some(x) if(x.isRemoved)  => {
-            logger.info(s"LDAP Authentication Failed: Account is already registered but disabled..")
+            logger.info("LDAP Authentication Failed: Account is already registered but disabled.")
             defaultAuthentication(userName, password)
           }
           case None => getAccountByMailAddress(ldapUserInfo.mailAddress, true) match {
@@ -53,7 +57,7 @@ trait AccountService {
               getAccountByUserName(ldapUserInfo.userName)
             }
             case Some(x) if(x.isRemoved)  => {
-              logger.info(s"LDAP Authentication Failed: Account is already registered but disabled..")
+              logger.info("LDAP Authentication Failed: Account is already registered but disabled.")
               defaultAuthentication(userName, password)
             }
             case None => {
@@ -70,20 +74,21 @@ trait AccountService {
     }
   }
 
-  def getAccountByUserName(userName: String, includeRemoved: Boolean = false): Option[Account] =
-    Query(Accounts) filter(t => (t.userName is userName.bind) && (t.removed is false.bind, !includeRemoved)) firstOption
+  def getAccountByUserName(userName: String, includeRemoved: Boolean = false)(implicit s: Session): Option[Account] =
+    Accounts filter(t => (t.userName === userName.bind) && (t.removed === false.bind, !includeRemoved)) firstOption
 
-  def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false): Option[Account] =
-    Query(Accounts) filter(t => (t.mailAddress.toLowerCase is mailAddress.toLowerCase.bind) && (t.removed is false.bind, !includeRemoved)) firstOption
+  def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false)(implicit s: Session): Option[Account] =
+    Accounts filter(t => (t.mailAddress.toLowerCase === mailAddress.toLowerCase.bind) && (t.removed === false.bind, !includeRemoved)) firstOption
 
-  def getAllUsers(includeRemoved: Boolean = true): List[Account] =
+  def getAllUsers(includeRemoved: Boolean = true)(implicit s: Session): List[Account] =
     if(includeRemoved){
-      Query(Accounts) sortBy(_.userName) list
+      Accounts sortBy(_.userName) list
     } else {
-      Query(Accounts) filter (_.removed is false.bind) sortBy(_.userName) list
+      Accounts filter (_.removed === false.bind) sortBy(_.userName) list
     }
-    
-  def createAccount(userName: String, password: String, fullName: String, mailAddress: String, isAdmin: Boolean, url: Option[String]): Unit =
+
+  def createAccount(userName: String, password: String, fullName: String, mailAddress: String, isAdmin: Boolean, url: Option[String])
+                   (implicit s: Session): Unit =
     Accounts insert Account(
       userName       = userName,
       password       = password,
@@ -98,10 +103,10 @@ trait AccountService {
       isGroupAccount = false,
       isRemoved      = false)
 
-  def updateAccount(account: Account): Unit =
+  def updateAccount(account: Account)(implicit s: Session): Unit =
     Accounts
-      .filter { a => a.userName is account.userName.bind }
-      .map    { a => a.password ~ a.fullName ~ a.mailAddress ~ a.isAdmin ~ a.url.? ~ a.registeredDate ~ a.updatedDate ~ a.lastLoginDate.? ~ a.removed }
+      .filter { a =>  a.userName === account.userName.bind }
+      .map    { a => (a.password, a.fullName, a.mailAddress, a.isAdmin, a.url.?, a.registeredDate, a.updatedDate, a.lastLoginDate.?, a.removed) }
       .update (
         account.password,
         account.fullName,
@@ -113,13 +118,13 @@ trait AccountService {
         account.lastLoginDate,
         account.isRemoved)
 
-  def updateAvatarImage(userName: String, image: Option[String]): Unit =
-    Accounts.filter(_.userName is userName.bind).map(_.image.?).update(image)
+  def updateAvatarImage(userName: String, image: Option[String])(implicit s: Session): Unit =
+    Accounts.filter(_.userName === userName.bind).map(_.image.?).update(image)
 
-  def updateLastLoginDate(userName: String): Unit =
-    Accounts.filter(_.userName is userName.bind).map(_.lastLoginDate).update(currentDate)
+  def updateLastLoginDate(userName: String)(implicit s: Session): Unit =
+    Accounts.filter(_.userName === userName.bind).map(_.lastLoginDate).update(currentDate)
 
-  def createGroup(groupName: String, url: Option[String]): Unit =
+  def createGroup(groupName: String, url: Option[String])(implicit s: Session): Unit =
     Accounts insert Account(
       userName       = groupName,
       password       = "",
@@ -134,35 +139,35 @@ trait AccountService {
       isGroupAccount = true,
       isRemoved      = false)
 
-  def updateGroup(groupName: String, url: Option[String], removed: Boolean): Unit =
-    Accounts.filter(_.userName is groupName.bind).map(t => t.url.? ~ t.removed).update(url, removed)
+  def updateGroup(groupName: String, url: Option[String], removed: Boolean)(implicit s: Session): Unit =
+    Accounts.filter(_.userName === groupName.bind).map(t => t.url.? -> t.removed).update(url, removed)
 
-  def updateGroupMembers(groupName: String, members: List[(String, Boolean)]): Unit = {
-    Query(GroupMembers).filter(_.groupName is groupName.bind).delete
+  def updateGroupMembers(groupName: String, members: List[(String, Boolean)])(implicit s: Session): Unit = {
+    GroupMembers.filter(_.groupName === groupName.bind).delete
     members.foreach { case (userName, isManager) =>
       GroupMembers insert GroupMember (groupName, userName, isManager)
     }
   }
 
-  def getGroupMembers(groupName: String): List[GroupMember] =
-    Query(GroupMembers)
-      .filter(_.groupName is groupName.bind)
+  def getGroupMembers(groupName: String)(implicit s: Session): List[GroupMember] =
+    GroupMembers
+      .filter(_.groupName === groupName.bind)
       .sortBy(_.userName)
       .list
 
-  def getGroupsByUserName(userName: String): List[String] =
-    Query(GroupMembers)
-      .filter(_.userName is userName.bind)
+  def getGroupsByUserName(userName: String)(implicit s: Session): List[String] =
+    GroupMembers
+      .filter(_.userName === userName.bind)
       .sortBy(_.groupName)
       .map(_.groupName)
       .list
 
-  def removeUserRelatedData(userName: String): Unit = {
-    Query(GroupMembers).filter(_.userName is userName.bind).delete
-    Query(Collaborators).filter(_.collaboratorName is userName.bind).delete
-    Query(Repositories).filter(_.userName is userName.bind).delete
+  def removeUserRelatedData(userName: String)(implicit s: Session): Unit = {
+    GroupMembers.filter(_.userName === userName.bind).delete
+    Collaborators.filter(_.collaboratorName === userName.bind).delete
+    Repositories.filter(_.userName === userName.bind).delete
   }
 
 }
 
-object AccountService extends AccountService
+object AccountService extends AccountService

src/main/scala/service/ActivityService.scala

@@ -1,19 +1,19 @@
 package service
 
-import model._
-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
+import model.Profile._
+import profile.simple._
+import model.Activity
 
 trait ActivityService {
 
-  def getActivitiesByUser(activityUserName: String, isPublic: Boolean): List[Activity] =
+  def getActivitiesByUser(activityUserName: String, isPublic: Boolean)(implicit s: Session): List[Activity] =
     Activities
       .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
       .filter { case (t1, t2) =>
         if(isPublic){
-          (t1.activityUserName is activityUserName.bind) && (t2.isPrivate is false.bind)
+          (t1.activityUserName === activityUserName.bind) && (t2.isPrivate === false.bind)
         } else {
-          (t1.activityUserName is activityUserName.bind)
+          (t1.activityUserName === activityUserName.bind)
         }
       }
       .sortBy { case (t1, t2) => t1.activityId desc }
@@ -21,133 +21,154 @@ trait ActivityService {
       .take(30)
       .list
 
-  def getRecentActivities(): List[Activity] =
+  def getRecentActivities()(implicit s: Session): List[Activity] =
     Activities
       .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
-      .filter { case (t1, t2) => t2.isPrivate is false.bind }
+      .filter { case (t1, t2) =>  t2.isPrivate === false.bind }
       .sortBy { case (t1, t2) => t1.activityId desc }
       .map    { case (t1, t2) => t1 }
       .take(30)
       .list
-  
 
-  def recordCreateRepositoryActivity(userName: String, repositoryName: String, activityUserName: String): Unit =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def getRecentActivitiesByOwners(owners : Set[String])(implicit s: Session): List[Activity] =
+    Activities
+      .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
+      .filter { case (t1, t2) => (t2.isPrivate === false.bind) || (t2.userName inSetBind owners) }
+      .sortBy { case (t1, t2) => t1.activityId desc }
+      .map    { case (t1, t2) => t1 }
+      .take(30)
+      .list
+
+  def recordCreateRepositoryActivity(userName: String, repositoryName: String, activityUserName: String)
+                                    (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "create_repository",
       s"[user:${activityUserName}] created [repo:${userName}/${repositoryName}]",
       None,
       currentDate)
 
-  def recordCreateIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordCreateIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
+                               (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "open_issue",
       s"[user:${activityUserName}] opened issue [issue:${userName}/${repositoryName}#${issueId}]",
       Some(title), 
       currentDate)
 
-  def recordCloseIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordCloseIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
+                              (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "close_issue",
       s"[user:${activityUserName}] closed issue [issue:${userName}/${repositoryName}#${issueId}]",
       Some(title),
       currentDate)
 
-  def recordClosePullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordClosePullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
+                                    (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "close_issue",
       s"[user:${activityUserName}] closed pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
       Some(title),
       currentDate)
 
-  def recordReopenIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordReopenIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
+                               (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "reopen_issue",
       s"[user:${activityUserName}] reopened issue [issue:${userName}/${repositoryName}#${issueId}]",
       Some(title),
       currentDate)
 
-  def recordCommentIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, comment: String): Unit =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordCommentIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, comment: String)
+                                (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "comment_issue",
       s"[user:${activityUserName}] commented on issue [issue:${userName}/${repositoryName}#${issueId}]",
       Some(cut(comment, 200)),
       currentDate)
 
-  def recordCommentPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, comment: String): Unit =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordCommentPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, comment: String)
+                                      (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "comment_issue",
       s"[user:${activityUserName}] commented on pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
       Some(cut(comment, 200)),
       currentDate)
 
-  def recordCreateWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String) =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordCreateWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String)
+                                  (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "create_wiki",
       s"[user:${activityUserName}] created the [repo:${userName}/${repositoryName}] wiki",
       Some(pageName),
       currentDate)
-  
-  def recordEditWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String, commitId: String) =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+
+  def recordEditWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String, commitId: String)
+                                (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "edit_wiki",
       s"[user:${activityUserName}] edited the [repo:${userName}/${repositoryName}] wiki",
       Some(pageName + ":" + commitId),
       currentDate)
-  
-  def recordPushActivity(userName: String, repositoryName: String, activityUserName: String, 
-      branchName: String, commits: List[util.JGitUtil.CommitInfo]) =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+
+  def recordPushActivity(userName: String, repositoryName: String, activityUserName: String,
+      branchName: String, commits: List[util.JGitUtil.CommitInfo])(implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "push",
       s"[user:${activityUserName}] pushed to [branch:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
       Some(commits.map { commit => commit.id + ":" + commit.shortMessage }.mkString("\n")),
       currentDate)
-  
+
   def recordCreateTagActivity(userName: String, repositoryName: String, activityUserName: String, 
-      tagName: String, commits: List[util.JGitUtil.CommitInfo]) =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      tagName: String, commits: List[util.JGitUtil.CommitInfo])(implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "create_tag",
       s"[user:${activityUserName}] created tag [tag:${userName}/${repositoryName}#${tagName}] at [repo:${userName}/${repositoryName}]",
       None,
       currentDate)
 
   def recordDeleteTagActivity(userName: String, repositoryName: String, activityUserName: String,
-                              tagName: String, commits: List[util.JGitUtil.CommitInfo]) =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+                              tagName: String, commits: List[util.JGitUtil.CommitInfo])(implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "delete_tag",
       s"[user:${activityUserName}] deleted tag ${tagName} at [repo:${userName}/${repositoryName}]",
       None,
       currentDate)
 
-  def recordCreateBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String) =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordCreateBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String)
+                                (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "create_branch",
       s"[user:${activityUserName}] created branch [branch:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
       None,
       currentDate)
 
-  def recordDeleteBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String) =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordDeleteBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String)
+                                (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "delete_branch",
       s"[user:${activityUserName}] deleted branch ${branchName} at [repo:${userName}/${repositoryName}]",
       None,
       currentDate)
 
-  def recordForkActivity(userName: String, repositoryName: String, activityUserName: String) =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordForkActivity(userName: String, repositoryName: String, activityUserName: String)(implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "fork",
       s"[user:${activityUserName}] forked [repo:${userName}/${repositoryName}] to [repo:${activityUserName}/${repositoryName}]",
       None,
       currentDate)
 
-  def recordPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String)
+                               (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "open_pullreq",
       s"[user:${activityUserName}] opened pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
       Some(title),
       currentDate)
 
-  def recordMergeActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, message: String): Unit =
-    Activities.autoInc insert(userName, repositoryName, activityUserName,
+  def recordMergeActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, message: String)
+                         (implicit s: Session): Unit =
+    Activities insert Activity(userName, repositoryName, activityUserName,
       "merge_pullreq",
       s"[user:${activityUserName}] merged pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
       Some(message),

src/main/scala/service/IssuesService.scala

@@ -1,380 +1,386 @@
-package service
-
-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
-import scala.slick.jdbc.{StaticQuery => Q}
-import Q.interpolation
-
-import model._
-import util.Implicits._
-import util.StringUtil._
-
-trait IssuesService {
-  import IssuesService._
-
-  def getIssue(owner: String, repository: String, issueId: String) =
-    if (issueId forall (_.isDigit))
-      Query(Issues) filter (_.byPrimaryKey(owner, repository, issueId.toInt)) firstOption
-    else None
-
-  def getComments(owner: String, repository: String, issueId: Int) =
-    Query(IssueComments) filter (_.byIssue(owner, repository, issueId)) list
-
-  def getComment(owner: String, repository: String, commentId: String) =
-    if (commentId forall (_.isDigit))
-      Query(IssueComments) filter { t =>
-        t.byPrimaryKey(commentId.toInt) && t.byRepository(owner, repository)
-      } firstOption
-    else None
-
-  def getIssueLabels(owner: String, repository: String, issueId: Int) =
-    IssueLabels
-      .innerJoin(Labels).on { (t1, t2) =>
-        t1.byLabel(t2.userName, t2.repositoryName, t2.labelId)
-      }
-      .filter ( _._1.byIssue(owner, repository, issueId) )
-      .map    ( _._2 )
-      .list
-
-  def getIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int) =
-    Query(IssueLabels) filter (_.byPrimaryKey(owner, repository, issueId, labelId)) firstOption
-
-  /**
-   * Returns the count of the search result against  issues.
-   *
-   * @param condition the search condition
-   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
-   * @param onlyPullRequest if true then counts only pull request, false then counts both of issue and pull request.
-   * @param repos Tuple of the repository owner and the repository name
-   * @return the count of the search result
-   */
-  def countIssue(condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
-                 repos: (String, String)*): Int =
-    Query(searchIssueQuery(repos, condition, filterUser, onlyPullRequest).length).first
-  /**
-   * Returns the Map which contains issue count for each labels.
-   *
-   * @param owner the repository owner
-   * @param repository the repository name
-   * @param condition the search condition
-   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
-   * @return the Map which contains issue count for each labels (key is label name, value is issue count)
-   */
-  def countIssueGroupByLabels(owner: String, repository: String, condition: IssueSearchCondition,
-                              filterUser: Map[String, String]): Map[String, Int] = {
-
-    searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), filterUser, false)
-      .innerJoin(IssueLabels).on { (t1, t2) =>
-        t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
-      }
-      .innerJoin(Labels).on { case ((t1, t2), t3) =>
-        t2.byLabel(t3.userName, t3.repositoryName, t3.labelId)
-      }
-      .groupBy { case ((t1, t2), t3) =>
-        t3.labelName
-      }
-      .map { case (labelName, t) =>
-        labelName ~ t.length
-      }
-      .toMap
-  }
-  /**
-   * Returns list which contains issue count for each repository.
-   * If the issue does not exist, its repository is not included in the result.
-   *
-   * @param condition the search condition
-   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
-   * @param onlyPullRequest if true then returns only pull request, false then returns both of issue and pull request.
-   * @param repos Tuple of the repository owner and the repository name
-   * @return list which contains issue count for each repository
-   */
-  def countIssueGroupByRepository(
-      condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
-      repos: (String, String)*): List[(String, String, Int)] = {
-    searchIssueQuery(repos, condition.copy(repo = None), filterUser, onlyPullRequest)
-      .groupBy { t =>
-        t.userName ~ t.repositoryName
-      }
-      .map { case (repo, t) =>
-        repo ~ t.length
-      }
-      .sortBy(_._3 desc)
-      .list
-  }
-
-  /**
-   * Returns the search result against  issues.
-   *
-   * @param condition the search condition
-   * @param filterUser the filter user name (key is "all", "assigned", "created_by" or "not_created_by", value is the user name)
-   * @param onlyPullRequest if true then returns only pull request, false then returns both of issue and pull request.
-   * @param offset the offset for pagination
-   * @param limit the limit for pagination
-   * @param repos Tuple of the repository owner and the repository name
-   * @return the search result (list of tuples which contain issue, labels and comment count)
-   */
-  def searchIssue(condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
-                  offset: Int, limit: Int, repos: (String, String)*): List[(Issue, List[Label], Int)] = {
-
-    // get issues and comment count and labels
-    searchIssueQuery(repos, condition, filterUser, onlyPullRequest)
-        .innerJoin(IssueOutline).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) }
-        .sortBy { case (t1, t2) =>
-          (condition.sort match {
-            case "created"  => t1.registeredDate
-            case "comments" => t2.commentCount
-            case "updated"  => t1.updatedDate
-          }) match {
-            case sort => condition.direction match {
-              case "asc"  => sort asc
-              case "desc" => sort desc
-            }
-          }
-        }
-        .drop(offset).take(limit)
-        .leftJoin (IssueLabels) .on { case ((t1, t2), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
-        .leftJoin (Labels)      .on { case (((t1, t2), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) }
-        .map { case (((t1, t2), t3), t4) =>
-          (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?)
-        }
-        .list
-        .splitWith { (c1, c2) =>
-          c1._1.userName == c2._1.userName &&
-          c1._1.repositoryName == c2._1.repositoryName &&
-          c1._1.issueId == c2._1.issueId
-        }
-        .map { issues => issues.head match {
-          case (issue, commentCount, _,_,_) =>
-            (issue,
-             issues.flatMap { t => t._3.map (
-                 Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get)
-             )} toList,
-             commentCount)
-        }} toList
-  }
-
-  /**
-   * Assembles query for conditional issue searching.
-   */
-  private def searchIssueQuery(repos: Seq[(String, String)], condition: IssueSearchCondition,
-                               filterUser: Map[String, String], onlyPullRequest: Boolean) =
-    Query(Issues) filter { t1 =>
-      condition.repo
-          .map { _.split('/') match { case array => Seq(array(0) -> array(1)) } }
-          .getOrElse (repos)
-          .map { case (owner, repository) => t1.byRepository(owner, repository) }
-          .foldLeft[Column[Boolean]](false) ( _ || _ ) &&
-      (t1.closed           is (condition.state == "closed").bind) &&
-      (t1.milestoneId      is condition.milestoneId.get.get.bind, condition.milestoneId.flatten.isDefined) &&
-      (t1.milestoneId      isNull, condition.milestoneId == Some(None)) &&
-      (t1.assignedUserName is filterUser("assigned").bind, filterUser.get("assigned").isDefined) &&
-      (t1.openedUserName   is filterUser("created_by").bind, filterUser.get("created_by").isDefined) &&
-      (t1.openedUserName   isNot filterUser("not_created_by").bind, filterUser.get("not_created_by").isDefined) &&
-      (t1.pullRequest      is true.bind, onlyPullRequest) &&
-      (IssueLabels filter { t2 =>
-        (t2.byIssue(t1.userName, t1.repositoryName, t1.issueId)) &&
-        (t2.labelId in
-          (Labels filter { t3 =>
-            (t3.byRepository(t1.userName, t1.repositoryName)) &&
-            (t3.labelName inSetBind condition.labels)
-          } map(_.labelId)))
-      } exists, condition.labels.nonEmpty)
-    }
-
-  def createIssue(owner: String, repository: String, loginUser: String, title: String, content: Option[String],
-                  assignedUserName: Option[String], milestoneId: Option[Int], isPullRequest: Boolean = false) =
-    // next id number
-    sql"SELECT ISSUE_ID + 1 FROM ISSUE_ID WHERE USER_NAME = $owner AND REPOSITORY_NAME = $repository FOR UPDATE".as[Int]
-        .firstOption.filter { id =>
-      Issues insert Issue(
-          owner,
-          repository,
-          id,
-          loginUser,
-          milestoneId,
-          assignedUserName,
-          title,
-          content,
-          false,
-          currentDate,
-          currentDate,
-          isPullRequest)
-
-      // increment issue id
-      IssueId
-        .filter (_.byPrimaryKey(owner, repository))
-        .map (_.issueId)
-        .update (id) > 0
-    } get
-
-  def registerIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int) =
-    IssueLabels insert (IssueLabel(owner, repository, issueId, labelId))
-
-  def deleteIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int) =
-    IssueLabels filter(_.byPrimaryKey(owner, repository, issueId, labelId)) delete
-
-  def createComment(owner: String, repository: String, loginUser: String,
-      issueId: Int, content: String, action: String) =
-    IssueComments.autoInc insert (
-        owner,
-        repository,
-        issueId,
-        action,
-        loginUser,
-        content,
-        currentDate,
-        currentDate)
-
-  def updateIssue(owner: String, repository: String, issueId: Int,
-      title: String, content: Option[String]) =
-    Issues
-      .filter (_.byPrimaryKey(owner, repository, issueId))
-      .map { t =>
-        t.title ~ t.content.? ~ t.updatedDate
-      }
-      .update (title, content, currentDate)
-
-  def updateAssignedUserName(owner: String, repository: String, issueId: Int, assignedUserName: Option[String]) =
-    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.assignedUserName?).update (assignedUserName)
-
-  def updateMilestoneId(owner: String, repository: String, issueId: Int, milestoneId: Option[Int]) =
-    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.milestoneId?).update (milestoneId)
-
-  def updateComment(commentId: Int, content: String) =
-    IssueComments
-      .filter (_.byPrimaryKey(commentId))
-      .map { t =>
-        t.content ~ t.updatedDate
-      }
-      .update (content, currentDate)
-
-  def deleteComment(commentId: Int) =
-    IssueComments filter (_.byPrimaryKey(commentId)) delete
-
-  def updateClosed(owner: String, repository: String, issueId: Int, closed: Boolean) =
-    Issues
-      .filter (_.byPrimaryKey(owner, repository, issueId))
-      .map { t =>
-        t.closed ~ t.updatedDate
-      }
-      .update (closed, currentDate)
-
-  /**
-   * Search issues by keyword.
-   *
-   * @param owner the repository owner
-   * @param repository the repository name
-   * @param query the keywords separated by whitespace.
-   * @return issues with comment count and matched content of issue or comment
-   */
-  def searchIssuesByKeyword(owner: String, repository: String, query: String): List[(Issue, Int, String)] = {
-    import scala.slick.driver.H2Driver.likeEncode
-    val keywords = splitWords(query.toLowerCase)
-
-    // Search Issue
-    val issues = Issues
-      .innerJoin(IssueOutline).on { case (t1, t2) =>
-        t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
-      }
-      .filter { case (t1, t2) =>
-        keywords.map { keyword =>
-          (t1.title.toLowerCase   like (s"%${likeEncode(keyword)}%", '^')) ||
-          (t1.content.toLowerCase like (s"%${likeEncode(keyword)}%", '^'))
-        } .reduceLeft(_ && _)
-      }
-      .map { case (t1, t2) =>
-        (t1, 0, t1.content.?, t2.commentCount)
-      }
-
-    // Search IssueComment
-    val comments = IssueComments
-      .innerJoin(Issues).on { case (t1, t2) =>
-        t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
-      }
-      .innerJoin(IssueOutline).on { case ((t1, t2), t3) =>
-        t2.byIssue(t3.userName, t3.repositoryName, t3.issueId)
-      }
-      .filter { case ((t1, t2), t3) =>
-        keywords.map { query =>
-          t1.content.toLowerCase like (s"%${likeEncode(query)}%", '^')
-        }.reduceLeft(_ && _)
-      }
-      .map { case ((t1, t2), t3) =>
-        (t2, t1.commentId, t1.content.?, t3.commentCount)
-      }
-
-    issues.union(comments).sortBy { case (issue, commentId, _, _) =>
-      issue.issueId ~ commentId
-    }.list.splitWith { case ((issue1, _, _, _), (issue2, _, _, _)) =>
-      issue1.issueId == issue2.issueId
-    }.map { _.head match {
-        case (issue, _, content, commentCount) => (issue, commentCount, content.getOrElse(""))
-      }
-    }.toList
-  }
-
-  def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String) = {
-    extractCloseId(message).foreach { issueId =>
-      for(issue <- getIssue(owner, repository, issueId) if !issue.closed){
-        createComment(owner, repository, userName, issue.issueId, "Close", "close")
-        updateClosed(owner, repository, issue.issueId, true)
-      }
-    }
-  }
-}
-
-object IssuesService {
-  import javax.servlet.http.HttpServletRequest
-
-  val IssueLimit = 30
-
-  case class IssueSearchCondition(
-      labels: Set[String] = Set.empty,
-      milestoneId: Option[Option[Int]] = None,
-      repo: Option[String] = None,
-      state: String = "open",
-      sort: String = "created",
-      direction: String = "desc"){
-
-    def toURL: String =
-      "?" + List(
-        if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(","))),
-        milestoneId.map { id => "milestone=" + (id match {
-          case Some(x) => x.toString
-          case None    => "none"
-        })},
-        repo.map("for="   + urlEncode(_)),
-        Some("state="     + urlEncode(state)),
-        Some("sort="      + urlEncode(sort)),
-        Some("direction=" + urlEncode(direction))).flatten.mkString("&")
-
-  }
-
-  object IssueSearchCondition {
-
-    private def param(request: HttpServletRequest, name: String, allow: Seq[String] = Nil): Option[String] = {
-      val value = request.getParameter(name)
-      if(value == null || value.isEmpty || (allow.nonEmpty && !allow.contains(value))) None else Some(value)
-    }
-
-    def apply(request: HttpServletRequest): IssueSearchCondition =
-      IssueSearchCondition(
-        param(request, "labels").map(_.split(",").toSet).getOrElse(Set.empty),
-        param(request, "milestone").map{
-          case "none" => None
-          case x      => x.toIntOpt
-        },
-        param(request, "for"),
-        param(request, "state",     Seq("open", "closed")).getOrElse("open"),
-        param(request, "sort",      Seq("created", "comments", "updated")).getOrElse("created"),
-        param(request, "direction", Seq("asc", "desc")).getOrElse("desc"))
-
-    def page(request: HttpServletRequest) = try {
-      val i = param(request, "page").getOrElse("1").toInt
-      if(i <= 0) 1 else i
-    } catch {
-      case e: NumberFormatException => 1
-    }
-  }
-
-}
+package service
+
+import scala.slick.jdbc.{StaticQuery => Q}
+import Q.interpolation
+
+import model.Profile._
+import profile.simple._
+import model.{Issue, IssueComment, IssueLabel, Label}
+import util.Implicits._
+import util.StringUtil._
+
+trait IssuesService {
+  import IssuesService._
+
+  def getIssue(owner: String, repository: String, issueId: String)(implicit s: Session) =
+    if (issueId forall (_.isDigit))
+      Issues filter (_.byPrimaryKey(owner, repository, issueId.toInt)) firstOption
+    else None
+
+  def getComments(owner: String, repository: String, issueId: Int)(implicit s: Session) =
+    IssueComments filter (_.byIssue(owner, repository, issueId)) list
+
+  def getComment(owner: String, repository: String, commentId: String)(implicit s: Session) =
+    if (commentId forall (_.isDigit))
+      IssueComments filter { t =>
+        t.byPrimaryKey(commentId.toInt) && t.byRepository(owner, repository)
+      } firstOption
+    else None
+
+  def getIssueLabels(owner: String, repository: String, issueId: Int)(implicit s: Session) =
+    IssueLabels
+      .innerJoin(Labels).on { (t1, t2) =>
+        t1.byLabel(t2.userName, t2.repositoryName, t2.labelId)
+      }
+      .filter ( _._1.byIssue(owner, repository, issueId) )
+      .map    ( _._2 )
+      .list
+
+  def getIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session) =
+    IssueLabels filter (_.byPrimaryKey(owner, repository, issueId, labelId)) firstOption
+
+  /**
+   * Returns the count of the search result against  issues.
+   *
+   * @param condition the search condition
+   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
+   * @param onlyPullRequest if true then counts only pull request, false then counts both of issue and pull request.
+   * @param repos Tuple of the repository owner and the repository name
+   * @return the count of the search result
+   */
+  def countIssue(condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
+                 repos: (String, String)*)(implicit s: Session): Int =
+    Query(searchIssueQuery(repos, condition, filterUser, onlyPullRequest).length).first
+
+  /**
+   * Returns the Map which contains issue count for each labels.
+   *
+   * @param owner the repository owner
+   * @param repository the repository name
+   * @param condition the search condition
+   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
+   * @return the Map which contains issue count for each labels (key is label name, value is issue count)
+   */
+  def countIssueGroupByLabels(owner: String, repository: String, condition: IssueSearchCondition,
+                              filterUser: Map[String, String])(implicit s: Session): Map[String, Int] = {
+
+    searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), filterUser, false)
+      .innerJoin(IssueLabels).on { (t1, t2) =>
+        t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
+      }
+      .innerJoin(Labels).on { case ((t1, t2), t3) =>
+        t2.byLabel(t3.userName, t3.repositoryName, t3.labelId)
+      }
+      .groupBy { case ((t1, t2), t3) =>
+        t3.labelName
+      }
+      .map { case (labelName, t) =>
+        labelName -> t.length
+      }
+      .toMap
+  }
+  /**
+   * Returns list which contains issue count for each repository.
+   * If the issue does not exist, its repository is not included in the result.
+   *
+   * @param condition the search condition
+   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
+   * @param onlyPullRequest if true then returns only pull request, false then returns both of issue and pull request.
+   * @param repos Tuple of the repository owner and the repository name
+   * @return list which contains issue count for each repository
+   */
+  def countIssueGroupByRepository(
+      condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
+      repos: (String, String)*)(implicit s: Session): List[(String, String, Int)] = {
+    searchIssueQuery(repos, condition.copy(repo = None), filterUser, onlyPullRequest)
+      .groupBy { t =>
+        t.userName -> t.repositoryName
+      }
+      .map { case (repo, t) =>
+        (repo._1, repo._2, t.length)
+      }
+      .sortBy(_._3 desc)
+      .list
+  }
+
+  /**
+   * Returns the search result against  issues.
+   *
+   * @param condition the search condition
+   * @param filterUser the filter user name (key is "all", "assigned", "created_by" or "not_created_by", value is the user name)
+   * @param onlyPullRequest if true then returns only pull request, false then returns both of issue and pull request.
+   * @param offset the offset for pagination
+   * @param limit the limit for pagination
+   * @param repos Tuple of the repository owner and the repository name
+   * @return the search result (list of tuples which contain issue, labels and comment count)
+   */
+  def searchIssue(condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
+                  offset: Int, limit: Int, repos: (String, String)*)
+                 (implicit s: Session): List[(Issue, List[Label], Int)] = {
+
+    // get issues and comment count and labels
+    searchIssueQuery(repos, condition, filterUser, onlyPullRequest)
+        .innerJoin(IssueOutline).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) }
+        .sortBy { case (t1, t2) =>
+          (condition.sort match {
+            case "created"  => t1.registeredDate
+            case "comments" => t2.commentCount
+            case "updated"  => t1.updatedDate
+          }) match {
+            case sort => condition.direction match {
+              case "asc"  => sort asc
+              case "desc" => sort desc
+            }
+          }
+        }
+        .drop(offset).take(limit)
+        .leftJoin (IssueLabels) .on { case ((t1, t2), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
+        .leftJoin (Labels)      .on { case (((t1, t2), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) }
+        .map { case (((t1, t2), t3), t4) =>
+          (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?)
+        }
+        .list
+        .splitWith { (c1, c2) =>
+          c1._1.userName == c2._1.userName &&
+          c1._1.repositoryName == c2._1.repositoryName &&
+          c1._1.issueId == c2._1.issueId
+        }
+        .map { issues => issues.head match {
+          case (issue, commentCount, _,_,_) =>
+            (issue,
+             issues.flatMap { t => t._3.map (
+                 Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get)
+             )} toList,
+             commentCount)
+        }} toList
+  }
+
+  /**
+   * Assembles query for conditional issue searching.
+   */
+  private def searchIssueQuery(repos: Seq[(String, String)], condition: IssueSearchCondition,
+                               filterUser: Map[String, String], onlyPullRequest: Boolean)(implicit s: Session) =
+    Issues filter { t1 =>
+      condition.repo
+          .map { _.split('/') match { case array => Seq(array(0) -> array(1)) } }
+          .getOrElse (repos)
+          .map { case (owner, repository) => t1.byRepository(owner, repository) }
+          .foldLeft[Column[Boolean]](false) ( _ || _ ) &&
+      (t1.closed           === (condition.state == "closed").bind) &&
+      (t1.milestoneId      === condition.milestoneId.get.get.bind, condition.milestoneId.flatten.isDefined) &&
+      (t1.milestoneId.?    isEmpty, condition.milestoneId == Some(None)) &&
+      (t1.assignedUserName === filterUser("assigned").bind, filterUser.get("assigned").isDefined) &&
+      (t1.openedUserName   === filterUser("created_by").bind, filterUser.get("created_by").isDefined) &&
+      (t1.openedUserName   =!= filterUser("not_created_by").bind, filterUser.get("not_created_by").isDefined) &&
+      (t1.pullRequest      === true.bind, onlyPullRequest) &&
+      (IssueLabels filter { t2 =>
+        (t2.byIssue(t1.userName, t1.repositoryName, t1.issueId)) &&
+        (t2.labelId in
+          (Labels filter { t3 =>
+            (t3.byRepository(t1.userName, t1.repositoryName)) &&
+            (t3.labelName inSetBind condition.labels)
+          } map(_.labelId)))
+      } exists, condition.labels.nonEmpty)
+    }
+
+  def createIssue(owner: String, repository: String, loginUser: String, title: String, content: Option[String],
+                  assignedUserName: Option[String], milestoneId: Option[Int],
+                  isPullRequest: Boolean = false)(implicit s: Session) =
+    // next id number
+    sql"SELECT ISSUE_ID + 1 FROM ISSUE_ID WHERE USER_NAME = $owner AND REPOSITORY_NAME = $repository FOR UPDATE".as[Int]
+        .firstOption.filter { id =>
+      Issues insert Issue(
+          owner,
+          repository,
+          id,
+          loginUser,
+          milestoneId,
+          assignedUserName,
+          title,
+          content,
+          false,
+          currentDate,
+          currentDate,
+          isPullRequest)
+
+      // increment issue id
+      IssueId
+        .filter (_.byPrimaryKey(owner, repository))
+        .map (_.issueId)
+        .update (id) > 0
+    } get
+
+  def registerIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session) =
+    IssueLabels insert IssueLabel(owner, repository, issueId, labelId)
+
+  def deleteIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int)(implicit s: Session) =
+    IssueLabels filter(_.byPrimaryKey(owner, repository, issueId, labelId)) delete
+
+  def createComment(owner: String, repository: String, loginUser: String,
+      issueId: Int, content: String, action: String)(implicit s: Session): Int =
+    IssueComments.autoInc insert IssueComment(
+        userName          = owner,
+        repositoryName    = repository,
+        issueId           = issueId,
+        action            = action,
+        commentedUserName = loginUser,
+        content           = content,
+        registeredDate    = currentDate,
+        updatedDate       = currentDate)
+
+  def updateIssue(owner: String, repository: String, issueId: Int,
+      title: String, content: Option[String])(implicit s: Session) =
+    Issues
+      .filter (_.byPrimaryKey(owner, repository, issueId))
+      .map { t =>
+        (t.title, t.content.?, t.updatedDate)
+      }
+      .update (title, content, currentDate)
+
+  def updateAssignedUserName(owner: String, repository: String, issueId: Int,
+                             assignedUserName: Option[String])(implicit s: Session) =
+    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.assignedUserName?).update (assignedUserName)
+
+  def updateMilestoneId(owner: String, repository: String, issueId: Int,
+                        milestoneId: Option[Int])(implicit s: Session) =
+    Issues.filter (_.byPrimaryKey(owner, repository, issueId)).map(_.milestoneId?).update (milestoneId)
+
+  def updateComment(commentId: Int, content: String)(implicit s: Session) =
+    IssueComments
+      .filter (_.byPrimaryKey(commentId))
+      .map { t =>
+        t.content -> t.updatedDate
+      }
+      .update (content, currentDate)
+
+  def deleteComment(commentId: Int)(implicit s: Session) =
+    IssueComments filter (_.byPrimaryKey(commentId)) delete
+
+  def updateClosed(owner: String, repository: String, issueId: Int, closed: Boolean)(implicit s: Session) =
+    Issues
+      .filter (_.byPrimaryKey(owner, repository, issueId))
+      .map { t =>
+        t.closed -> t.updatedDate
+      }
+      .update (closed, currentDate)
+
+  /**
+   * Search issues by keyword.
+   *
+   * @param owner the repository owner
+   * @param repository the repository name
+   * @param query the keywords separated by whitespace.
+   * @return issues with comment count and matched content of issue or comment
+   */
+  def searchIssuesByKeyword(owner: String, repository: String, query: String)
+                           (implicit s: Session): List[(Issue, Int, String)] = {
+    import slick.driver.JdbcDriver.likeEncode
+    val keywords = splitWords(query.toLowerCase)
+
+    // Search Issue
+    val issues = Issues
+      .innerJoin(IssueOutline).on { case (t1, t2) =>
+        t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
+      }
+      .filter { case (t1, t2) =>
+        keywords.map { keyword =>
+          (t1.title.toLowerCase   like (s"%${likeEncode(keyword)}%", '^')) ||
+          (t1.content.toLowerCase like (s"%${likeEncode(keyword)}%", '^'))
+        } .reduceLeft(_ && _)
+      }
+      .map { case (t1, t2) =>
+        (t1, 0, t1.content.?, t2.commentCount)
+      }
+
+    // Search IssueComment
+    val comments = IssueComments
+      .innerJoin(Issues).on { case (t1, t2) =>
+        t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
+      }
+      .innerJoin(IssueOutline).on { case ((t1, t2), t3) =>
+        t2.byIssue(t3.userName, t3.repositoryName, t3.issueId)
+      }
+      .filter { case ((t1, t2), t3) =>
+        keywords.map { query =>
+          t1.content.toLowerCase like (s"%${likeEncode(query)}%", '^')
+        }.reduceLeft(_ && _)
+      }
+      .map { case ((t1, t2), t3) =>
+        (t2, t1.commentId, t1.content.?, t3.commentCount)
+      }
+
+    issues.union(comments).sortBy { case (issue, commentId, _, _) =>
+      issue.issueId -> commentId
+    }.list.splitWith { case ((issue1, _, _, _), (issue2, _, _, _)) =>
+      issue1.issueId == issue2.issueId
+    }.map { _.head match {
+        case (issue, _, content, commentCount) => (issue, commentCount, content.getOrElse(""))
+      }
+    }.toList
+  }
+
+  def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String)(implicit s: Session) = {
+    extractCloseId(message).foreach { issueId =>
+      for(issue <- getIssue(owner, repository, issueId) if !issue.closed){
+        createComment(owner, repository, userName, issue.issueId, "Close", "close")
+        updateClosed(owner, repository, issue.issueId, true)
+      }
+    }
+  }
+}
+
+object IssuesService {
+  import javax.servlet.http.HttpServletRequest
+
+  val IssueLimit = 30
+
+  case class IssueSearchCondition(
+      labels: Set[String] = Set.empty,
+      milestoneId: Option[Option[Int]] = None,
+      repo: Option[String] = None,
+      state: String = "open",
+      sort: String = "created",
+      direction: String = "desc"){
+
+    def toURL: String =
+      "?" + List(
+        if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(","))),
+        milestoneId.map { id => "milestone=" + (id match {
+          case Some(x) => x.toString
+          case None    => "none"
+        })},
+        repo.map("for="   + urlEncode(_)),
+        Some("state="     + urlEncode(state)),
+        Some("sort="      + urlEncode(sort)),
+        Some("direction=" + urlEncode(direction))).flatten.mkString("&")
+
+  }
+
+  object IssueSearchCondition {
+
+    private def param(request: HttpServletRequest, name: String, allow: Seq[String] = Nil): Option[String] = {
+      val value = request.getParameter(name)
+      if(value == null || value.isEmpty || (allow.nonEmpty && !allow.contains(value))) None else Some(value)
+    }
+
+    def apply(request: HttpServletRequest): IssueSearchCondition =
+      IssueSearchCondition(
+        param(request, "labels").map(_.split(",").toSet).getOrElse(Set.empty),
+        param(request, "milestone").map{
+          case "none" => None
+          case x      => x.toIntOpt
+        },
+        param(request, "for"),
+        param(request, "state",     Seq("open", "closed")).getOrElse("open"),
+        param(request, "sort",      Seq("created", "comments", "updated")).getOrElse("created"),
+        param(request, "direction", Seq("asc", "desc")).getOrElse("desc"))
+
+    def page(request: HttpServletRequest) = try {
+      val i = param(request, "page").getOrElse("1").toInt
+      if(i <= 0) 1 else i
+    } catch {
+      case e: NumberFormatException => 1
+    }
+  }
+
+}

src/main/scala/service/LabelsService.scala

@@ -1,26 +1,32 @@
 package service
 
-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
-
-import model._
+import model.Profile._
+import profile.simple._
+import model.Label
 
 trait LabelsService {
 
-  def getLabels(owner: String, repository: String): List[Label] =
-    Query(Labels).filter(_.byRepository(owner, repository)).sortBy(_.labelName asc).list
+  def getLabels(owner: String, repository: String)(implicit s: Session): List[Label] =
+    Labels.filter(_.byRepository(owner, repository)).sortBy(_.labelName asc).list
 
-  def getLabel(owner: String, repository: String, labelId: Int): Option[Label] =
-    Query(Labels).filter(_.byPrimaryKey(owner, repository, labelId)).firstOption
+  def getLabel(owner: String, repository: String, labelId: Int)(implicit s: Session): Option[Label] =
+    Labels.filter(_.byPrimaryKey(owner, repository, labelId)).firstOption
 
-  def createLabel(owner: String, repository: String, labelName: String, color: String): Unit =
-    Labels.ins insert (owner, repository, labelName, color)
+  def createLabel(owner: String, repository: String, labelName: String, color: String)(implicit s: Session): Unit =
+    Labels insert Label(
+      userName       = owner,
+      repositoryName = repository,
+      labelName      = labelName,
+      color          = color
+    )
 
-  def updateLabel(owner: String, repository: String, labelId: Int, labelName: String, color: String): Unit =
-    Labels.filter(_.byPrimaryKey(owner, repository, labelId)).map(t => t.labelName ~ t.color)
-      .update(labelName, color)
+  def updateLabel(owner: String, repository: String, labelId: Int, labelName: String, color: String)
+                 (implicit s: Session): Unit =
+    Labels.filter(_.byPrimaryKey(owner, repository, labelId))
+          .map(t => t.labelName -> t.color)
+          .update(labelName, color)
 
-  def deleteLabel(owner: String, repository: String, labelId: Int): Unit = {
+  def deleteLabel(owner: String, repository: String, labelId: Int)(implicit s: Session): Unit = {
     IssueLabels.filter(_.byLabel(owner, repository, labelId)).delete
     Labels.filter(_.byPrimaryKey(owner, repository, labelId)).delete
   }

src/main/scala/service/MilestonesService.scala

@@ -1,39 +1,49 @@
 package service
 
-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
-
-import model._
+import model.Profile._
+import profile.simple._
+import model.Milestone
+// TODO [Slick 2.0]NOT import directly?
+import model.Profile.dateColumnType
 
 trait MilestonesService {
 
   def createMilestone(owner: String, repository: String, title: String, description: Option[String],
-                      dueDate: Option[java.util.Date]): Unit =
-    Milestones.ins insert (owner, repository, title, description, dueDate, None)
+                      dueDate: Option[java.util.Date])(implicit s: Session): Unit =
+    Milestones insert Milestone(
+      userName       = owner,
+      repositoryName = repository,
+      title          = title,
+      description    = description,
+      dueDate        = dueDate,
+      closedDate     = None
+    )
 
-  def updateMilestone(milestone: Milestone): Unit =
+  def updateMilestone(milestone: Milestone)(implicit s: Session): Unit =
     Milestones
-      .filter (t => t.byPrimaryKey(milestone.userName, milestone.repositoryName, milestone.milestoneId))
-      .map    (t => t.title ~ t.description.? ~ t.dueDate.? ~ t.closedDate.?)
+      .filter (t =>  t.byPrimaryKey(milestone.userName, milestone.repositoryName, milestone.milestoneId))
+      .map    (t => (t.title, t.description.?, t.dueDate.?, t.closedDate.?))
       .update (milestone.title, milestone.description, milestone.dueDate, milestone.closedDate)
 
-  def openMilestone(milestone: Milestone): Unit = updateMilestone(milestone.copy(closedDate = None))
+  def openMilestone(milestone: Milestone)(implicit s: Session): Unit =
+    updateMilestone(milestone.copy(closedDate = None))
 
-  def closeMilestone(milestone: Milestone): Unit = updateMilestone(milestone.copy(closedDate = Some(currentDate)))
+  def closeMilestone(milestone: Milestone)(implicit s: Session): Unit =
+    updateMilestone(milestone.copy(closedDate = Some(currentDate)))
 
-  def deleteMilestone(owner: String, repository: String, milestoneId: Int): Unit = {
+  def deleteMilestone(owner: String, repository: String, milestoneId: Int)(implicit s: Session): Unit = {
     Issues.filter(_.byMilestone(owner, repository, milestoneId)).map(_.milestoneId.?).update(None)
     Milestones.filter(_.byPrimaryKey(owner, repository, milestoneId)).delete
   }
 
-  def getMilestone(owner: String, repository: String, milestoneId: Int): Option[Milestone] =
-    Query(Milestones).filter(_.byPrimaryKey(owner, repository, milestoneId)).firstOption
+  def getMilestone(owner: String, repository: String, milestoneId: Int)(implicit s: Session): Option[Milestone] =
+    Milestones.filter(_.byPrimaryKey(owner, repository, milestoneId)).firstOption
 
-  def getMilestonesWithIssueCount(owner: String, repository: String): List[(Milestone, Int, Int)] = {
+  def getMilestonesWithIssueCount(owner: String, repository: String)(implicit s: Session): List[(Milestone, Int, Int)] = {
     val counts = Issues
-      .filter  { t => (t.byRepository(owner, repository)) && (t.milestoneId isNotNull) }
-      .groupBy { t => t.milestoneId ~ t.closed }
-      .map     { case (t1, t2) => (t1._1 ~ t1._2) -> t2.length }
+      .filter  { t => (t.byRepository(owner, repository)) && (t.milestoneId.? isDefined) }
+      .groupBy { t => t.milestoneId -> t.closed }
+      .map     { case (t1, t2) => t1._1 -> t1._2 -> t2.length }
       .toMap
 
     getMilestones(owner, repository).map { milestone =>
@@ -41,6 +51,7 @@ trait MilestonesService {
     }
   }
 
-  def getMilestones(owner: String, repository: String): List[Milestone] =
-    Query(Milestones).filter(_.byRepository(owner, repository)).sortBy(_.milestoneId asc).list
+  def getMilestones(owner: String, repository: String)(implicit s: Session): List[Milestone] =
+    Milestones.filter(_.byRepository(owner, repository)).sortBy(_.milestoneId asc).list
+
 }

src/main/scala/service/PluginService.scala

@@ -0,0 +1,24 @@
+package service
+
+import model.Profile._
+import profile.simple._
+import model.Plugin
+
+trait PluginService {
+
+  def getPlugins()(implicit s: Session): List[Plugin] =
+    Plugins.sortBy(_.pluginId).list
+
+  def registerPlugin(plugin: Plugin)(implicit s: Session): Unit =
+    Plugins.insert(plugin)
+
+  def updatePlugin(plugin: Plugin)(implicit s: Session): Unit =
+    Plugins.filter(_.pluginId === plugin.pluginId.bind).map(_.version).update(plugin.version)
+
+  def deletePlugin(pluginId: String)(implicit s: Session): Unit =
+    Plugins.filter(_.pluginId === pluginId.bind).delete
+
+  def getPlugin(pluginId: String)(implicit s: Session): Option[Plugin] =
+    Plugins.filter(_.pluginId === pluginId.bind).firstOption
+
+}

src/main/scala/service/PullRequestService.scala

@@ -1,42 +1,45 @@
 package service
 
-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
-import model._
+import model.Profile._
+import profile.simple._
+import model.{PullRequest, Issue}
 
 trait PullRequestService { self: IssuesService =>
   import PullRequestService._
 
-  def getPullRequest(owner: String, repository: String, issueId: Int): Option[(Issue, PullRequest)] =
+  def getPullRequest(owner: String, repository: String, issueId: Int)
+                    (implicit s: Session): Option[(Issue, PullRequest)] =
     getIssue(owner, repository, issueId.toString).flatMap{ issue =>
-      Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId)).firstOption.map{
+      PullRequests.filter(_.byPrimaryKey(owner, repository, issueId)).firstOption.map{
         pullreq => (issue, pullreq)
       }
     }
 
-  def updateCommitId(owner: String, repository: String, issueId: Int, commitIdTo: String, commitIdFrom: String): Unit =
-    Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId))
-                       .map(pr => pr.commitIdTo ~ pr.commitIdFrom)
-                       .update((commitIdTo, commitIdFrom))
+  def updateCommitId(owner: String, repository: String, issueId: Int, commitIdTo: String, commitIdFrom: String)
+                    (implicit s: Session): Unit =
+    PullRequests.filter(_.byPrimaryKey(owner, repository, issueId))
+                .map(pr => pr.commitIdTo -> pr.commitIdFrom)
+                .update((commitIdTo, commitIdFrom))
 
-  def getPullRequestCountGroupByUser(closed: Boolean, owner: String, repository: Option[String]): List[PullRequestCount] =
-    Query(PullRequests)
+  def getPullRequestCountGroupByUser(closed: Boolean, owner: Option[String], repository: Option[String])
+                                    (implicit s: Session): List[PullRequestCount] =
+    PullRequests
       .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
       .filter { case (t1, t2) =>
-        (t2.closed         is closed.bind) &&
-        (t1.userName       is owner.bind) &&
-        (t1.repositoryName is repository.get.bind, repository.isDefined)
+        (t2.closed         === closed.bind) &&
+        (t1.userName       === owner.get.bind, owner.isDefined) &&
+        (t1.repositoryName === repository.get.bind, repository.isDefined)
       }
       .groupBy { case (t1, t2) => t2.openedUserName }
-      .map { case (userName, t) => userName ~ t.length }
+      .map { case (userName, t) => userName -> t.length }
       .sortBy(_._2 desc)
       .list
       .map { x => PullRequestCount(x._1, x._2) }
 
   def createPullRequest(originUserName: String, originRepositoryName: String, issueId: Int,
         originBranch: String, requestUserName: String, requestRepositoryName: String, requestBranch: String,
-        commitIdFrom: String, commitIdTo: String): Unit =
-    PullRequests insert (PullRequest(
+        commitIdFrom: String, commitIdTo: String)(implicit s: Session): Unit =
+    PullRequests insert PullRequest(
       originUserName,
       originRepositoryName,
       issueId,
@@ -45,16 +48,17 @@ trait PullRequestService { self: IssuesService =>
       requestRepositoryName,
       requestBranch,
       commitIdFrom,
-      commitIdTo))
+      commitIdTo)
 
-  def getPullRequestsByRequest(userName: String, repositoryName: String, branch: String, closed: Boolean): List[PullRequest] =
-    Query(PullRequests)
+  def getPullRequestsByRequest(userName: String, repositoryName: String, branch: String, closed: Boolean)
+                              (implicit s: Session): List[PullRequest] =
+    PullRequests
       .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
       .filter { case (t1, t2) =>
-        (t1.requestUserName       is userName.bind) &&
-        (t1.requestRepositoryName is repositoryName.bind) &&
-        (t1.requestBranch         is branch.bind) &&
-        (t2.closed                is closed.bind)
+        (t1.requestUserName       === userName.bind) &&
+        (t1.requestRepositoryName === repositoryName.bind) &&
+        (t1.requestBranch         === branch.bind) &&
+        (t2.closed                === closed.bind)
       }
       .map { case (t1, t2) => t1 }
       .list

src/main/scala/service/RepositorySearchService.scala

@@ -3,21 +3,20 @@ package service
 import util.{FileUtil, StringUtil, JGitUtil}
 import util.Directory._
 import util.ControlUtil._
-import model.Issue
 import org.eclipse.jgit.revwalk.RevWalk
 import org.eclipse.jgit.treewalk.TreeWalk
-import scala.collection.mutable.ListBuffer
 import org.eclipse.jgit.lib.FileMode
 import org.eclipse.jgit.api.Git
+import model.Profile._
+import profile.simple._
 
-trait
-RepositorySearchService { self: IssuesService =>
+trait RepositorySearchService { self: IssuesService =>
   import RepositorySearchService._
 
-  def countIssues(owner: String, repository: String, query: String): Int =
+  def countIssues(owner: String, repository: String, query: String)(implicit session: Session): Int =
     searchIssuesByKeyword(owner, repository, query).length
 
-  def searchIssues(owner: String, repository: String, query: String): List[IssueSearchResult] =
+  def searchIssues(owner: String, repository: String, query: String)(implicit session: Session): List[IssueSearchResult] =
     searchIssuesByKeyword(owner, repository, query).map { case (issue, commentCount, content) =>
       IssueSearchResult(
         issue.issueId,
@@ -39,7 +38,7 @@ RepositorySearchService { self: IssuesService =>
         Nil
       } else {
         val files = searchRepositoryFiles(git, query)
-        val commits = JGitUtil.getLatestCommitFromPaths(git, files.toList.map(_._1), "HEAD")
+        val commits = JGitUtil.getLatestCommitFromPaths(git, files.map(_._1), "HEAD")
         files.map { case (path, text) =>
           val (highlightText, lineNumber)  = getHighlightText(text, query)
           FileSearchResult(
@@ -60,7 +59,7 @@ RepositorySearchService { self: IssuesService =>
     treeWalk.addTree(revCommit.getTree)
 
     val keywords = StringUtil.splitWords(query.toLowerCase)
-    val list = new ListBuffer[(String, String)]
+    val list = new scala.collection.mutable.ListBuffer[(String, String)]
 
     while (treeWalk.next()) {
       val mode = treeWalk.getFileMode(0)
@@ -108,7 +107,7 @@ object RepositorySearchService {
 
   case class SearchResult(
     files : List[(String, String)],
-    issues: List[(Issue, Int, String)])
+    issues: List[(model.Issue, Int, String)])
 
   case class IssueSearchResult(
     issueId: Int,

src/main/scala/service/RepositoryService.scala

@@ -1,8 +1,8 @@
 package service
 
-import model._
-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
+import model.Profile._
+import profile.simple._
+import model.{Repository, Account, Collaborator}
 import util.JGitUtil
 
 trait RepositoryService { self: AccountService =>
@@ -20,7 +20,8 @@ trait RepositoryService { self: AccountService =>
    */
   def createRepository(repositoryName: String, userName: String, description: Option[String], isPrivate: Boolean,
                        originRepositoryName: Option[String] = None, originUserName: Option[String] = None,
-                       parentRepositoryName: Option[String] = None, parentUserName: Option[String] = None): Unit = {
+                       parentRepositoryName: Option[String] = None, parentUserName: Option[String] = None)
+                      (implicit s: Session): Unit = {
     Repositories insert
       Repository(
         userName             = userName,
@@ -39,40 +40,50 @@ trait RepositoryService { self: AccountService =>
     IssueId insert (userName, repositoryName, 0)
   }
 
-  def renameRepository(oldUserName: String, oldRepositoryName: String, newUserName: String, newRepositoryName: String): Unit = {
+  def renameRepository(oldUserName: String, oldRepositoryName: String, newUserName: String, newRepositoryName: String)
+                      (implicit s: Session): Unit = {
     getAccountByUserName(newUserName).foreach { account =>
-      (Query(Repositories) filter { t => t.byRepository(oldUserName, oldRepositoryName) } firstOption).map { repository =>
+      (Repositories filter { t => t.byRepository(oldUserName, oldRepositoryName) } firstOption).map { repository =>
         Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)
 
-        val webHooks      = Query(WebHooks     ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val milestones    = Query(Milestones   ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val issueId       = Query(IssueId      ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val issues        = Query(Issues       ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val pullRequests  = Query(PullRequests ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val labels        = Query(Labels       ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val issueComments = Query(IssueComments).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val issueLabels   = Query(IssueLabels  ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val activities    = Query(Activities   ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val collaborators = Query(Collaborators).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val webHooks      = WebHooks     .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val milestones    = Milestones   .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val issueId       = IssueId      .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val issues        = Issues       .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val pullRequests  = PullRequests .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val labels        = Labels       .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val issueComments = IssueComments.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val issueLabels   = IssueLabels  .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val activities    = Activities   .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val collaborators = Collaborators.filter(_.byRepository(oldUserName, oldRepositoryName)).list
 
         Repositories.filter { t =>
-          (t.originUserName is oldUserName.bind) && (t.originRepositoryName is oldRepositoryName.bind)
-        }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName)
+          (t.originUserName === oldUserName.bind) && (t.originRepositoryName === oldRepositoryName.bind)
+        }.map { t => t.originUserName -> t.originRepositoryName }.update(newUserName, newRepositoryName)
 
         Repositories.filter { t =>
-          (t.parentUserName is oldUserName.bind) && (t.parentRepositoryName is oldRepositoryName.bind)
-        }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName)
+          (t.parentUserName === oldUserName.bind) && (t.parentRepositoryName === oldRepositoryName.bind)
+        }.map { t => t.originUserName -> t.originRepositoryName }.update(newUserName, newRepositoryName)
 
         PullRequests.filter { t =>
-          t.requestRepositoryName is oldRepositoryName.bind
-        }.map { t => t.requestUserName ~ t.requestRepositoryName }.update(newUserName, newRepositoryName)
+          t.requestRepositoryName === oldRepositoryName.bind
+        }.map { t => t.requestUserName -> t.requestRepositoryName }.update(newUserName, newRepositoryName)
 
         deleteRepository(oldUserName, oldRepositoryName)
 
         WebHooks      .insertAll(webHooks      .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
         Milestones    .insertAll(milestones    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
         IssueId       .insertAll(issueId       .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)
-        Issues        .insertAll(issues        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+
+        val newMilestones = Milestones.filter(_.byRepository(newUserName, newRepositoryName)).list
+        Issues.insertAll(issues.map { x => x.copy(
+          userName       = newUserName,
+          repositoryName = newRepositoryName,
+          milestoneId    = x.milestoneId.map { id =>
+            newMilestones.find(_.title == milestones.find(_.milestoneId == id).get.title).get.milestoneId
+          }
+        )} :_*)
+
         PullRequests  .insertAll(pullRequests  .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
         IssueComments .insertAll(issueComments .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
         Labels        .insertAll(labels        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
@@ -88,10 +99,10 @@ trait RepositoryService { self: AccountService =>
         val updateActivities = Activities.filter { t =>
           (t.message like s"%:${oldUserName}/${oldRepositoryName}]%") ||
           (t.message like s"%:${oldUserName}/${oldRepositoryName}#%")
-        }.map { t => t.activityId ~ t.message }.list
+        }.map { t => t.activityId -> t.message }.list
 
         updateActivities.foreach { case (activityId, message) =>
-          Activities.filter(_.activityId is activityId.bind).map(_.message).update(
+          Activities.filter(_.activityId === activityId.bind).map(_.message).update(
             message
               .replace(s"[repo:${oldUserName}/${oldRepositoryName}]"   ,s"[repo:${newUserName}/${newRepositoryName}]")
               .replace(s"[branch:${oldUserName}/${oldRepositoryName}#" ,s"[branch:${newUserName}/${newRepositoryName}#")
@@ -104,7 +115,7 @@ trait RepositoryService { self: AccountService =>
     }
   }
 
-  def deleteRepository(userName: String, repositoryName: String): Unit = {
+  def deleteRepository(userName: String, repositoryName: String)(implicit s: Session): Unit = {
     Activities    .filter(_.byRepository(userName, repositoryName)).delete
     Collaborators .filter(_.byRepository(userName, repositoryName)).delete
     IssueLabels   .filter(_.byRepository(userName, repositoryName)).delete
@@ -124,8 +135,8 @@ trait RepositoryService { self: AccountService =>
    * @param userName the user name of repository owner
    * @return the list of repository names
    */
-  def getRepositoryNamesOfUser(userName: String): List[String] =
-    Query(Repositories) filter(_.userName is userName.bind) map (_.repositoryName) list
+  def getRepositoryNamesOfUser(userName: String)(implicit s: Session): List[String] =
+    Repositories filter(_.userName === userName.bind) map (_.repositoryName) list
 
   /**
    * Returns the specified repository information.
@@ -135,11 +146,11 @@ trait RepositoryService { self: AccountService =>
    * @param baseUrl the base url of this application
    * @return the repository information
    */
-  def getRepository(userName: String, repositoryName: String, baseUrl: String): Option[RepositoryInfo] = {
-    (Query(Repositories) filter { t => t.byRepository(userName, repositoryName) } firstOption) map { repository =>
+  def getRepository(userName: String, repositoryName: String, baseUrl: String)(implicit s: Session): Option[RepositoryInfo] = {
+    (Repositories filter { t => t.byRepository(userName, repositoryName) } firstOption) map { repository =>
       // for getting issue count and pull request count
-      val issues = Query(Issues).filter { t =>
-        t.byRepository(repository.userName, repository.repositoryName) && (t.closed is false.bind)
+      val issues = Issues.filter { t =>
+        t.byRepository(repository.userName, repository.repositoryName) && (t.closed === false.bind)
       }.map(_.pullRequest).list
 
       new RepositoryInfo(
@@ -155,13 +166,24 @@ trait RepositoryService { self: AccountService =>
     }
   }
 
-  def getUserRepositories(userName: String, baseUrl: String): List[RepositoryInfo] = {
-    Query(Repositories).filter { t1 =>
-      (t1.userName is userName.bind) ||
-        (Query(Collaborators).filter { t2 => t2.byRepository(t1.userName, t1.repositoryName) && (t2.collaboratorName is userName.bind)} exists)
+  def getAllRepositories()(implicit s: Session): List[(String, String)] = {
+    Repositories.sortBy(_.lastActivityDate desc).map{ t =>
+      (t.userName, t.repositoryName)
+    }.list
+  }
+
+  def getUserRepositories(userName: String, baseUrl: String, withoutPhysicalInfo: Boolean = false)
+                         (implicit s: Session): List[RepositoryInfo] = {
+    Repositories.filter { t1 =>
+      (t1.userName === userName.bind) ||
+        (Collaborators.filter { t2 => t2.byRepository(t1.userName, t1.repositoryName) && (t2.collaboratorName === userName.bind)} exists)
     }.sortBy(_.lastActivityDate desc).list.map{ repository =>
       new RepositoryInfo(
-        JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl),
+        if(withoutPhysicalInfo){
+          new JGitUtil.RepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
+        } else {
+          JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
+        },
         repository,
         getForkedCount(
           repository.originUserName.getOrElse(repository.userName),
@@ -178,24 +200,32 @@ trait RepositoryService { self: AccountService =>
    * @param loginAccount the logged in account
    * @param baseUrl the base url of this application
    * @param repositoryUserName the repository owner (if None then returns all repositories which are visible for logged in user)
+   * @param withoutPhysicalInfo if true then the result does not include physical repository information such as commit count,
+   *                            branches and tags
    * @return the repository information which is sorted in descending order of lastActivityDate.
    */
-  def getVisibleRepositories(loginAccount: Option[Account], baseUrl: String, repositoryUserName: Option[String] = None): List[RepositoryInfo] = {
+  def getVisibleRepositories(loginAccount: Option[Account], baseUrl: String, repositoryUserName: Option[String] = None,
+                             withoutPhysicalInfo: Boolean = false)
+                            (implicit s: Session): List[RepositoryInfo] = {
     (loginAccount match {
       // for Administrators
-      case Some(x) if(x.isAdmin) => Query(Repositories)
+      case Some(x) if(x.isAdmin) => Repositories
       // for Normal Users
       case Some(x) if(!x.isAdmin) =>
-        Query(Repositories) filter { t => (t.isPrivate is false.bind) || (t.userName is x.userName) ||
-          (Query(Collaborators).filter { t2 => t2.byRepository(t.userName, t.repositoryName) && (t2.collaboratorName is x.userName.bind)} exists)
+        Repositories filter { t => (t.isPrivate === false.bind) || (t.userName === x.userName) ||
+          (Collaborators.filter { t2 => t2.byRepository(t.userName, t.repositoryName) && (t2.collaboratorName === x.userName.bind)} exists)
         }
       // for Guests
-      case None => Query(Repositories) filter(_.isPrivate is false.bind)
+      case None => Repositories filter(_.isPrivate === false.bind)
     }).filter { t =>
-      repositoryUserName.map { userName => t.userName is userName.bind } getOrElse ConstColumn.TRUE
+      repositoryUserName.map { userName => t.userName === userName.bind } getOrElse LiteralColumn(true)
     }.sortBy(_.lastActivityDate desc).list.map{ repository =>
       new RepositoryInfo(
-        JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl),
+        if(withoutPhysicalInfo){
+          new JGitUtil.RepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
+        } else {
+          JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
+        },
         repository,
         getForkedCount(
           repository.originUserName.getOrElse(repository.userName),
@@ -205,7 +235,7 @@ trait RepositoryService { self: AccountService =>
     }
   }
 
-  private def getRepositoryManagers(userName: String): Seq[String] =
+  private def getRepositoryManagers(userName: String)(implicit s: Session): Seq[String] =
     if(getAccountByUserName(userName).exists(_.isGroupAccount)){
       getGroupMembers(userName).collect { case x if(x.isManager) => x.userName }
     } else {
@@ -215,16 +245,16 @@ trait RepositoryService { self: AccountService =>
   /**
    * Updates the last activity date of the repository.
    */
-  def updateLastActivityDate(userName: String, repositoryName: String): Unit =
+  def updateLastActivityDate(userName: String, repositoryName: String)(implicit s: Session): Unit =
     Repositories.filter(_.byRepository(userName, repositoryName)).map(_.lastActivityDate).update(currentDate)
-  
+
   /**
    * Save repository options.
    */
   def saveRepositoryOptions(userName: String, repositoryName: String, 
-      description: Option[String], defaultBranch: String, isPrivate: Boolean): Unit =
+      description: Option[String], defaultBranch: String, isPrivate: Boolean)(implicit s: Session): Unit =
     Repositories.filter(_.byRepository(userName, repositoryName))
-      .map { r => r.description.? ~ r.defaultBranch ~ r.isPrivate ~ r.updatedDate }
+      .map { r => (r.description.?, r.defaultBranch, r.isPrivate, r.updatedDate) }
       .update (description, defaultBranch, isPrivate, currentDate)
 
   /**
@@ -234,8 +264,8 @@ trait RepositoryService { self: AccountService =>
    * @param repositoryName the repository name
    * @param collaboratorName the collaborator name
    */
-  def addCollaborator(userName: String, repositoryName: String, collaboratorName: String): Unit =
-    Collaborators insert(Collaborator(userName, repositoryName, collaboratorName))
+  def addCollaborator(userName: String, repositoryName: String, collaboratorName: String)(implicit s: Session): Unit =
+    Collaborators insert Collaborator(userName, repositoryName, collaboratorName)
 
   /**
    * Remove collaborator from the repository.
@@ -244,7 +274,7 @@ trait RepositoryService { self: AccountService =>
    * @param repositoryName the repository name
    * @param collaboratorName the collaborator name
    */
-  def removeCollaborator(userName: String, repositoryName: String, collaboratorName: String): Unit =
+  def removeCollaborator(userName: String, repositoryName: String, collaboratorName: String)(implicit s: Session): Unit =
     Collaborators.filter(_.byPrimaryKey(userName, repositoryName, collaboratorName)).delete
 
   /**
@@ -253,7 +283,7 @@ trait RepositoryService { self: AccountService =>
    * @param userName the user name of the repository owner
    * @param repositoryName the repository name
    */
-  def removeCollaborators(userName: String, repositoryName: String): Unit =
+  def removeCollaborators(userName: String, repositoryName: String)(implicit s: Session): Unit =
     Collaborators.filter(_.byRepository(userName, repositoryName)).delete
 
   /**
@@ -263,10 +293,10 @@ trait RepositoryService { self: AccountService =>
    * @param repositoryName the repository name
    * @return the list of collaborators name
    */
-  def getCollaborators(userName: String, repositoryName: String): List[String] =
-    Query(Collaborators).filter(_.byRepository(userName, repositoryName)).sortBy(_.collaboratorName).map(_.collaboratorName).list
+  def getCollaborators(userName: String, repositoryName: String)(implicit s: Session): List[String] =
+    Collaborators.filter(_.byRepository(userName, repositoryName)).sortBy(_.collaboratorName).map(_.collaboratorName).list
 
-  def hasWritePermission(owner: String, repository: String, loginAccount: Option[Account]): Boolean = {
+  def hasWritePermission(owner: String, repository: String, loginAccount: Option[Account])(implicit s: Session): Boolean = {
     loginAccount match {
       case Some(a) if(a.isAdmin) => true
       case Some(a) if(a.userName == owner) => true
@@ -275,17 +305,17 @@ trait RepositoryService { self: AccountService =>
     }
   }
 
-  private def getForkedCount(userName: String, repositoryName: String): Int =
+  private def getForkedCount(userName: String, repositoryName: String)(implicit s: Session): Int =
     Query(Repositories.filter { t =>
-      (t.originUserName is userName.bind) && (t.originRepositoryName is repositoryName.bind)
+      (t.originUserName === userName.bind) && (t.originRepositoryName === repositoryName.bind)
     }.length).first
 
 
-  def getForkedRepositories(userName: String, repositoryName: String): List[(String, String)] =
-    Query(Repositories).filter { t =>
-      (t.originUserName is userName.bind) && (t.originRepositoryName is repositoryName.bind)
+  def getForkedRepositories(userName: String, repositoryName: String)(implicit s: Session): List[(String, String)] =
+    Repositories.filter { t =>
+      (t.originUserName === userName.bind) && (t.originRepositoryName === repositoryName.bind)
     }
-    .sortBy(_.userName asc).map(t => t.userName ~ t.repositoryName).list
+    .sortBy(_.userName asc).map(t => t.userName -> t.repositoryName).list
 
 }
 

src/main/scala/service/RequestCache.scala

@@ -1,6 +1,7 @@
 package service
 
-import model._
+import model.{Account, Issue, Session}
+import util.Implicits.request2Session
 
 /**
  * This service is used for a view helper mainly.
@@ -10,22 +11,27 @@ import model._
  */
 trait RequestCache extends SystemSettingsService with AccountService with IssuesService {
 
-  def getIssue(userName: String, repositoryName: String, issueId: String)(implicit context: app.Context): Option[Issue] = {
+  private implicit def context2Session(implicit context: app.Context): Session =
+    request2Session(context.request)
+
+  def getIssue(userName: String, repositoryName: String, issueId: String)
+              (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): Option[Account] = {
+  def getAccountByUserName(userName: String)
+                          (implicit context: app.Context): Option[Account] = {
     context.cache(s"account.${userName}"){
       super.getAccountByUserName(userName)
     }
   }
 
-  def getAccountByMailAddress(mailAddress: String)(implicit context: app.Context): Option[Account] = {
+  def getAccountByMailAddress(mailAddress: String)
+                             (implicit context: app.Context): Option[Account] = {
     context.cache(s"account.${mailAddress}"){
       super.getAccountByMailAddress(mailAddress)
     }
   }
 }
-

src/main/scala/service/SshKeyService.scala

@@ -1,19 +1,18 @@
 package service
 
-import model._
-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
+import model.Profile._
+import profile.simple._
+import model.SshKey
 
 trait SshKeyService {
 
-  def addPublicKey(userName: String, title: String, publicKey: String): Unit =
-    SshKeys.ins insert (userName, title, publicKey)
+  def addPublicKey(userName: String, title: String, publicKey: String)(implicit s: Session): Unit =
+    SshKeys insert SshKey(userName = userName, title = title, publicKey = publicKey)
 
-  def getPublicKeys(userName: String): List[SshKey] =
-    Query(SshKeys).filter(_.userName is userName.bind).sortBy(_.sshKeyId).list
+  def getPublicKeys(userName: String)(implicit s: Session): List[SshKey] =
+    SshKeys.filter(_.userName === userName.bind).sortBy(_.sshKeyId).list
 
-  def deletePublicKey(userName: String, sshKeyId: Int): Unit =
+  def deletePublicKey(userName: String, sshKeyId: Int)(implicit s: Session): Unit =
     SshKeys filter (_.byPrimaryKey(userName, sshKeyId)) delete
 
-
 }

src/main/scala/service/SystemSettingsService.scala

@@ -1,186 +1,194 @@
-package service
-
-import util.Directory._
-import util.ControlUtil._
-import SystemSettingsService._
-import javax.servlet.http.HttpServletRequest
-
-trait SystemSettingsService {
-
-  def baseUrl(implicit request: HttpServletRequest): String = loadSystemSettings().baseUrl(request)
-
-  def saveSystemSettings(settings: SystemSettings): Unit = {
-    defining(new java.util.Properties()){ props =>
-      settings.baseUrl.foreach(x => props.setProperty(BaseURL, x.replaceFirst("/\\Z", "")))
-      props.setProperty(AllowAccountRegistration, settings.allowAccountRegistration.toString)
-      props.setProperty(Gravatar, settings.gravatar.toString)
-      props.setProperty(Notification, settings.notification.toString)
-      props.setProperty(Ssh, settings.ssh.toString)
-      settings.sshPort.foreach(x => props.setProperty(SshPort, x.toString))
-      if(settings.notification) {
-        settings.smtp.foreach { smtp =>
-          props.setProperty(SmtpHost, smtp.host)
-          smtp.port.foreach(x => props.setProperty(SmtpPort, x.toString))
-          smtp.user.foreach(props.setProperty(SmtpUser, _))
-          smtp.password.foreach(props.setProperty(SmtpPassword, _))
-          smtp.ssl.foreach(x => props.setProperty(SmtpSsl, x.toString))
-          smtp.fromAddress.foreach(props.setProperty(SmtpFromAddress, _))
-          smtp.fromName.foreach(props.setProperty(SmtpFromName, _))
-        }
-      }
-      props.setProperty(LdapAuthentication, settings.ldapAuthentication.toString)
-      if(settings.ldapAuthentication){
-        settings.ldap.map { ldap =>
-          props.setProperty(LdapHost, ldap.host)
-          ldap.port.foreach(x => props.setProperty(LdapPort, x.toString))
-          ldap.bindDN.foreach(x => props.setProperty(LdapBindDN, x))
-          ldap.bindPassword.foreach(x => props.setProperty(LdapBindPassword, x))
-          props.setProperty(LdapBaseDN, ldap.baseDN)
-          props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
-          ldap.fullNameAttribute.foreach(x => props.setProperty(LdapFullNameAttribute, x))
-          props.setProperty(LdapMailAddressAttribute, ldap.mailAttribute)
-          ldap.tls.foreach(x => props.setProperty(LdapTls, x.toString))
-          ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
-        }
-      }
-      props.store(new java.io.FileOutputStream(GitBucketConf), null)
-    }
-  }
-
-
-  def loadSystemSettings(): SystemSettings = {
-    defining(new java.util.Properties()){ props =>
-      if(GitBucketConf.exists){
-        props.load(new java.io.FileInputStream(GitBucketConf))
-      }
-      SystemSettings(
-        getOptionValue[String](props, BaseURL, None).map(x => x.replaceFirst("/\\Z", "")),
-        getValue(props, AllowAccountRegistration, false),
-        getValue(props, Gravatar, true),
-        getValue(props, Notification, false),
-        getValue(props, Ssh, false),
-        getOptionValue(props, SshPort, Some(DefaultSshPort)),
-        if(getValue(props, Notification, false)){
-          Some(Smtp(
-            getValue(props, SmtpHost, ""),
-            getOptionValue(props, SmtpPort, Some(DefaultSmtpPort)),
-            getOptionValue(props, SmtpUser, None),
-            getOptionValue(props, SmtpPassword, None),
-            getOptionValue[Boolean](props, SmtpSsl, None),
-            getOptionValue(props, SmtpFromAddress, None),
-            getOptionValue(props, SmtpFromName, None)))
-        } else {
-          None
-        },
-        getValue(props, LdapAuthentication, false),
-        if(getValue(props, LdapAuthentication, false)){
-          Some(Ldap(
-            getValue(props, LdapHost, ""),
-            getOptionValue(props, LdapPort, Some(DefaultLdapPort)),
-            getOptionValue(props, LdapBindDN, None),
-            getOptionValue(props, LdapBindPassword, None),
-            getValue(props, LdapBaseDN, ""),
-            getValue(props, LdapUserNameAttribute, ""),
-            getOptionValue(props, LdapFullNameAttribute, None),
-            getValue(props, LdapMailAddressAttribute, ""),
-            getOptionValue[Boolean](props, LdapTls, None),
-            getOptionValue(props, LdapKeystore, None)))
-        } else {
-          None
-        }
-      )
-    }
-  }
-
-}
-
-object SystemSettingsService {
-  import scala.reflect.ClassTag
-
-  case class SystemSettings(
-    baseUrl: Option[String],
-    allowAccountRegistration: Boolean,
-    gravatar: Boolean,
-    notification: Boolean,
-    ssh: Boolean,
-    sshPort: Option[Int],
-    smtp: Option[Smtp],
-    ldapAuthentication: Boolean,
-    ldap: Option[Ldap]){
-    def baseUrl(request: HttpServletRequest): String = baseUrl.getOrElse {
-      defining(request.getRequestURL.toString){ url =>
-        url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length))
-      }
-    }.replaceFirst("/$", "")
-  }
-
-  case class Ldap(
-    host: String,
-    port: Option[Int],
-    bindDN: Option[String],
-    bindPassword: Option[String],
-    baseDN: String,
-    userNameAttribute: String,
-    fullNameAttribute: Option[String],
-    mailAttribute: String,
-    tls: Option[Boolean],
-    keystore: Option[String])
-
-  case class Smtp(
-    host: String,
-    port: Option[Int],
-    user: Option[String],
-    password: Option[String],
-    ssl: Option[Boolean],
-    fromAddress: Option[String],
-    fromName: Option[String])
-
-  val DefaultSshPort = 29418
-  val DefaultSmtpPort = 25
-  val DefaultLdapPort = 389
-
-  private val BaseURL = "base_url"
-  private val AllowAccountRegistration = "allow_account_registration"
-  private val Gravatar = "gravatar"
-  private val Notification = "notification"
-  private val Ssh = "ssh"
-  private val SshPort = "ssh.port"
-  private val SmtpHost = "smtp.host"
-  private val SmtpPort = "smtp.port"
-  private val SmtpUser = "smtp.user"
-  private val SmtpPassword = "smtp.password"
-  private val SmtpSsl = "smtp.ssl"
-  private val SmtpFromAddress = "smtp.from_address"
-  private val SmtpFromName = "smtp.from_name"
-  private val LdapAuthentication = "ldap_authentication"
-  private val LdapHost = "ldap.host"
-  private val LdapPort = "ldap.port"
-  private val LdapBindDN = "ldap.bindDN"
-  private val LdapBindPassword = "ldap.bind_password"
-  private val LdapBaseDN = "ldap.baseDN"
-  private val LdapUserNameAttribute = "ldap.username_attribute"
-  private val LdapFullNameAttribute = "ldap.fullname_attribute"
-  private val LdapMailAddressAttribute = "ldap.mail_attribute"
-  private val LdapTls = "ldap.tls"
-  private val LdapKeystore = "ldap.keystore"
-
-  private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A =
-    defining(props.getProperty(key)){ value =>
-      if(value == null || value.isEmpty) default
-      else convertType(value).asInstanceOf[A]
-    }
-
-  private def getOptionValue[A: ClassTag](props: java.util.Properties, key: String, default: Option[A]): Option[A] =
-    defining(props.getProperty(key)){ value =>
-      if(value == null || value.isEmpty) default
-      else Some(convertType(value)).asInstanceOf[Option[A]]
-    }
-
-  private def convertType[A: ClassTag](value: String) =
-    defining(implicitly[ClassTag[A]].runtimeClass){ c =>
-      if(c == classOf[Boolean])  value.toBoolean
-      else if(c == classOf[Int]) value.toInt
-      else value
-    }
-
-}
+package service
+
+import util.Directory._
+import util.ControlUtil._
+import SystemSettingsService._
+import javax.servlet.http.HttpServletRequest
+
+trait SystemSettingsService {
+
+  def baseUrl(implicit request: HttpServletRequest): String = loadSystemSettings().baseUrl(request)
+
+  def saveSystemSettings(settings: SystemSettings): Unit = {
+    defining(new java.util.Properties()){ props =>
+      settings.baseUrl.foreach(x => props.setProperty(BaseURL, x.replaceFirst("/\\Z", "")))
+      props.setProperty(AllowAccountRegistration, settings.allowAccountRegistration.toString)
+      props.setProperty(Gravatar, settings.gravatar.toString)
+      props.setProperty(Notification, settings.notification.toString)
+      props.setProperty(Ssh, settings.ssh.toString)
+      settings.sshPort.foreach(x => props.setProperty(SshPort, x.toString))
+      if(settings.notification) {
+        settings.smtp.foreach { smtp =>
+          props.setProperty(SmtpHost, smtp.host)
+          smtp.port.foreach(x => props.setProperty(SmtpPort, x.toString))
+          smtp.user.foreach(props.setProperty(SmtpUser, _))
+          smtp.password.foreach(props.setProperty(SmtpPassword, _))
+          smtp.ssl.foreach(x => props.setProperty(SmtpSsl, x.toString))
+          smtp.fromAddress.foreach(props.setProperty(SmtpFromAddress, _))
+          smtp.fromName.foreach(props.setProperty(SmtpFromName, _))
+        }
+      }
+      props.setProperty(LdapAuthentication, settings.ldapAuthentication.toString)
+      if(settings.ldapAuthentication){
+        settings.ldap.map { ldap =>
+          props.setProperty(LdapHost, ldap.host)
+          ldap.port.foreach(x => props.setProperty(LdapPort, x.toString))
+          ldap.bindDN.foreach(x => props.setProperty(LdapBindDN, x))
+          ldap.bindPassword.foreach(x => props.setProperty(LdapBindPassword, x))
+          props.setProperty(LdapBaseDN, ldap.baseDN)
+          props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
+          ldap.additionalFilterCondition.foreach(x => props.setProperty(LdapAdditionalFilterCondition, x))
+          ldap.fullNameAttribute.foreach(x => props.setProperty(LdapFullNameAttribute, x))
+          ldap.mailAttribute.foreach(x => props.setProperty(LdapMailAddressAttribute, x.toString))
+          ldap.tls.foreach(x => props.setProperty(LdapTls, x.toString))
+          ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
+        }
+      }
+      using(new java.io.FileOutputStream(GitBucketConf)){ out =>
+        props.store(out, null)
+      }
+    }
+  }
+
+
+  def loadSystemSettings(): SystemSettings = {
+    defining(new java.util.Properties()){ props =>
+      if(GitBucketConf.exists){
+        using(new java.io.FileInputStream(GitBucketConf)){ in =>
+          props.load(in)
+        }
+      }
+      SystemSettings(
+        getOptionValue[String](props, BaseURL, None).map(x => x.replaceFirst("/\\Z", "")),
+        getValue(props, AllowAccountRegistration, false),
+        getValue(props, Gravatar, true),
+        getValue(props, Notification, false),
+        getValue(props, Ssh, false),
+        getOptionValue(props, SshPort, Some(DefaultSshPort)),
+        if(getValue(props, Notification, false)){
+          Some(Smtp(
+            getValue(props, SmtpHost, ""),
+            getOptionValue(props, SmtpPort, Some(DefaultSmtpPort)),
+            getOptionValue(props, SmtpUser, None),
+            getOptionValue(props, SmtpPassword, None),
+            getOptionValue[Boolean](props, SmtpSsl, None),
+            getOptionValue(props, SmtpFromAddress, None),
+            getOptionValue(props, SmtpFromName, None)))
+        } else {
+          None
+        },
+        getValue(props, LdapAuthentication, false),
+        if(getValue(props, LdapAuthentication, false)){
+          Some(Ldap(
+            getValue(props, LdapHost, ""),
+            getOptionValue(props, LdapPort, Some(DefaultLdapPort)),
+            getOptionValue(props, LdapBindDN, None),
+            getOptionValue(props, LdapBindPassword, None),
+            getValue(props, LdapBaseDN, ""),
+            getValue(props, LdapUserNameAttribute, ""),
+            getOptionValue(props, LdapAdditionalFilterCondition, None),
+            getOptionValue(props, LdapFullNameAttribute, None),
+            getOptionValue(props, LdapMailAddressAttribute, None),
+            getOptionValue[Boolean](props, LdapTls, None),
+            getOptionValue(props, LdapKeystore, None)))
+        } else {
+          None
+        }
+      )
+    }
+  }
+
+}
+
+object SystemSettingsService {
+  import scala.reflect.ClassTag
+
+  case class SystemSettings(
+    baseUrl: Option[String],
+    allowAccountRegistration: Boolean,
+    gravatar: Boolean,
+    notification: Boolean,
+    ssh: Boolean,
+    sshPort: Option[Int],
+    smtp: Option[Smtp],
+    ldapAuthentication: Boolean,
+    ldap: Option[Ldap]){
+    def baseUrl(request: HttpServletRequest): String = baseUrl.getOrElse {
+      defining(request.getRequestURL.toString){ url =>
+        url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length))
+      }
+    }.stripSuffix("/")
+  }
+
+  case class Ldap(
+    host: String,
+    port: Option[Int],
+    bindDN: Option[String],
+    bindPassword: Option[String],
+    baseDN: String,
+    userNameAttribute: String,
+    additionalFilterCondition: Option[String],
+    fullNameAttribute: Option[String],
+    mailAttribute: Option[String],
+    tls: Option[Boolean],
+    keystore: Option[String])
+
+  case class Smtp(
+    host: String,
+    port: Option[Int],
+    user: Option[String],
+    password: Option[String],
+    ssl: Option[Boolean],
+    fromAddress: Option[String],
+    fromName: Option[String])
+
+  val DefaultSshPort = 29418
+  val DefaultSmtpPort = 25
+  val DefaultLdapPort = 389
+
+  private val BaseURL = "base_url"
+  private val AllowAccountRegistration = "allow_account_registration"
+  private val Gravatar = "gravatar"
+  private val Notification = "notification"
+  private val Ssh = "ssh"
+  private val SshPort = "ssh.port"
+  private val SmtpHost = "smtp.host"
+  private val SmtpPort = "smtp.port"
+  private val SmtpUser = "smtp.user"
+  private val SmtpPassword = "smtp.password"
+  private val SmtpSsl = "smtp.ssl"
+  private val SmtpFromAddress = "smtp.from_address"
+  private val SmtpFromName = "smtp.from_name"
+  private val LdapAuthentication = "ldap_authentication"
+  private val LdapHost = "ldap.host"
+  private val LdapPort = "ldap.port"
+  private val LdapBindDN = "ldap.bindDN"
+  private val LdapBindPassword = "ldap.bind_password"
+  private val LdapBaseDN = "ldap.baseDN"
+  private val LdapUserNameAttribute = "ldap.username_attribute"
+  private val LdapAdditionalFilterCondition = "ldap.additional_filter_condition"
+  private val LdapFullNameAttribute = "ldap.fullname_attribute"
+  private val LdapMailAddressAttribute = "ldap.mail_attribute"
+  private val LdapTls = "ldap.tls"
+  private val LdapKeystore = "ldap.keystore"
+
+  private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A =
+    defining(props.getProperty(key)){ value =>
+      if(value == null || value.isEmpty) default
+      else convertType(value).asInstanceOf[A]
+    }
+
+  private def getOptionValue[A: ClassTag](props: java.util.Properties, key: String, default: Option[A]): Option[A] =
+    defining(props.getProperty(key)){ value =>
+      if(value == null || value.isEmpty) default
+      else Some(convertType(value)).asInstanceOf[Option[A]]
+    }
+
+  private def convertType[A: ClassTag](value: String) =
+    defining(implicitly[ClassTag[A]].runtimeClass){ c =>
+      if(c == classOf[Boolean])  value.toBoolean
+      else if(c == classOf[Int]) value.toInt
+      else value
+    }
+
+}

src/main/scala/service/WebHookService.scala

@@ -1,9 +1,8 @@
 package service
 
-import scala.slick.driver.H2Driver.simple._
-import Database.threadLocalSession
-
-import model._
+import model.Profile._
+import profile.simple._
+import model.{WebHook, Account}
 import org.slf4j.LoggerFactory
 import service.RepositoryService.RepositoryInfo
 import util.JGitUtil
@@ -12,7 +11,6 @@ import util.JGitUtil.CommitInfo
 import org.eclipse.jgit.api.Git
 import org.apache.http.message.BasicNameValuePair
 import org.apache.http.client.entity.UrlEncodedFormEntity
-import org.apache.http.protocol.HTTP
 import org.apache.http.NameValuePair
 
 trait WebHookService {
@@ -20,14 +18,14 @@ trait WebHookService {
 
   private val logger = LoggerFactory.getLogger(classOf[WebHookService])
 
-  def getWebHookURLs(owner: String, repository: String): List[WebHook] =
-    Query(WebHooks).filter(_.byRepository(owner, repository)).sortBy(_.url).list
+  def getWebHookURLs(owner: String, repository: String)(implicit s: Session): List[WebHook] =
+    WebHooks.filter(_.byRepository(owner, repository)).sortBy(_.url).list
 
-  def addWebHookURL(owner: String, repository: String, url :String): Unit =
-    WebHooks.insert(WebHook(owner, repository, url))
+  def addWebHookURL(owner: String, repository: String, url :String)(implicit s: Session): Unit =
+    WebHooks insert WebHook(owner, repository, url)
 
-  def deleteWebHookURL(owner: String, repository: String, url :String): Unit =
-    Query(WebHooks).filter(_.byPrimaryKey(owner, repository, url)).delete
+  def deleteWebHookURL(owner: String, repository: String, url :String)(implicit s: Session): Unit =
+    WebHooks.filter(_.byPrimaryKey(owner, repository, url)).delete
 
   def callWebHook(owner: String, repository: String, webHookURLs: List[WebHook], payload: WebHookPayload): Unit = {
     import org.json4s._
@@ -46,7 +44,7 @@ trait WebHookService {
       val httpClient = HttpClientBuilder.create.build
 
       webHookURLs.foreach { webHookUrl =>
-        val f = future {
+        val f = Future {
           logger.debug(s"start web hook invocation for ${webHookUrl}")
           val httpPost = new HttpPost(webHookUrl.url)
 
@@ -87,23 +85,23 @@ object WebHookService {
         refName,
         commits.map { commit =>
           val diffs = JGitUtil.getDiffs(git, commit.id, false)
-          val commitUrl = repositoryInfo.httpUrl.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/commit/" + commit.id
+          val commitUrl = repositoryInfo.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/commit/" + commit.id
 
           WebHookCommit(
             id        = commit.id,
             message   = commit.fullMessage,
-            timestamp = commit.time.toString,
+            timestamp = commit.commitTime.toString,
             url       = commitUrl,
             added     = diffs._1.collect { case x if(x.changeType == DiffEntry.ChangeType.ADD)    => x.newPath },
             removed   = diffs._1.collect { case x if(x.changeType == DiffEntry.ChangeType.DELETE) => x.oldPath },
             modified  = diffs._1.collect { case x if(x.changeType != DiffEntry.ChangeType.ADD &&
               x.changeType != DiffEntry.ChangeType.DELETE) => x.newPath },
             author    = WebHookUser(
-              name  = commit.committer,
-              email = commit.mailAddress
+              name  = commit.committerName,
+              email = commit.committerEmailAddress
             )
           )
-        }.toList,
+        },
         WebHookRepository(
           name        = repositoryInfo.name,
           url         = repositoryInfo.httpUrl,

src/main/scala/service/WikiService.scala

@@ -1,282 +1,281 @@
-package service
-
-import java.util.Date
-import org.eclipse.jgit.api.Git
-import org.apache.commons.io.FileUtils
-import util._
-import _root_.util.ControlUtil._
-import org.eclipse.jgit.treewalk.{TreeWalk, CanonicalTreeParser}
-import org.eclipse.jgit.lib._
-import org.eclipse.jgit.dircache.{DirCache, DirCacheEntry}
-import org.eclipse.jgit.revwalk.RevWalk
-import org.eclipse.jgit.diff.{DiffEntry, DiffFormatter}
-import java.io.ByteArrayInputStream
-import org.eclipse.jgit.patch._
-import org.eclipse.jgit.api.errors.PatchFormatException
-import scala.collection.JavaConverters._
-import scala.Some
-import service.RepositoryService.RepositoryInfo
-
-
-object WikiService {
-  
-  /**
-   * The model for wiki page.
-   * 
-   * @param name the page name
-   * @param content the page content
-   * @param committer the last committer
-   * @param time the last modified time
-   * @param id the latest commit id
-   */
-  case class WikiPageInfo(name: String, content: String, committer: String, time: Date, id: String)
-  
-  /**
-   * The model for wiki page history.
-   * 
-   * @param name the page name
-   * @param committer the committer the committer
-   * @param message the commit message
-   * @param date the commit date
-   */
-  case class WikiPageHistoryInfo(name: String, committer: String, message: String, date: Date)
-
-  def httpUrl(repository: RepositoryInfo) = repository.httpUrl.replaceFirst("\\.git\\Z", ".wiki.git")
-
-  def sshUrl(repository: RepositoryInfo, settings: SystemSettingsService.SystemSettings, userName: String) =
-    repository.sshUrl(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), userName).replaceFirst("\\.git\\Z", ".wiki.git")
-}
-
-trait WikiService {
-  import WikiService._
-
-  def createWikiRepository(loginAccount: model.Account, owner: String, repository: String): Unit =
-    LockUtil.lock(s"${owner}/${repository}/wiki"){
-      defining(Directory.getWikiRepositoryDir(owner, repository)){ dir =>
-        if(!dir.exists){
-          JGitUtil.initRepository(dir)
-          saveWikiPage(owner, repository, "Home", "Home", s"Welcome to the ${repository} wiki!!", loginAccount, "Initial Commit", None)
-        }
-      }
-    }
-
-  /**
-   * Returns the wiki page.
-   */
-  def getWikiPage(owner: String, repository: String, pageName: String): Option[WikiPageInfo] = {
-    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      if(!JGitUtil.isEmpty(git)){
-        JGitUtil.getFileList(git, "master", ".").find(_.name == pageName + ".md").map { file =>
-          WikiPageInfo(file.name, StringUtil.convertFromByteArray(git.getRepository.open(file.id).getBytes),
-                       file.committer, file.time, file.commitId)
-        }
-      } else None
-    }
-  }
-
-  /**
-   * Returns the content of the specified file.
-   */
-  def getFileContent(owner: String, repository: String, path: String): Option[Array[Byte]] =
-    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      if(!JGitUtil.isEmpty(git)){
-        val index = path.lastIndexOf('/')
-        val parentPath = if(index < 0) "."  else path.substring(0, index)
-        val fileName   = if(index < 0) path else path.substring(index + 1)
-
-        JGitUtil.getFileList(git, "master", parentPath).find(_.name == fileName).map { file =>
-          git.getRepository.open(file.id).getBytes
-        }
-      } else None
-    }
-
-  /**
-   * Returns the list of wiki page names.
-   */
-  def getWikiPageList(owner: String, repository: String): List[String] = {
-    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      JGitUtil.getFileList(git, "master", ".")
-        .filter(_.name.endsWith(".md"))
-        .map(_.name.replaceFirst("\\.md$", ""))
-        .sortBy(x => x)
-    }
-  }
-
-  /**
-   * Reverts specified changes.
-   */
-  def revertWikiPage(owner: String, repository: String, from: String, to: String,
-                     committer: model.Account, pageName: Option[String]): Boolean = {
-
-    case class RevertInfo(operation: String, filePath: String, source: String)
-
-    try {
-      LockUtil.lock(s"${owner}/${repository}/wiki"){
-        using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-
-          val reader = git.getRepository.newObjectReader
-          val oldTreeIter = new CanonicalTreeParser
-          oldTreeIter.reset(reader, git.getRepository.resolve(from + "^{tree}"))
-
-          val newTreeIter = new CanonicalTreeParser
-          newTreeIter.reset(reader, git.getRepository.resolve(to + "^{tree}"))
-
-          val diffs = git.diff.setNewTree(oldTreeIter).setOldTree(newTreeIter).call.asScala.filter { diff =>
-            pageName match {
-              case Some(x) => diff.getNewPath == x + ".md"
-              case None    => true
-            }
-          }
-
-          val patch = using(new java.io.ByteArrayOutputStream()){ out =>
-            val formatter = new DiffFormatter(out)
-            formatter.setRepository(git.getRepository)
-            formatter.format(diffs.asJava)
-            new String(out.toByteArray, "UTF-8")
-          }
-
-          val p = new Patch()
-          p.parse(new ByteArrayInputStream(patch.getBytes("UTF-8")))
-          if(!p.getErrors.isEmpty){
-            throw new PatchFormatException(p.getErrors())
-          }
-          val revertInfo = (p.getFiles.asScala.map { fh =>
-            fh.getChangeType match {
-              case DiffEntry.ChangeType.MODIFY => {
-                val source = getWikiPage(owner, repository, fh.getNewPath.replaceFirst("\\.md$", "")).map(_.content).getOrElse("")
-                val applied = PatchUtil.apply(source, patch, fh)
-                if(applied != null){
-                  Seq(RevertInfo("ADD", fh.getNewPath, applied))
-                } else Nil
-              }
-              case DiffEntry.ChangeType.ADD => {
-                val applied = PatchUtil.apply("", patch, fh)
-                if(applied != null){
-                  Seq(RevertInfo("ADD", fh.getNewPath, applied))
-                } else Nil
-              }
-              case DiffEntry.ChangeType.DELETE => {
-                Seq(RevertInfo("DELETE", fh.getNewPath, ""))
-              }
-              case DiffEntry.ChangeType.RENAME => {
-                val applied = PatchUtil.apply("", patch, fh)
-                if(applied != null){
-                  Seq(RevertInfo("DELETE", fh.getOldPath, ""), RevertInfo("ADD", fh.getNewPath, applied))
-                } else {
-                  Seq(RevertInfo("DELETE", fh.getOldPath, ""))
-                }
-              }
-              case _ => Nil
-            }
-          }).flatten
-
-          if(revertInfo.nonEmpty){
-            val builder  = DirCache.newInCore.builder()
-            val inserter = git.getRepository.newObjectInserter()
-            val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
-
-            JGitUtil.processTree(git, headId){ (path, tree) =>
-              if(revertInfo.find(x => x.filePath == path).isEmpty){
-                builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-              }
-            }
-
-            revertInfo.filter(_.operation == "ADD").foreach { x =>
-              builder.add(JGitUtil.createDirCacheEntry(x.filePath, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, x.source.getBytes("UTF-8"))))
-            }
-            builder.finish()
-
-            JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer.fullName, committer.mailAddress,
-              pageName match {
-                case Some(x) => s"Revert ${from} ... ${to} on ${x}"
-                case None    => s"Revert ${from} ... ${to}"
-              })
-          }
-        }
-      }
-      true
-    } catch {
-      case e: Exception => {
-        e.printStackTrace()
-        false
-      }
-    }
-  }
-
-  /**
-   * Save the wiki page.
-   */
-  def saveWikiPage(owner: String, repository: String, currentPageName: String, newPageName: String,
-      content: String, committer: model.Account, message: String, currentId: Option[String]): Option[String] = {
-    LockUtil.lock(s"${owner}/${repository}/wiki"){
-      using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-        val builder  = DirCache.newInCore.builder()
-        val inserter = git.getRepository.newObjectInserter()
-        val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
-        var created  = true
-        var updated  = false
-        var removed  = false
-
-        if(headId != null){
-          JGitUtil.processTree(git, headId){ (path, tree) =>
-            if(path == currentPageName + ".md" && currentPageName != newPageName){
-              removed = true
-            } else if(path != newPageName + ".md"){
-              builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-            } else {
-              created = false
-              updated = JGitUtil.getContentFromId(git, tree.getEntryObjectId, true).map(new String(_, "UTF-8") != content).getOrElse(false)
-            }
-          }
-        }
-
-        if(created || updated || removed){
-          builder.add(JGitUtil.createDirCacheEntry(newPageName + ".md", FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8"))))
-          builder.finish()
-          val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer.fullName, committer.mailAddress,
-            if(message.trim.length == 0) {
-              if(removed){
-                s"Rename ${currentPageName} to ${newPageName}"
-              } else if(created){
-                s"Created ${newPageName}"
-              } else {
-                s"Updated ${newPageName}"
-              }
-            } else {
-              message
-            })
-
-          Some(newHeadId.getName)
-        } else None
-      }
-    }
-  }
-
-  /**
-   * Delete the wiki page.
-   */
-  def deleteWikiPage(owner: String, repository: String, pageName: String,
-                     committer: String, mailAddress: String, message: String): Unit = {
-    LockUtil.lock(s"${owner}/${repository}/wiki"){
-      using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-        val builder  = DirCache.newInCore.builder()
-        val inserter = git.getRepository.newObjectInserter()
-        val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
-        var removed  = false
-
-        JGitUtil.processTree(git, headId){ (path, tree) =>
-          if(path != pageName + ".md"){
-            builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-          } else {
-            removed = true
-          }
-        }
-        if(removed){
-          builder.finish()
-          JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer, mailAddress, message)
-        }
-      }
-    }
-  }
-
-}
+package service
+
+import java.util.Date
+import org.eclipse.jgit.api.Git
+import util._
+import _root_.util.ControlUtil._
+import org.eclipse.jgit.treewalk.CanonicalTreeParser
+import org.eclipse.jgit.lib._
+import org.eclipse.jgit.dircache.DirCache
+import org.eclipse.jgit.diff.{DiffEntry, DiffFormatter}
+import java.io.ByteArrayInputStream
+import org.eclipse.jgit.patch._
+import org.eclipse.jgit.api.errors.PatchFormatException
+import scala.collection.JavaConverters._
+import service.RepositoryService.RepositoryInfo
+
+object WikiService {
+  
+  /**
+   * The model for wiki page.
+   * 
+   * @param name the page name
+   * @param content the page content
+   * @param committer the last committer
+   * @param time the last modified time
+   * @param id the latest commit id
+   */
+  case class WikiPageInfo(name: String, content: String, committer: String, time: Date, id: String)
+  
+  /**
+   * The model for wiki page history.
+   * 
+   * @param name the page name
+   * @param committer the committer the committer
+   * @param message the commit message
+   * @param date the commit date
+   */
+  case class WikiPageHistoryInfo(name: String, committer: String, message: String, date: Date)
+
+  def httpUrl(repository: RepositoryInfo) = repository.httpUrl.replaceFirst("\\.git\\Z", ".wiki.git")
+
+  def sshUrl(repository: RepositoryInfo, settings: SystemSettingsService.SystemSettings, userName: String) =
+    repository.sshUrl(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), userName).replaceFirst("\\.git\\Z", ".wiki.git")
+}
+
+trait WikiService {
+  import WikiService._
+
+  def createWikiRepository(loginAccount: model.Account, owner: String, repository: String): Unit =
+    LockUtil.lock(s"${owner}/${repository}/wiki"){
+      defining(Directory.getWikiRepositoryDir(owner, repository)){ dir =>
+        if(!dir.exists){
+          JGitUtil.initRepository(dir)
+          saveWikiPage(owner, repository, "Home", "Home", s"Welcome to the ${repository} wiki!!", loginAccount, "Initial Commit", None)
+        }
+      }
+    }
+
+  /**
+   * Returns the wiki page.
+   */
+  def getWikiPage(owner: String, repository: String, pageName: String): Option[WikiPageInfo] = {
+    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+      if(!JGitUtil.isEmpty(git)){
+        JGitUtil.getFileList(git, "master", ".").find(_.name == pageName + ".md").map { file =>
+          WikiPageInfo(file.name, StringUtil.convertFromByteArray(git.getRepository.open(file.id).getBytes),
+                       file.author, file.time, file.commitId)
+        }
+      } else None
+    }
+  }
+
+  /**
+   * Returns the content of the specified file.
+   */
+  def getFileContent(owner: String, repository: String, path: String): Option[Array[Byte]] =
+    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+      if(!JGitUtil.isEmpty(git)){
+        val index = path.lastIndexOf('/')
+        val parentPath = if(index < 0) "."  else path.substring(0, index)
+        val fileName   = if(index < 0) path else path.substring(index + 1)
+
+        JGitUtil.getFileList(git, "master", parentPath).find(_.name == fileName).map { file =>
+          git.getRepository.open(file.id).getBytes
+        }
+      } else None
+    }
+
+  /**
+   * Returns the list of wiki page names.
+   */
+  def getWikiPageList(owner: String, repository: String): List[String] = {
+    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+      JGitUtil.getFileList(git, "master", ".")
+        .filter(_.name.endsWith(".md"))
+        .map(_.name.stripSuffix(".md"))
+        .sortBy(x => x)
+    }
+  }
+
+  /**
+   * Reverts specified changes.
+   */
+  def revertWikiPage(owner: String, repository: String, from: String, to: String,
+                     committer: model.Account, pageName: Option[String]): Boolean = {
+
+    case class RevertInfo(operation: String, filePath: String, source: String)
+
+    try {
+      LockUtil.lock(s"${owner}/${repository}/wiki"){
+        using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+
+          val reader = git.getRepository.newObjectReader
+          val oldTreeIter = new CanonicalTreeParser
+          oldTreeIter.reset(reader, git.getRepository.resolve(from + "^{tree}"))
+
+          val newTreeIter = new CanonicalTreeParser
+          newTreeIter.reset(reader, git.getRepository.resolve(to + "^{tree}"))
+
+          val diffs = git.diff.setNewTree(oldTreeIter).setOldTree(newTreeIter).call.asScala.filter { diff =>
+            pageName match {
+              case Some(x) => diff.getNewPath == x + ".md"
+              case None    => true
+            }
+          }
+
+          val patch = using(new java.io.ByteArrayOutputStream()){ out =>
+            val formatter = new DiffFormatter(out)
+            formatter.setRepository(git.getRepository)
+            formatter.format(diffs.asJava)
+            new String(out.toByteArray, "UTF-8")
+          }
+
+          val p = new Patch()
+          p.parse(new ByteArrayInputStream(patch.getBytes("UTF-8")))
+          if(!p.getErrors.isEmpty){
+            throw new PatchFormatException(p.getErrors())
+          }
+          val revertInfo = (p.getFiles.asScala.map { fh =>
+            fh.getChangeType match {
+              case DiffEntry.ChangeType.MODIFY => {
+                val source = getWikiPage(owner, repository, fh.getNewPath.stripSuffix(".md")).map(_.content).getOrElse("")
+                val applied = PatchUtil.apply(source, patch, fh)
+                if(applied != null){
+                  Seq(RevertInfo("ADD", fh.getNewPath, applied))
+                } else Nil
+              }
+              case DiffEntry.ChangeType.ADD => {
+                val applied = PatchUtil.apply("", patch, fh)
+                if(applied != null){
+                  Seq(RevertInfo("ADD", fh.getNewPath, applied))
+                } else Nil
+              }
+              case DiffEntry.ChangeType.DELETE => {
+                Seq(RevertInfo("DELETE", fh.getNewPath, ""))
+              }
+              case DiffEntry.ChangeType.RENAME => {
+                val applied = PatchUtil.apply("", patch, fh)
+                if(applied != null){
+                  Seq(RevertInfo("DELETE", fh.getOldPath, ""), RevertInfo("ADD", fh.getNewPath, applied))
+                } else {
+                  Seq(RevertInfo("DELETE", fh.getOldPath, ""))
+                }
+              }
+              case _ => Nil
+            }
+          }).flatten
+
+          if(revertInfo.nonEmpty){
+            val builder  = DirCache.newInCore.builder()
+            val inserter = git.getRepository.newObjectInserter()
+            val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
+
+            JGitUtil.processTree(git, headId){ (path, tree) =>
+              if(revertInfo.find(x => x.filePath == path).isEmpty){
+                builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+              }
+            }
+
+            revertInfo.filter(_.operation == "ADD").foreach { x =>
+              builder.add(JGitUtil.createDirCacheEntry(x.filePath, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, x.source.getBytes("UTF-8"))))
+            }
+            builder.finish()
+
+            JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
+              Constants.HEAD, committer.fullName, committer.mailAddress,
+              pageName match {
+                case Some(x) => s"Revert ${from} ... ${to} on ${x}"
+                case None    => s"Revert ${from} ... ${to}"
+              })
+          }
+        }
+      }
+      true
+    } catch {
+      case e: Exception => {
+        e.printStackTrace()
+        false
+      }
+    }
+  }
+
+  /**
+   * Save the wiki page.
+   */
+  def saveWikiPage(owner: String, repository: String, currentPageName: String, newPageName: String,
+      content: String, committer: model.Account, message: String, currentId: Option[String]): Option[String] = {
+    LockUtil.lock(s"${owner}/${repository}/wiki"){
+      using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+        val builder  = DirCache.newInCore.builder()
+        val inserter = git.getRepository.newObjectInserter()
+        val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
+        var created  = true
+        var updated  = false
+        var removed  = false
+
+        if(headId != null){
+          JGitUtil.processTree(git, headId){ (path, tree) =>
+            if(path == currentPageName + ".md" && currentPageName != newPageName){
+              removed = true
+            } else if(path != newPageName + ".md"){
+              builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+            } else {
+              created = false
+              updated = JGitUtil.getContentFromId(git, tree.getEntryObjectId, true).map(new String(_, "UTF-8") != content).getOrElse(false)
+            }
+          }
+        }
+
+        if(created || updated || removed){
+          builder.add(JGitUtil.createDirCacheEntry(newPageName + ".md", FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8"))))
+          builder.finish()
+          val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
+            Constants.HEAD, committer.fullName, committer.mailAddress,
+            if(message.trim.length == 0) {
+              if(removed){
+                s"Rename ${currentPageName} to ${newPageName}"
+              } else if(created){
+                s"Created ${newPageName}"
+              } else {
+                s"Updated ${newPageName}"
+              }
+            } else {
+              message
+            })
+
+          Some(newHeadId.getName)
+        } else None
+      }
+    }
+  }
+
+  /**
+   * Delete the wiki page.
+   */
+  def deleteWikiPage(owner: String, repository: String, pageName: String,
+                     committer: String, mailAddress: String, message: String): Unit = {
+    LockUtil.lock(s"${owner}/${repository}/wiki"){
+      using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+        val builder  = DirCache.newInCore.builder()
+        val inserter = git.getRepository.newObjectInserter()
+        val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
+        var removed  = false
+
+        JGitUtil.processTree(git, headId){ (path, tree) =>
+          if(path != pageName + ".md"){
+            builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+          } else {
+            removed = true
+          }
+        }
+        if(removed){
+          builder.finish()
+          JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
+            Constants.HEAD, committer, mailAddress, message)
+        }
+      }
+    }
+  }
+
+}

src/main/scala/servlet/AutoUpdateListener.scala

@@ -1,193 +1,249 @@
-package servlet
-
-import java.io.File
-import java.sql.{DriverManager, Connection}
-import org.apache.commons.io.FileUtils
-import javax.servlet.{ServletContext, ServletContextListener, ServletContextEvent}
-import org.apache.commons.io.IOUtils
-import org.slf4j.LoggerFactory
-import util.Directory._
-import util.ControlUtil._
-import org.eclipse.jgit.api.Git
-import util.Directory
-
-object AutoUpdate {
-  
-  /**
-   * Version of GitBucket
-   * 
-   * @param majorVersion the major version
-   * @param minorVersion the minor version
-   */
-  case class Version(majorVersion: Int, minorVersion: Int){
-    
-    private val logger = LoggerFactory.getLogger(classOf[servlet.AutoUpdate.Version])
-    
-    /**
-     * Execute update/MAJOR_MINOR.sql to update schema to this version.
-     * If corresponding SQL file does not exist, this method do nothing.
-     */
-    def update(conn: Connection): Unit = {
-      val sqlPath = s"update/${majorVersion}_${minorVersion}.sql"
-
-      using(Thread.currentThread.getContextClassLoader.getResourceAsStream(sqlPath)){ in =>
-        if(in != null){
-          val sql = IOUtils.toString(in, "UTF-8")
-          using(conn.createStatement()){ stmt =>
-            logger.debug(sqlPath + "=" + sql)
-            stmt.executeUpdate(sql)
-          }
-        }
-      }
-    }
-    
-    /**
-     * MAJOR.MINOR
-     */
-    val versionString = s"${majorVersion}.${minorVersion}"
-  }
-
-  /**
-   * The history of versions. A head of this sequence is the current BitBucket version.
-   */
-  val versions = Seq(
-    new Version(2, 0){
-      override def update(conn: Connection): Unit = {
-        import eu.medsea.mimeutil.{MimeUtil2, MimeType}
-
-        val mimeUtil = new MimeUtil2()
-        mimeUtil.registerMimeDetector("eu.medsea.mimeutil.detector.MagicMimeMimeDetector")
-
-        super.update(conn)
-        using(conn.createStatement.executeQuery("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY")){ rs =>
-          while(rs.next){
-            defining(Directory.getAttachedDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME"))){ dir =>
-              if(dir.exists && dir.isDirectory){
-                dir.listFiles.foreach { file =>
-                  if(file.getName.indexOf('.') < 0){
-                    val mimeType = MimeUtil2.getMostSpecificMimeType(mimeUtil.getMimeTypes(file, new MimeType("application/octet-stream"))).toString
-                    if(mimeType.startsWith("image/")){
-                      file.renameTo(new File(file.getParent, file.getName + "." + mimeType.split("/")(1)))
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    Version(1, 13),
-    Version(1, 12),
-    Version(1, 11),
-    Version(1, 10),
-    Version(1, 9),
-    Version(1, 8),
-    Version(1, 7),
-    Version(1, 6),
-    Version(1, 5),
-    Version(1, 4),
-    new Version(1, 3){
-      override def update(conn: Connection): Unit = {
-        super.update(conn)
-        // Fix wiki repository configuration
-        using(conn.createStatement.executeQuery("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY")){ rs =>
-          while(rs.next){
-            using(Git.open(getWikiRepositoryDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME")))){ git =>
-              defining(git.getRepository.getConfig){ config =>
-                if(!config.getBoolean("http", "receivepack", false)){
-                  config.setBoolean("http", null, "receivepack", true)
-                  config.save
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    Version(1, 2),
-    Version(1, 1),
-    Version(1, 0),
-    Version(0, 0)
-  )
-  
-  /**
-   * The head version of BitBucket.
-   */
-  val headVersion = versions.head
-  
-  /**
-   * The version file (GITBUCKET_HOME/version).
-   */
-  lazy val versionFile = new File(GitBucketHome, "version")
-  
-  /**
-   * Returns the current version from the version file.
-   */
-  def getCurrentVersion(): Version = {
-    if(versionFile.exists){
-      FileUtils.readFileToString(versionFile, "UTF-8").trim.split("\\.") match {
-        case Array(majorVersion, minorVersion) => {
-          versions.find { v => 
-            v.majorVersion == majorVersion.toInt && v.minorVersion == minorVersion.toInt
-          }.getOrElse(Version(0, 0))
-        }
-        case _ => Version(0, 0)
-      }
-    } else Version(0, 0)
-  }
-  
-}
-
-/**
- * Update database schema automatically in the context initializing.
- */
-class AutoUpdateListener extends ServletContextListener {
-  import AutoUpdate._
-  private val logger = LoggerFactory.getLogger(classOf[AutoUpdateListener])
-  
-  override def contextInitialized(event: ServletContextEvent): Unit = {
-    val datadir = event.getServletContext.getInitParameter("gitbucket.home")
-    if(datadir != null){
-      System.setProperty("gitbucket.home", datadir)
-    }
-    org.h2.Driver.load()
-    event.getServletContext.setInitParameter("db.url", s"jdbc:h2:${DatabaseHome};MVCC=true")
-
-    logger.debug("Start schema update")
-    defining(getConnection(event.getServletContext)){ conn =>
-      try {
-        defining(getCurrentVersion()){ currentVersion =>
-          if(currentVersion == headVersion){
-            logger.debug("No update")
-          } else if(!versions.contains(currentVersion)){
-            logger.warn(s"Skip migration because ${currentVersion.versionString} is illegal version.")
-          } else {
-            versions.takeWhile(_ != currentVersion).reverse.foreach(_.update(conn))
-            FileUtils.writeStringToFile(versionFile, headVersion.versionString, "UTF-8")
-            conn.commit()
-            logger.debug(s"Updated from ${currentVersion.versionString} to ${headVersion.versionString}")
-          }
-        }
-      } catch {
-        case ex: Throwable => {
-          logger.error("Failed to schema update", ex)
-          ex.printStackTrace()
-          conn.rollback()
-        }
-      }
-    }
-    logger.debug("End schema update")
-  }
-
-  def contextDestroyed(sce: ServletContextEvent): Unit = {
-    // Nothing to do.
-  }
-
-  private def getConnection(servletContext: ServletContext): Connection =
-    DriverManager.getConnection(
-      servletContext.getInitParameter("db.url"),
-      servletContext.getInitParameter("db.user"),
-      servletContext.getInitParameter("db.password"))
-
-}
+package servlet
+
+import java.io.File
+import java.sql.{DriverManager, Connection}
+import org.apache.commons.io.FileUtils
+import javax.servlet.{ServletContext, ServletContextListener, ServletContextEvent}
+import org.apache.commons.io.IOUtils
+import org.slf4j.LoggerFactory
+import util.Directory._
+import util.ControlUtil._
+import org.eclipse.jgit.api.Git
+import util.Directory
+import plugin.PluginUpdateJob
+
+object AutoUpdate {
+  
+  /**
+   * Version of GitBucket
+   * 
+   * @param majorVersion the major version
+   * @param minorVersion the minor version
+   */
+  case class Version(majorVersion: Int, minorVersion: Int){
+    
+    private val logger = LoggerFactory.getLogger(classOf[servlet.AutoUpdate.Version])
+    
+    /**
+     * Execute update/MAJOR_MINOR.sql to update schema to this version.
+     * If corresponding SQL file does not exist, this method do nothing.
+     */
+    def update(conn: Connection): Unit = {
+      val sqlPath = s"update/${majorVersion}_${minorVersion}.sql"
+
+      using(Thread.currentThread.getContextClassLoader.getResourceAsStream(sqlPath)){ in =>
+        if(in != null){
+          val sql = IOUtils.toString(in, "UTF-8")
+          using(conn.createStatement()){ stmt =>
+            logger.debug(sqlPath + "=" + sql)
+            stmt.executeUpdate(sql)
+          }
+        }
+      }
+    }
+    
+    /**
+     * MAJOR.MINOR
+     */
+    val versionString = s"${majorVersion}.${minorVersion}"
+  }
+
+  /**
+   * The history of versions. A head of this sequence is the current BitBucket version.
+   */
+  val versions = Seq(
+    new Version(2, 3) {
+      override def update(conn: Connection): Unit = {
+        super.update(conn)
+        using(conn.createStatement.executeQuery("SELECT ACTIVITY_ID, ADDITIONAL_INFO FROM ACTIVITY WHERE ACTIVITY_TYPE='push'")){ rs =>
+          while(rs.next) {
+            val info = rs.getString("ADDITIONAL_INFO")
+            val newInfo = info.split("\n").filter(_ matches "^[0-9a-z]{40}:.*").mkString("\n")
+            if (info != newInfo) {
+              val id = rs.getString("ACTIVITY_ID")
+              using(conn.prepareStatement("UPDATE ACTIVITY SET ADDITIONAL_INFO=? WHERE ACTIVITY_ID=?")) { sql =>
+                sql.setString(1, newInfo)
+                sql.setLong(2, id.toLong)
+                sql.executeUpdate
+              }
+            }
+          }
+        }
+        FileUtils.deleteDirectory(Directory.getPluginCacheDir())
+        FileUtils.deleteDirectory(new File(Directory.PluginHome))
+      }
+    },
+    new Version(2, 2),
+    new Version(2, 1),
+    new Version(2, 0){
+      override def update(conn: Connection): Unit = {
+        import eu.medsea.mimeutil.{MimeUtil2, MimeType}
+
+        val mimeUtil = new MimeUtil2()
+        mimeUtil.registerMimeDetector("eu.medsea.mimeutil.detector.MagicMimeMimeDetector")
+
+        super.update(conn)
+        using(conn.createStatement.executeQuery("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY")){ rs =>
+          while(rs.next){
+            defining(Directory.getAttachedDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME"))){ dir =>
+              if(dir.exists && dir.isDirectory){
+                dir.listFiles.foreach { file =>
+                  if(file.getName.indexOf('.') < 0){
+                    val mimeType = MimeUtil2.getMostSpecificMimeType(mimeUtil.getMimeTypes(file, new MimeType("application/octet-stream"))).toString
+                    if(mimeType.startsWith("image/")){
+                      file.renameTo(new File(file.getParent, file.getName + "." + mimeType.split("/")(1)))
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    Version(1, 13),
+    Version(1, 12),
+    Version(1, 11),
+    Version(1, 10),
+    Version(1, 9),
+    Version(1, 8),
+    Version(1, 7),
+    Version(1, 6),
+    Version(1, 5),
+    Version(1, 4),
+    new Version(1, 3){
+      override def update(conn: Connection): Unit = {
+        super.update(conn)
+        // Fix wiki repository configuration
+        using(conn.createStatement.executeQuery("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY")){ rs =>
+          while(rs.next){
+            using(Git.open(getWikiRepositoryDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME")))){ git =>
+              defining(git.getRepository.getConfig){ config =>
+                if(!config.getBoolean("http", "receivepack", false)){
+                  config.setBoolean("http", null, "receivepack", true)
+                  config.save
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    Version(1, 2),
+    Version(1, 1),
+    Version(1, 0),
+    Version(0, 0)
+  )
+  
+  /**
+   * The head version of BitBucket.
+   */
+  val headVersion = versions.head
+  
+  /**
+   * The version file (GITBUCKET_HOME/version).
+   */
+  lazy val versionFile = new File(GitBucketHome, "version")
+  
+  /**
+   * Returns the current version from the version file.
+   */
+  def getCurrentVersion(): Version = {
+    if(versionFile.exists){
+      FileUtils.readFileToString(versionFile, "UTF-8").trim.split("\\.") match {
+        case Array(majorVersion, minorVersion) => {
+          versions.find { v => 
+            v.majorVersion == majorVersion.toInt && v.minorVersion == minorVersion.toInt
+          }.getOrElse(Version(0, 0))
+        }
+        case _ => Version(0, 0)
+      }
+    } else Version(0, 0)
+  }
+  
+}
+
+/**
+ * Update database schema automatically in the context initializing.
+ */
+class AutoUpdateListener extends ServletContextListener {
+  import org.quartz.impl.StdSchedulerFactory
+  import org.quartz.JobBuilder._
+  import org.quartz.TriggerBuilder._
+  import org.quartz.SimpleScheduleBuilder._
+  import AutoUpdate._
+
+  private val logger = LoggerFactory.getLogger(classOf[AutoUpdateListener])
+  private val scheduler = StdSchedulerFactory.getDefaultScheduler
+  
+  override def contextInitialized(event: ServletContextEvent): Unit = {
+    val datadir = event.getServletContext.getInitParameter("gitbucket.home")
+    if(datadir != null){
+      System.setProperty("gitbucket.home", datadir)
+    }
+    org.h2.Driver.load()
+
+    val context = event.getServletContext
+    context.setInitParameter("db.url", s"jdbc:h2:${DatabaseHome};MVCC=true")
+
+    defining(getConnection(event.getServletContext)){ conn =>
+      logger.debug("Start schema update")
+      try {
+        defining(getCurrentVersion()){ currentVersion =>
+          if(currentVersion == headVersion){
+            logger.debug("No update")
+          } else if(!versions.contains(currentVersion)){
+            logger.warn(s"Skip migration because ${currentVersion.versionString} is illegal version.")
+          } else {
+            versions.takeWhile(_ != currentVersion).reverse.foreach(_.update(conn))
+            FileUtils.writeStringToFile(versionFile, headVersion.versionString, "UTF-8")
+            logger.debug(s"Updated from ${currentVersion.versionString} to ${headVersion.versionString}")
+          }
+        }
+      } catch {
+        case ex: Throwable => {
+          logger.error("Failed to schema update", ex)
+          ex.printStackTrace()
+          conn.rollback()
+        }
+      }
+      logger.debug("End schema update")
+    }
+
+    getDatabase(context).withSession { implicit session =>
+      logger.debug("Starting plugin system...")
+      try {
+        plugin.PluginSystem.init()
+
+        scheduler.start()
+        PluginUpdateJob.schedule(scheduler)
+        logger.debug("PluginUpdateJob is started.")
+
+        logger.debug("Plugin system is initialized.")
+      } catch {
+        case ex: Throwable => {
+          logger.error("Failed to initialize plugin system", ex)
+          ex.printStackTrace()
+          throw ex
+        }
+      }
+    }
+  }
+
+  def contextDestroyed(sce: ServletContextEvent): Unit = {
+    scheduler.shutdown()
+  }
+
+  private def getConnection(servletContext: ServletContext): Connection =
+    DriverManager.getConnection(
+      servletContext.getInitParameter("db.url"),
+      servletContext.getInitParameter("db.user"),
+      servletContext.getInitParameter("db.password"))
+
+  private def getDatabase(servletContext: ServletContext): scala.slick.jdbc.JdbcBackend.Database =
+    slick.jdbc.JdbcBackend.Database.forURL(
+      servletContext.getInitParameter("db.url"),
+      servletContext.getInitParameter("db.user"),
+      servletContext.getInitParameter("db.password"))
+
+}

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 util.Implicits._
 import util.ControlUtil._
@@ -21,7 +21,7 @@ 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]
 
     val wrappedResponse = new HttpServletResponseWrapper(response){
@@ -65,7 +65,8 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
     }
   }
 
-  private def getWritableUser(username: String, password: String, repository: RepositoryService.RepositoryInfo): Option[Account] =
+  private def getWritableUser(username: String, password: String, repository: RepositoryService.RepositoryInfo)
+                             (implicit session: Session): Option[Account] =
     authenticate(loadSystemSettings(), username, password) match {
       case x @ Some(account) if(hasWritePermission(repository.owner, repository.name, x)) => x
       case _ => None

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 model.Session
 
 /**
  * Provides Git repository via HTTP.
@@ -64,7 +65,7 @@ class GitRepositoryServlet extends GitServlet with SystemSettingsService {
 }
 
 class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] with SystemSettingsService {
-  
+
   private val logger = LoggerFactory.getLogger(classOf[GitBucketReceivePackFactory])
 
   override def create(request: HttpServletRequest, db: Repository): ReceivePack = {
@@ -76,14 +77,16 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
 
     defining(request.paths){ paths =>
       val owner      = paths(1)
-      val repository = paths(2).replaceFirst("\\.git$", "")
+      val repository = paths(2).stripSuffix(".git")
 
       logger.debug("repository:" + owner + "/" + repository)
 
       if(!repository.endsWith(".wiki")){
-        val hook = new CommitLogHook(owner, repository, pusher, baseUrl(request))
-        receivePack.setPreReceiveHook(hook)
-        receivePack.setPostReceiveHook(hook)
+        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: Session)
+  extends PostReceiveHook with PreReceiveHook
   with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService {
   
   private val logger = LoggerFactory.getLogger(classOf[CommitLogHook])
@@ -114,6 +118,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
   def onPostReceive(receivePack: ReceivePack, commands: java.util.Collection[ReceiveCommand]): Unit = {
     try {
       using(Git.open(Directory.getRepositoryDir(owner, repository))) { git =>
+        val pushedIds = scala.collection.mutable.Set[String]()
         commands.asScala.foreach { command =>
           logger.debug(s"commandType: ${command.getType}, refName: ${command.getRefName}")
           val refName = command.getRefName.split("/")
@@ -133,10 +138,16 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
             countIssue(IssueSearchCondition(state = "closed"), Map.empty, false, owner -> repository)
 
           // Extract new commit and apply issue comment
+          val defaultBranch = getRepository(owner, repository, baseUrl).get.repository.defaultBranch
           val newCommits = commits.flatMap { commit =>
-            if (!existIds.contains(commit.id)) {
+            if (!existIds.contains(commit.id) && !pushedIds.contains(commit.id)) {
               if (issueCount > 0) {
+                pushedIds.add(commit.id)
                 createIssueComment(commit)
+                // close issues
+                if(refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE){
+                  closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository)
+                }
               }
               Some(commit)
             } else None
@@ -168,17 +179,6 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
             }
           }
 
-          // close issues
-          if(issueCount > 0) {
-            val defaultBranch = getRepository(owner, repository, baseUrl).get.repository.defaultBranch
-            if (refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE) {
-              git.log.addRange(command.getOldId, command.getNewId).call.asScala.foreach {
-                commit =>
-                  closeIssuesFromMessage(commit.getFullMessage, pusher, owner, repository)
-              }
-            }
-          }
-
           // call web hook
           getWebHookURLs(owner, repository) match {
             case webHookURLs if(webHookURLs.nonEmpty) =>
@@ -205,7 +205,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
   private def createIssueComment(commit: CommitInfo) = {
     StringUtil.extractIssueId(commit.fullMessage).foreach { issueId =>
       if(getIssue(owner, repository, issueId).isDefined){
-        getAccountByMailAddress(commit.mailAddress).foreach { account =>
+        getAccountByMailAddress(commit.committerEmailAddress).foreach { account =>
           createComment(owner, repository, account.userName, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
         }
       }

src/main/scala/servlet/PluginActionInvokeFilter.scala

@@ -0,0 +1,192 @@
+package servlet
+
+import javax.servlet._
+import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
+import org.apache.commons.io.IOUtils
+import play.twirl.api.Html
+import service.{AccountService, RepositoryService, SystemSettingsService}
+import model.{Account, Session}
+import util.{JGitUtil, Keys}
+import plugin.{RawData, Fragment, PluginConnectionHolder, Redirect}
+import service.RepositoryService.RepositoryInfo
+import plugin.Security._
+
+class PluginActionInvokeFilter extends Filter with SystemSettingsService with RepositoryService with AccountService {
+
+  def init(config: FilterConfig) = {}
+
+  def destroy(): Unit = {}
+
+  def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain): Unit = {
+    (req, res) match {
+      case (request: HttpServletRequest, response: HttpServletResponse) => {
+        Database(req.getServletContext) withTransaction { implicit session =>
+          val path = request.getRequestURI.substring(request.getServletContext.getContextPath.length)
+          if(!processGlobalAction(path, request, response) && !processRepositoryAction(path, request, response)){
+            chain.doFilter(req, res)
+          }
+        }
+      }
+    }
+  }
+
+  private def processGlobalAction(path: String, request: HttpServletRequest, response: HttpServletResponse)
+                                 (implicit session: Session): Boolean = {
+    plugin.PluginSystem.globalActions.find(x =>
+      x.method.toLowerCase == request.getMethod.toLowerCase && path.matches(x.path)
+    ).map { action =>
+      val loginAccount = request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
+      val systemSettings = loadSystemSettings()
+      implicit val context = app.Context(systemSettings, Option(loginAccount), request)
+
+      if(authenticate(action.security, context)){
+        val result = try {
+          PluginConnectionHolder.threadLocal.set(session.conn)
+          action.function(request, response, context)
+        } finally {
+          PluginConnectionHolder.threadLocal.remove()
+        }
+        processActionResult(result, request, response, context)
+      } else {
+        // TODO NotFound or Error?
+      }
+      true
+    } getOrElse false
+  }
+
+  private def processRepositoryAction(path: String, request: HttpServletRequest, response: HttpServletResponse)
+                                     (implicit session: Session): Boolean = {
+    val elements = path.split("/")
+    if(elements.length > 3){
+      val owner  = elements(1)
+      val name   = elements(2)
+      val remain = elements.drop(3).mkString("/", "/", "")
+
+      val loginAccount = request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
+      val systemSettings = loadSystemSettings()
+      implicit val context = app.Context(systemSettings, Option(loginAccount), request)
+
+      getRepository(owner, name, systemSettings.baseUrl(request)).flatMap { repository =>
+        plugin.PluginSystem.repositoryActions.find(x => remain.matches(x.path)).map { action =>
+          if(authenticate(action.security, context, repository)){
+            val result = try {
+              PluginConnectionHolder.threadLocal.set(session.conn)
+              action.function(request, response, context, repository)
+            } finally {
+              PluginConnectionHolder.threadLocal.remove()
+            }
+            processActionResult(result, request, response, context)
+          } else {
+            // TODO NotFound or Error?
+          }
+          true
+        }
+      } getOrElse false
+    } else false
+  }
+
+  private def processActionResult(result: Any, request: HttpServletRequest, response: HttpServletResponse,
+                                   context: app.Context): Unit = {
+    result match {
+      case null|None         => renderError(request, response, context, 404)
+      case x: String         => renderGlobalHtml(request, response, context, x)
+      case Some(x: String)   => renderGlobalHtml(request, response, context, x)
+      case x: Html           => renderGlobalHtml(request, response, context, x.toString)
+      case Some(x: Html)     => renderGlobalHtml(request, response, context, x.toString)
+      case x: Fragment       => renderFragmentHtml(request, response, context, x.html.toString)
+      case Some(x: Fragment) => renderFragmentHtml(request, response, context, x.html.toString)
+      case x: RawData        => renderRawData(request, response, context, x)
+      case Some(x: RawData)  => renderRawData(request, response, context, x)
+      case x: Redirect       => response.sendRedirect(x.path)
+      case Some(x: Redirect) => response.sendRedirect(x.path)
+      case x: AnyRef         => renderJson(request, response, x)
+    }
+  }
+
+  /**
+   * Authentication for global action
+   */
+  private def authenticate(security: Security, context: app.Context)(implicit session: Session): Boolean = {
+    // Global Action
+    security match {
+      case All() => true
+      case Login() => context.loginAccount.isDefined
+      case Admin() => context.loginAccount.exists(_.isAdmin)
+      case _ => false // TODO throw Exception?
+    }
+  }
+
+  /**
+   * Authenticate for repository action
+   */
+  private def authenticate(security: Security, context: app.Context, repository: RepositoryInfo)(implicit session: Session): Boolean = {
+    if(repository.repository.isPrivate){
+      // Private Repository
+      security match {
+        case Admin() => context.loginAccount.exists(_.isAdmin)
+        case Owner() => context.loginAccount.exists { account =>
+          account.userName == repository.owner ||
+            getGroupMembers(repository.owner).exists(m => m.userName == account.userName && m.isManager)
+        }
+        case _ => context.loginAccount.exists { account =>
+          account.isAdmin || account.userName == repository.owner ||
+            getCollaborators(repository.owner, repository.name).contains(account.userName)
+        }
+      }
+    } else {
+      // Public Repository
+      security match {
+        case All() => true
+        case Login() => context.loginAccount.isDefined
+        case Owner() => context.loginAccount.exists { account =>
+          account.userName == repository.owner ||
+            getGroupMembers(repository.owner).exists(m => m.userName == account.userName && m.isManager)
+        }
+        case Member() => context.loginAccount.exists { account =>
+          account.userName == repository.owner ||
+            getCollaborators(repository.owner, repository.name).contains(account.userName)
+        }
+        case Admin() => context.loginAccount.exists(_.isAdmin)
+      }
+    }
+  }
+
+  private def renderError(request: HttpServletRequest, response: HttpServletResponse, context: app.Context, error: Int): Unit = {
+    response.sendError(error)
+  }
+
+  private def renderGlobalHtml(request: HttpServletRequest, response: HttpServletResponse, context: app.Context, body: String): Unit = {
+    response.setContentType("text/html; charset=UTF-8")
+    val html = _root_.html.main("GitBucket", None)(Html(body))(context)
+    IOUtils.write(html.toString.getBytes("UTF-8"), response.getOutputStream)
+  }
+
+  private def renderRepositoryHtml(request: HttpServletRequest, response: HttpServletResponse, context: app.Context, repository: RepositoryInfo, body: String): Unit = {
+    response.setContentType("text/html; charset=UTF-8")
+    val html = _root_.html.main("GitBucket", None)(_root_.html.menu("", repository)(Html(body))(context))(context) // TODO specify active side menu
+    IOUtils.write(html.toString.getBytes("UTF-8"), response.getOutputStream)
+  }
+
+  private def renderFragmentHtml(request: HttpServletRequest, response: HttpServletResponse, context: app.Context, body: String): Unit = {
+    response.setContentType("text/html; charset=UTF-8")
+    IOUtils.write(body.getBytes("UTF-8"), response.getOutputStream)
+  }
+
+  private def renderRawData(request: HttpServletRequest, response: HttpServletResponse, context: app.Context, rawData: RawData): Unit = {
+    response.setContentType(rawData.contentType)
+    IOUtils.write(rawData.content, response.getOutputStream)
+  }
+
+  private def renderJson(request: HttpServletRequest, response: HttpServletResponse, obj: AnyRef): Unit = {
+    import org.json4s._
+    import org.json4s.jackson.Serialization
+    import org.json4s.jackson.Serialization.write
+    implicit val formats = Serialization.formats(NoTypeHints)
+
+    val json = write(obj)
+
+    response.setContentType("application/json; charset=UTF-8")
+    IOUtils.write(json.getBytes("UTF-8"), response.getOutputStream)
+  }
+
+}

src/main/scala/servlet/TransactionFilter.scala

@@ -1,38 +1,45 @@
-package servlet
-
-import javax.servlet._
-import org.slf4j.LoggerFactory
-import javax.servlet.http.HttpServletRequest
-
-/**
- * Controls the transaction with the open session in view pattern.
- */
-class TransactionFilter extends Filter {
-  
-  private val logger = LoggerFactory.getLogger(classOf[TransactionFilter])
-  
-  def init(config: FilterConfig) = {}
-  
-  def destroy(): Unit = {}
-  
-  def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain): Unit = {
-    if(req.asInstanceOf[HttpServletRequest].getRequestURI().startsWith("/assets/")){
-      // assets don't need transaction
-      chain.doFilter(req, res)
-    } else {
-      Database(req.getServletContext) withTransaction {
-        logger.debug("begin transaction")
-        chain.doFilter(req, res)
-        logger.debug("end transaction")
-      }
-    }
-  }
-
-}
-
-object Database {
-  def apply(context: ServletContext): scala.slick.session.Database =
-    scala.slick.session.Database.forURL(context.getInitParameter("db.url"),
-        context.getInitParameter("db.user"),
-        context.getInitParameter("db.password"))
-}
+package servlet
+
+import javax.servlet._
+import org.slf4j.LoggerFactory
+import javax.servlet.http.HttpServletRequest
+import util.Keys
+
+/**
+ * Controls the transaction with the open session in view pattern.
+ */
+class TransactionFilter extends Filter {
+  
+  private val logger = LoggerFactory.getLogger(classOf[TransactionFilter])
+  
+  def init(config: FilterConfig) = {}
+  
+  def destroy(): Unit = {}
+  
+  def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain): Unit = {
+    if(req.asInstanceOf[HttpServletRequest].getRequestURI().startsWith("/assets/")){
+      // assets don't need transaction
+      chain.doFilter(req, res)
+    } else {
+      Database(req.getServletContext) withTransaction { session =>
+        logger.debug("begin transaction")
+        req.setAttribute(Keys.Request.DBSession, session)
+        chain.doFilter(req, res)
+        logger.debug("end transaction")
+      }
+    }
+  }
+
+}
+
+object Database {
+
+  def apply(context: ServletContext): slick.jdbc.JdbcBackend.Database =
+    slick.jdbc.JdbcBackend.Database.forURL(context.getInitParameter("db.url"),
+        context.getInitParameter("db.user"),
+        context.getInitParameter("db.password"))
+
+  def getSession(req: ServletRequest): slick.jdbc.JdbcBackend#Session =
+    req.getAttribute(Keys.Request.DBSession).asInstanceOf[slick.jdbc.JdbcBackend#Session]
+
+}

src/main/scala/ssh/GitCommand.scala

@@ -12,7 +12,7 @@ import servlet.{Database, CommitLogHook}
 import service.{AccountService, RepositoryService, SystemSettingsService}
 import org.eclipse.jgit.errors.RepositoryNotFoundException
 import javax.servlet.ServletContext
-
+import model.Session
 
 object GitCommand {
   val CommandRegex = """\Agit-(upload|receive)-pack '/([a-zA-Z0-9\-_.]+)/([a-zA-Z0-9\-_.]+).git'\Z""".r
@@ -27,11 +27,11 @@ abstract class GitCommand(val context: ServletContext, val owner: String, val re
   protected var out: OutputStream = null
   protected var callback: ExitCallback = null
 
-  protected def runTask(user: String): Unit
+  protected def runTask(user: String)(implicit session: Session): Unit
 
   private def newTask(user: String): Runnable = new Runnable {
     override def run(): Unit = {
-      Database(context) withTransaction {
+      Database(context) withSession { implicit session =>
         try {
           runTask(user)
           callback.onExit(0)
@@ -71,7 +71,8 @@ abstract class GitCommand(val context: ServletContext, val owner: String, val re
     this.in = in
   }
 
-  protected def isWritableUser(username: String, repositoryInfo: RepositoryService.RepositoryInfo): Boolean =
+  protected def isWritableUser(username: String, repositoryInfo: RepositoryService.RepositoryInfo)
+                              (implicit session: Session): Boolean =
     getAccountByUserName(username) match {
       case Some(account) => hasWritePermission(repositoryInfo.owner, repositoryInfo.name, Some(account))
       case None => false
@@ -82,7 +83,7 @@ abstract class GitCommand(val context: ServletContext, val owner: String, val re
 class GitUploadPack(context: ServletContext, owner: String, repoName: String, baseUrl: String) extends GitCommand(context, owner, repoName)
     with RepositoryService with AccountService {
 
-  override protected def runTask(user: String): Unit = {
+  override protected def runTask(user: String)(implicit session: Session): Unit = {
     getRepository(owner, repoName.replaceFirst("\\.wiki\\Z", ""), baseUrl).foreach { repositoryInfo =>
       if(!repositoryInfo.repository.isPrivate || isWritableUser(user, repositoryInfo)){
         using(Git.open(getRepositoryDir(owner, repoName))) { git =>
@@ -99,7 +100,7 @@ class GitUploadPack(context: ServletContext, owner: String, repoName: String, ba
 class GitReceivePack(context: ServletContext, owner: String, repoName: String, baseUrl: String) extends GitCommand(context, owner, repoName)
     with SystemSettingsService with RepositoryService with AccountService {
 
-  override protected def runTask(user: String): Unit = {
+  override protected def runTask(user: String)(implicit session: Session): Unit = {
     getRepository(owner, repoName.replaceFirst("\\.wiki\\Z", ""), baseUrl).foreach { repositoryInfo =>
       if(isWritableUser(user, repositoryInfo)){
         using(Git.open(getRepositoryDir(owner, repoName))) { git =>

src/main/scala/ssh/PublicKeyAuthenticator.scala

@@ -10,7 +10,7 @@ import javax.servlet.ServletContext
 class PublicKeyAuthenticator(context: ServletContext) extends PublickeyAuthenticator with SshKeyService {
 
   override def authenticate(username: String, key: PublicKey, session: ServerSession): Boolean = {
-    Database(context) withTransaction {
+    Database(context) withSession { implicit session =>
       getPublicKeys(username).exists { sshKey =>
         SshUtil.str2PublicKey(sshKey.publicKey) match {
           case Some(publicKey) => key.equals(publicKey)

src/main/scala/ssh/SshUtil.scala

@@ -14,7 +14,7 @@ object SshUtil {
     // TODO RFC 4716 Public Key is not supported...
     val parts = key.split(" ")
     if (parts.size < 2) {
-      logger.debug(s"Invalid PublicKey Format: key")
+      logger.debug(s"Invalid PublicKey Format: ${key}")
       return None
     }
     try {

src/main/scala/util/Directory.scala

@@ -34,6 +34,10 @@ object Directory {
 
   val DatabaseHome = s"${GitBucketHome}/data"
 
+  val PluginHome = s"${GitBucketHome}/plugins"
+
+  val TemporaryHome = s"${GitBucketHome}/tmp"
+
   /**
    * Substance directory of the repository.
    */
@@ -55,13 +59,18 @@ object Directory {
    * Root of temporary directories for the upload file.
    */
   def getTemporaryDir(sessionId: String): File =
-    new File(s"${GitBucketHome}/tmp/_upload/${sessionId}")
+    new File(s"${TemporaryHome}/_upload/${sessionId}")
 
   /**
    * Root of temporary directories for the specified repository.
    */
   def getTemporaryDir(owner: String, repository: String): File =
-    new File(s"${GitBucketHome}/tmp/${owner}/${repository}")
+    new File(s"${TemporaryHome}/${owner}/${repository}")
+
+  /**
+   * Root of plugin cache directory. Plugin repositories are cloned into this directory.
+   */
+  def getPluginCacheDir(): File = new File(s"${TemporaryHome}/_plugins")
 
   /**
    * Temporary directory which is used to create an archive to download repository contents.

src/main/scala/util/Implicits.scala

@@ -2,6 +2,8 @@ package util
 
 import scala.util.matching.Regex
 import scala.util.control.Exception._
+import slick.jdbc.JdbcBackend
+import servlet.Database
 import javax.servlet.http.{HttpSession, HttpServletRequest}
 
 /**
@@ -9,6 +11,9 @@ import javax.servlet.http.{HttpSession, HttpServletRequest}
  */
 object Implicits {
 
+  // Convert to slick session.
+  implicit def request2Session(implicit request: HttpServletRequest): JdbcBackend#Session = Database.getSession(request)
+
   implicit class RichSeq[A](seq: Seq[A]) {
 
     def splitWith(condition: (A, A) => Boolean): Seq[Seq[A]] = split(seq)(condition)

src/main/scala/util/JGitUtil.scala

@@ -4,6 +4,7 @@ import org.eclipse.jgit.api.Git
 import util.Directory._
 import util.StringUtil._
 import util.ControlUtil._
+import scala.annotation.tailrec
 import scala.collection.JavaConverters._
 import org.eclipse.jgit.lib._
 import org.eclipse.jgit.revwalk._
@@ -35,7 +36,11 @@ object JGitUtil {
    * @param branchList the list of branch names
    * @param tags the list of tags
    */
-  case class RepositoryInfo(owner: String, name: String, url: String, commitCount: Int, branchList: List[String], tags: List[TagInfo])
+  case class RepositoryInfo(owner: String, name: String, url: String, commitCount: Int, branchList: List[String], tags: List[TagInfo]){
+    def this(owner: String, name: String, baseUrl: String) = {
+      this(owner, name, s"${baseUrl}/git/${owner}/${name}.git", 0, Nil, Nil)
+    }
+  }
 
   /**
    * The file data for the file list of the repository viewer.
@@ -43,38 +48,45 @@ object JGitUtil {
    * @param id the object id
    * @param isDirectory whether is it directory
    * @param name the file (or directory) name
-   * @param time the last modified time
    * @param message the last commit message
    * @param commitId the last commit id
-   * @param committer the last committer name
+   * @param time the last modified time
+   * @param author the last committer name
    * @param mailAddress the committer's mail address
    * @param linkUrl the url of submodule
    */
-  case class FileInfo(id: ObjectId, isDirectory: Boolean, name: String, time: Date, message: String, commitId: String,
-                      committer: String, mailAddress: String, linkUrl: Option[String])
+  case class FileInfo(id: ObjectId, isDirectory: Boolean, name: String, message: String, commitId: String,
+                      time: Date, author: String, mailAddress: String, linkUrl: Option[String])
 
   /**
    * The commit data.
    *
    * @param id the commit id
-   * @param time the commit time
-   * @param committer  the committer name
-   * @param mailAddress the mail address of the committer
    * @param shortMessage the short message
    * @param fullMessage the full message
    * @param parents the list of parent commit id
+   * @param authorTime the author time
+   * @param authorName the author name
+   * @param authorEmailAddress the mail address of the author
+   * @param commitTime the commit time
+   * @param committerName  the committer name
+   * @param committerEmailAddress the mail address of the committer
    */
-  case class CommitInfo(id: String, time: Date, committer: String, mailAddress: String,
-                        shortMessage: String, fullMessage: String, parents: List[String]){
+  case class CommitInfo(id: String, shortMessage: String, fullMessage: String, parents: List[String],
+                        authorTime: Date, authorName: String, authorEmailAddress: String,
+                        commitTime: Date, committerName: String, committerEmailAddress: String){
     
     def this(rev: org.eclipse.jgit.revwalk.RevCommit) = this(
         rev.getName,
-        rev.getCommitterIdent.getWhen,
-        rev.getCommitterIdent.getName,
-        rev.getCommitterIdent.getEmailAddress,
         rev.getShortMessage,
         rev.getFullMessage,
-        rev.getParents().map(_.name).toList)
+        rev.getParents().map(_.name).toList,
+        rev.getAuthorIdent.getWhen,
+        rev.getAuthorIdent.getName,
+        rev.getAuthorIdent.getEmailAddress,
+        rev.getCommitterIdent.getWhen,
+        rev.getCommitterIdent.getName,
+        rev.getCommitterIdent.getEmailAddress)
 
     val summary = getSummaryMessage(fullMessage, shortMessage)
 
@@ -83,6 +95,8 @@ object JGitUtil {
         Some(fullMessage.trim.substring(i).trim)
       } else None
     }
+
+    def isDifferentFromAuthor: Boolean = authorName != committerName || authorEmailAddress != committerEmailAddress
   }
 
   case class DiffInfo(changeType: ChangeType, oldPath: String, newPath: String, oldContent: Option[String], newContent: Option[String])
@@ -94,7 +108,12 @@ object JGitUtil {
    * @param content the string content
    * @param charset the character encoding
    */
-  case class ContentInfo(viewType: String, content: Option[String], charset: Option[String])
+  case class ContentInfo(viewType: String, content: Option[String], charset: Option[String]){
+    /**
+     * the line separator of this content ("LF" or "CRLF")
+     */
+    val lineSeparator: String = if(content.exists(_.indexOf("\r\n") >= 0)) "CRLF" else "LF"
+  }
 
   /**
    * The tag data.
@@ -146,12 +165,12 @@ object JGitUtil {
           commitCount,
           // branches
           git.branchList.call.asScala.map { ref =>
-            ref.getName.replaceFirst("^refs/heads/", "")
+            ref.getName.stripPrefix("refs/heads/")
           }.toList,
           // tags
           git.tagList.call.asScala.map { ref =>
             val revCommit = getRevCommitFromId(git, ref.getObjectId)
-            TagInfo(ref.getName.replaceFirst("^refs/tags/", ""), revCommit.getCommitterIdent.getWhen, revCommit.getName)
+            TagInfo(ref.getName.stripPrefix("refs/tags/"), revCommit.getCommitterIdent.getWhen, revCommit.getName)
           }.toList
         )
       } catch {
@@ -172,38 +191,23 @@ object JGitUtil {
    * @return HTML of the file list
    */
   def getFileList(git: Git, revision: String, path: String = "."): List[FileInfo] = {
-    val list = new scala.collection.mutable.ListBuffer[(ObjectId, FileMode, String, String, Option[String])]
+    var list = new scala.collection.mutable.ListBuffer[(ObjectId, FileMode, String, String, Option[String])]
 
     using(new RevWalk(git.getRepository)){ revWalk =>
       val objectId  = git.getRepository.resolve(revision)
       val revCommit = revWalk.parseCommit(objectId)
 
-      using(new TreeWalk(git.getRepository)){ treeWalk =>
+      val treeWalk = if (path == ".") {
+        val treeWalk = new TreeWalk(git.getRepository)
         treeWalk.addTree(revCommit.getTree)
-        if(path != "."){
-          treeWalk.setRecursive(true)
-          treeWalk.setFilter(new TreeFilter(){
+        treeWalk
+      } else {
+        val treeWalk = TreeWalk.forPath(git.getRepository, path, revCommit.getTree)
+        treeWalk.enterSubtree()
+        treeWalk
+      }
 
-            var stopRecursive = false
-
-            def include(walker: TreeWalk): Boolean = {
-              val targetPath = walker.getPathString
-              if((path + "/").startsWith(targetPath)){
-                true
-              } else if(targetPath.startsWith(path + "/") && targetPath.substring(path.length + 1).indexOf("/") < 0){
-                stopRecursive = true
-                treeWalk.setRecursive(false)
-                true
-              } else {
-                false
-              }
-            }
-
-            def shouldBeRecursive(): Boolean = !stopRecursive
-
-            override def clone: TreeFilter = return this
-          })
-        }
+      using(treeWalk) { treeWalk =>
         while (treeWalk.next()) {
           // submodule
           val linkUrl = if(treeWalk.getFileMode(0) == FileMode.GITLINK){
@@ -212,6 +216,31 @@ object JGitUtil {
 
           list.append((treeWalk.getObjectId(0), treeWalk.getFileMode(0), treeWalk.getPathString, treeWalk.getNameString, linkUrl))
         }
+
+        list = list.map(tuple =>
+          if (tuple._2 != FileMode.TREE)
+            tuple
+          else
+            simplifyPath(tuple)
+        )
+
+        @tailrec
+        def simplifyPath(tuple: (ObjectId, FileMode, String, String, Option[String])): (ObjectId, FileMode, String, String, Option[String]) = {
+          val list = new scala.collection.mutable.ListBuffer[(ObjectId, FileMode, String, String, Option[String])]
+          using(new TreeWalk(git.getRepository)) { walk =>
+            walk.addTree(tuple._1)
+            while (walk.next() && list.size < 2) {
+              val linkUrl = if (walk.getFileMode(0) == FileMode.GITLINK) {
+                getSubmodules(git, revCommit.getTree).find(_.path == walk.getPathString).map(_.url)
+              } else None
+              list.append((walk.getObjectId(0), walk.getFileMode(0), tuple._3 + "/" + walk.getPathString, tuple._4 + "/" + walk.getNameString, linkUrl))
+            }
+          }
+          if (list.size != 1 || list.exists(_._2 != FileMode.TREE))
+            tuple
+          else
+            simplifyPath(list(0))
+        }
       }
     }
 
@@ -222,11 +251,11 @@ object JGitUtil {
           objectId,
           fileMode == FileMode.TREE || fileMode == FileMode.GITLINK,
           name,
-          commit.getCommitterIdent.getWhen,
           getSummaryMessage(commit.getFullMessage, commit.getShortMessage),
           commit.getName,
-          commit.getCommitterIdent.getName,
-          commit.getCommitterIdent.getEmailAddress,
+          commit.getAuthorIdent.getWhen,
+          commit.getAuthorIdent.getName,
+          commit.getAuthorIdent.getEmailAddress,
           linkUrl)
       }
     }.sortWith { (file1, file2) =>
@@ -486,7 +515,7 @@ object JGitUtil {
   }
 
   def createNewCommit(git: Git, inserter: ObjectInserter, headId: AnyObjectId, treeId: AnyObjectId,
-                              fullName: String, mailAddress: String, message: String): ObjectId = {
+                      ref: String, fullName: String, mailAddress: String, message: String): ObjectId = {
     val newCommit = new CommitBuilder()
     newCommit.setCommitter(new PersonIdent(fullName, mailAddress))
     newCommit.setAuthor(new PersonIdent(fullName, mailAddress))
@@ -500,7 +529,7 @@ object JGitUtil {
     inserter.flush()
     inserter.release()
 
-    val refUpdate = git.getRepository.updateRef(Constants.HEAD)
+    val refUpdate = git.getRepository.updateRef(ref)
     refUpdate.setNewObjectId(newHeadId)
     refUpdate.update()
 
@@ -634,4 +663,15 @@ object JGitUtil {
       }.head.id
     }
 
+  /**
+   * Returns the last modified commit of specified path
+   * @param git the Git object
+   * @param startCommit the search base commit id
+   * @param path the path of target file or directory
+   * @return the last modified commit of specified path
+   */
+  def getLastModifiedCommit(git: Git, startCommit: RevCommit, path: String): RevCommit = {
+    return git.log.add(startCommit).addPath(path).setMaxCount(1).call.iterator.next
+  }
+
 }

src/main/scala/util/Keys.scala

@@ -61,6 +61,11 @@ object Keys {
    */
   object Request {
 
+    /**
+     * Request key for the Slick Session.
+     */
+    val DBSession = "DB_SESSION"
+
     /**
      * Request key for the Ajax request flag.
      */

src/main/scala/util/LDAPUtil.scala

@@ -7,6 +7,7 @@ import java.security.Security
 import org.slf4j.LoggerFactory
 import service.SystemSettingsService.Ldap
 import scala.annotation.tailrec
+import model.Account
 
 /**
  * Utility for LDAP authentication.
@@ -16,6 +17,26 @@ object LDAPUtil {
   private val LDAP_VERSION: Int = LDAPConnection.LDAP_V3
   private val logger = LoggerFactory.getLogger(getClass().getName())
 
+  private val LDAP_DUMMY_MAL = "@ldap-devnull"
+
+  /**
+   * Returns true if mail address ends with "@ldap-devnull"
+   */
+  def isDummyMailAddress(account: Account): Boolean = {
+    account.mailAddress.endsWith(LDAP_DUMMY_MAL)
+  }
+
+  /**
+   * Creates dummy address (userName@ldap-devnull) for LDAP login.
+   *
+   * If  mail address is not managed in LDAP server, GitBucket stores this dummy address in first LDAP login.
+   * GitBucket does not send any mails to this dummy address. And these users must input their mail address
+   * at the first step after LDAP authentication.
+   */
+  def createDummyMailAddress(userName: String): String = {
+    userName + LDAP_DUMMY_MAL
+  }
+
   /**
    * Try authentication by LDAP using given configuration.
    * Returns Right(LDAPUserInfo) if authentication is successful, otherwise  Left(errorMessage).
@@ -30,7 +51,7 @@ object LDAPUtil {
       keystore = ldapSettings.keystore.getOrElse(""),
       error    = "System LDAP authentication failed."
     ){ conn =>
-      findUser(conn, userName, ldapSettings.baseDN, ldapSettings.userNameAttribute) match {
+      findUser(conn, userName, ldapSettings.baseDN, ldapSettings.userNameAttribute, ldapSettings.additionalFilterCondition) match {
         case Some(userDN) => userAuthentication(ldapSettings, userDN, userName, password)
         case None         => Left("User does not exist.")
       }
@@ -47,14 +68,23 @@ object LDAPUtil {
       keystore = ldapSettings.keystore.getOrElse(""),
       error    = "User LDAP Authentication Failed."
     ){ conn =>
-      findMailAddress(conn, userDN, ldapSettings.mailAttribute) match {
-        case Some(mailAddress) => Right(LDAPUserInfo(
-          userName    = getUserNameFromMailAddress(userName),
+      if(ldapSettings.mailAttribute.getOrElse("").isEmpty) {
+        Right(LDAPUserInfo(
+          userName    = userName,
           fullName    = ldapSettings.fullNameAttribute.flatMap { fullNameAttribute =>
-            findFullName(conn, userDN, fullNameAttribute)
+            findFullName(conn, userDN, ldapSettings.userNameAttribute, userName, fullNameAttribute)
           }.getOrElse(userName),
-          mailAddress = mailAddress))
-        case None => Left("Can't find mail address.")
+          mailAddress = createDummyMailAddress(userName)))
+      } else {
+        findMailAddress(conn, userDN, ldapSettings.userNameAttribute, userName, ldapSettings.mailAttribute.get) match {
+          case Some(mailAddress) => Right(LDAPUserInfo(
+            userName    = getUserNameFromMailAddress(userName),
+            fullName    = ldapSettings.fullNameAttribute.flatMap { fullNameAttribute =>
+              findFullName(conn, userDN, ldapSettings.userNameAttribute, userName, fullNameAttribute)
+            }.getOrElse(userName),
+            mailAddress = mailAddress))
+          case None => Left("Can't find mail address.")
+        }
       }
     }
   }
@@ -112,7 +142,7 @@ object LDAPUtil {
   /**
    * Search a specified user and returns userDN if exists.
    */
-  private def findUser(conn: LDAPConnection, userName: String, baseDN: String, userNameAttribute: String): Option[String] = {
+  private def findUser(conn: LDAPConnection, userName: String, baseDN: String, userNameAttribute: String, additionalFilterCondition: Option[String]): Option[String] = {
     @tailrec
     def getEntries(results: LDAPSearchResults, entries: List[Option[LDAPEntry]] = Nil): List[LDAPEntry] = {
       if(results.hasMore){
@@ -125,20 +155,26 @@ object LDAPUtil {
         entries.flatten
       }
     }
-    getEntries(conn.search(baseDN, LDAPConnection.SCOPE_SUB, userNameAttribute + "=" + userName, null, false)).collectFirst {
+
+    val filterCond = additionalFilterCondition.getOrElse("") match {
+      case "" => userNameAttribute + "=" + userName
+      case x => "(&(" + x + ")(" + userNameAttribute + "=" + userName + "))"
+    }
+
+    getEntries(conn.search(baseDN, LDAPConnection.SCOPE_SUB, filterCond, null, false)).collectFirst {
       case x => x.getDN
     }
   }
 
-  private def findMailAddress(conn: LDAPConnection, userDN: String, mailAttribute: String): Option[String] =
-    defining(conn.search(userDN, LDAPConnection.SCOPE_BASE, null, Array[String](mailAttribute), false)){ results =>
+  private def findMailAddress(conn: LDAPConnection, userDN: String, userNameAttribute: String, userName: String, mailAttribute: String): Option[String] =
+    defining(conn.search(userDN, LDAPConnection.SCOPE_BASE, userNameAttribute + "=" + userName, Array[String](mailAttribute), false)){ results =>
       if(results.hasMore) {
         Option(results.next.getAttribute(mailAttribute)).map(_.getStringValue)
       } else None
     }
 
-  private def findFullName(conn: LDAPConnection, userDN: String, nameAttribute: String): Option[String] =
-    defining(conn.search(userDN, LDAPConnection.SCOPE_BASE, null, Array[String](nameAttribute), false)){ results =>
+  private def findFullName(conn: LDAPConnection, userDN: String, userNameAttribute: String, userName: String, nameAttribute: String): Option[String] =
+    defining(conn.search(userDN, LDAPConnection.SCOPE_BASE, userNameAttribute + "=" + userName, Array[String](nameAttribute), false)){ results =>
       if(results.hasMore) {
         Option(results.next.getAttribute(nameAttribute)).map(_.getStringValue)
       } else None

src/main/scala/util/Notifier.scala

@@ -1,116 +1,116 @@
-package util
-
-import scala.concurrent._
-import ExecutionContext.Implicits.global
-import org.apache.commons.mail.{DefaultAuthenticator, HtmlEmail}
-import org.slf4j.LoggerFactory
-
-import app.Context
-import service.{AccountService, RepositoryService, IssuesService, SystemSettingsService}
-import servlet.Database
-import SystemSettingsService.Smtp
-import _root_.util.ControlUtil.defining
-
-trait Notifier extends RepositoryService with AccountService with IssuesService {
-  def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
-      (msg: String => String)(implicit context: Context): Unit
-
-  protected def recipients(issue: model.Issue)(notify: String => Unit)(implicit context: Context) =
-    (
-        // individual repository's owner
-        issue.userName ::
-        // collaborators
-        getCollaborators(issue.userName, issue.repositoryName) :::
-        // participants
-        issue.openedUserName ::
-        getComments(issue.userName, issue.repositoryName, issue.issueId).map(_.commentedUserName)
-    )
-    .distinct
-    .withFilter ( _ != context.loginAccount.get.userName )	// the operation in person is excluded
-    .foreach ( getAccountByUserName(_) filterNot (_.isGroupAccount) foreach (x => notify(x.mailAddress)) )
-
-}
-
-object Notifier {
-  // TODO We want to be able to switch to mock.
-  def apply(): Notifier = new SystemSettingsService {}.loadSystemSettings match {
-    case settings if settings.notification => new Mailer(settings.smtp.get)
-    case _ => new MockMailer
-  }
-
-  def msgIssue(url: String) = (content: String) => s"""
-    |${content}<br/>
-    |--<br/>
-    |<a href="${url}">View it on GitBucket</a>
-    """.stripMargin
-
-  def msgPullRequest(url: String) = (content: String) => s"""
-    |${content}<hr/>
-    |View, comment on, or merge it at:<br/>
-    |<a href="${url}">${url}</a>
-    """.stripMargin
-
-  def msgComment(url: String) = (content: String) => s"""
-    |${content}<br/>
-    |--<br/>
-    |<a href="${url}">View it on GitBucket</a>
-    """.stripMargin
-
-  def msgStatus(url: String) = (content: String) => s"""
-    |${content} <a href="${url}">#${url split('/') last}</a>
-    """.stripMargin
-}
-
-class Mailer(private val smtp: Smtp) extends Notifier {
-  private val logger = LoggerFactory.getLogger(classOf[Mailer])
-
-  def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
-      (msg: String => String)(implicit context: Context) = {
-    val database = Database(context.request.getServletContext)
-
-    val f = future {
-      // TODO Can we use the Database Session in other than Transaction Filter?
-      database withSession {
-        getIssue(r.owner, r.name, issueId.toString) foreach { issue =>
-          defining(
-              s"[${r.name}] ${issue.title} (#${issueId})" ->
-              msg(view.Markdown.toHtml(content, r, false, true))) { case (subject, msg) =>
-            recipients(issue) { to =>
-              val email = new HtmlEmail
-              email.setHostName(smtp.host)
-              email.setSmtpPort(smtp.port.get)
-              smtp.user.foreach { user =>
-                email.setAuthenticator(new DefaultAuthenticator(user, smtp.password.getOrElse("")))
-              }
-              smtp.ssl.foreach { ssl =>
-                email.setSSLOnConnect(ssl)
-              }
-              smtp.fromAddress
-                .map (_ -> smtp.fromName.orNull)
-                .orElse (Some("notifications@gitbucket.com" -> context.loginAccount.get.userName))
-                .foreach { case (address, name) =>
-                  email.setFrom(address, name)
-                }
-              email.setCharset("UTF-8")
-              email.setSubject(subject)
-              email.setHtmlMsg(msg)
-
-              email.addTo(to).send
-            }
-          }
-        }
-      }
-      "Notifications Successful."
-    }
-    f onSuccess {
-      case s => logger.debug(s)
-    }
-    f onFailure {
-      case t => logger.error("Notifications Failed.", t)
-    }
-  }
-}
-class MockMailer extends Notifier {
-  def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
-      (msg: String => String)(implicit context: Context): Unit = {}
+package util
+
+import scala.concurrent._
+import ExecutionContext.Implicits.global
+import org.apache.commons.mail.{DefaultAuthenticator, HtmlEmail}
+import org.slf4j.LoggerFactory
+
+import app.Context
+import model.Session
+import service.{AccountService, RepositoryService, IssuesService, SystemSettingsService}
+import servlet.Database
+import SystemSettingsService.Smtp
+import _root_.util.ControlUtil.defining
+
+trait Notifier extends RepositoryService with AccountService with IssuesService {
+  def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
+      (msg: String => String)(implicit context: Context): Unit
+
+  protected def recipients(issue: model.Issue)(notify: String => Unit)(implicit session: Session, context: Context) =
+    (
+        // individual repository's owner
+        issue.userName ::
+        // collaborators
+        getCollaborators(issue.userName, issue.repositoryName) :::
+        // participants
+        issue.openedUserName ::
+        getComments(issue.userName, issue.repositoryName, issue.issueId).map(_.commentedUserName)
+    )
+    .distinct
+    .withFilter ( _ != context.loginAccount.get.userName )	// the operation in person is excluded
+    .foreach ( getAccountByUserName(_) filterNot (_.isGroupAccount) filterNot (LDAPUtil.isDummyMailAddress(_)) foreach (x => notify(x.mailAddress)) )
+
+}
+
+object Notifier {
+  // TODO We want to be able to switch to mock.
+  def apply(): Notifier = new SystemSettingsService {}.loadSystemSettings match {
+    case settings if settings.notification => new Mailer(settings.smtp.get)
+    case _ => new MockMailer
+  }
+
+  def msgIssue(url: String) = (content: String) => s"""
+    |${content}<br/>
+    |--<br/>
+    |<a href="${url}">View it on GitBucket</a>
+    """.stripMargin
+
+  def msgPullRequest(url: String) = (content: String) => s"""
+    |${content}<hr/>
+    |View, comment on, or merge it at:<br/>
+    |<a href="${url}">${url}</a>
+    """.stripMargin
+
+  def msgComment(url: String) = (content: String) => s"""
+    |${content}<br/>
+    |--<br/>
+    |<a href="${url}">View it on GitBucket</a>
+    """.stripMargin
+
+  def msgStatus(url: String) = (content: String) => s"""
+    |${content} <a href="${url}">#${url split('/') last}</a>
+    """.stripMargin
+}
+
+class Mailer(private val smtp: Smtp) extends Notifier {
+  private val logger = LoggerFactory.getLogger(classOf[Mailer])
+
+  def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
+      (msg: String => String)(implicit context: Context) = {
+    val database = Database(context.request.getServletContext)
+
+    val f = Future {
+      database withSession { implicit session =>
+        getIssue(r.owner, r.name, issueId.toString) foreach { issue =>
+          defining(
+              s"[${r.name}] ${issue.title} (#${issueId})" ->
+              msg(view.Markdown.toHtml(content, r, false, true))) { case (subject, msg) =>
+            recipients(issue) { to =>
+              val email = new HtmlEmail
+              email.setHostName(smtp.host)
+              email.setSmtpPort(smtp.port.get)
+              smtp.user.foreach { user =>
+                email.setAuthenticator(new DefaultAuthenticator(user, smtp.password.getOrElse("")))
+              }
+              smtp.ssl.foreach { ssl =>
+                email.setSSLOnConnect(ssl)
+              }
+              smtp.fromAddress
+                .map (_ -> smtp.fromName.orNull)
+                .orElse (Some("notifications@gitbucket.com" -> context.loginAccount.get.userName))
+                .foreach { case (address, name) =>
+                  email.setFrom(address, name)
+                }
+              email.setCharset("UTF-8")
+              email.setSubject(subject)
+              email.setHtmlMsg(msg)
+
+              email.addTo(to).send
+            }
+          }
+        }
+      }
+      "Notifications Successful."
+    }
+    f onSuccess {
+      case s => logger.debug(s)
+    }
+    f onFailure {
+      case t => logger.error("Notifications Failed.", t)
+    }
+  }
+}
+class MockMailer extends Notifier {
+  def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
+      (msg: String => String)(implicit context: Context): Unit = {}
 }

src/main/scala/util/StringUtil.scala

@@ -46,6 +46,22 @@ object StringUtil {
       }
     }
 
+  /**
+   * Converts line separator in the given content.
+   *
+   * @param content the content
+   * @param lineSeparator "LF" or "CRLF"
+   * @return the converted content
+   */
+  def convertLineSeparator(content: String, lineSeparator: String): String = {
+    val lf = content.replace("\r\n", "\n").replace("\r", "\n")
+    if(lineSeparator == "CRLF"){
+      lf.replace("\n", "\r\n")
+    } else {
+      lf
+    }
+  }
+
   /**
    * Extract issue id like ```#issueId``` from the given message.
    *

src/main/scala/util/Validations.scala

@@ -10,7 +10,7 @@ trait Validations {
    */
   def identifier: Constraint = new Constraint(){
     override def validate(name: String, value: String, messages: Messages): Option[String] =
-      if(!value.matches("^[a-zA-Z0-9\\-_.]+$")){
+      if(!value.matches("[a-zA-Z0-9\\-_.]+")){
         Some(s"${name} contains invalid character.")
       } else if(value.startsWith("_") || value.startsWith("-")){
         Some(s"${name} starts with invalid character.")

src/main/scala/view/AvatarImageProvider.scala

@@ -1,7 +1,7 @@
 package view
 
 import service.RequestCache
-import twirl.api.Html
+import play.twirl.api.Html
 import util.StringUtil
 
 trait AvatarImageProvider { self: RequestCache =>

src/main/scala/view/Markdown.scala

@@ -51,7 +51,7 @@ class GitBucketLinkRender(context: app.Context, repository: service.RepositorySe
           (text, text)
         }
 
-        val url = repository.httpUrl.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/" + StringUtil.urlEncode(page)
+        val url = repository.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/wiki/" + StringUtil.urlEncode(page)
 
         if(getWikiPage(repository.owner, repository.name, page).isDefined){
           new Rendering(url, label)
@@ -109,10 +109,17 @@ class GitBucketHtmlSerializer(
   }
 
   private def fixUrl(url: String): String = {
-    if(!enableWikiLink || url.startsWith("http://") || url.startsWith("https://") || url.startsWith("#")){
-      url
+    if(!enableWikiLink){
+      if(url.startsWith("http://") || url.startsWith("https://") || url.startsWith("#") || url.startsWith("/") ||
+          context.currentPath.contains("/blob/")){
+        url
+      } else {
+        val paths = context.currentPath.split("/")
+        val branch = if(paths.length > 3) paths.last else repository.repository.defaultBranch
+        repository.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/blob/" + branch + "/" + url
+      }
     } else {
-      repository.httpUrl.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/_blob/" + url
+      repository.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/wiki/_blob/" + url
     }
   }
 

src/main/scala/view/helpers.scala

@@ -1,7 +1,7 @@
 package view
-import java.util.Date
+import java.util.{Date, TimeZone}
 import java.text.SimpleDateFormat
-import twirl.api.Html
+import play.twirl.api.Html
 import util.StringUtil
 import service.RequestCache
 
@@ -18,7 +18,11 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   /**
    * Format java.util.Date to "yyyy-MM-dd'T'hh:mm:ss'Z'".
    */
-  def datetimeRFC3339(date: Date): String = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss'Z'").format(date).replaceAll("(\\d\\d)(\\d\\d)$","$1:$2")
+  def datetimeRFC3339(date: Date): String = {
+    val sf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'")
+    sf.setTimeZone(TimeZone.getTimeZone("UTC"))
+    sf.format(date)
+  }
 
   /**
    * Format java.util.Date to "yyyy-MM-dd".
@@ -74,7 +78,7 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
    * This method looks up Gravatar if avatar icon has not been configured in user settings.
    */
   def avatar(commit: util.JGitUtil.CommitInfo, size: Int)(implicit context: app.Context): Html =
-    getAvatarImageHtml(commit.committer, size, commit.mailAddress)
+    getAvatarImageHtml(commit.authorName, size, commit.authorEmailAddress)
 
   /**
    * Converts commit id, issue id and username to the link.
@@ -196,7 +200,6 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
       case x if(x.endsWith(".sql"))     => "sql"
       case x if(x.endsWith(".tcl"))     => "tcl"
       case x if(x.endsWith(".vbs"))     => "vbscript"
-      case x if(x.endsWith(".tcl"))     => "tcl"
       case x if(x.endsWith(".yml"))     => "yaml"
       case _ => "plain_text"
     }