Merge branch 'slick2-compilation-problem'

src/main/scala/model/Profile.scala

@@ -1,9 +1,7 @@
 package model
 
-import slick.driver.JdbcProfile
-
 trait Profile {
-  val profile: JdbcProfile
+  val profile = slick.driver.H2Driver
   import profile.simple._
 
   // java.util.Date Mapped Column Types

src/main/scala/model/package.scala

@@ -1,10 +1,5 @@
-package object model extends {
-  // TODO [Slick 2.0]Should be configurable?
-  val profile = slick.driver.H2Driver
-  // TODO [Slick 2.0]To avoid compilation error about delete invocation. Why can't this error be resolved by import profile.simple._?
-  val simple = profile.simple
-
-} with AccountComponent
+package object model extends Profile
+  with AccountComponent
   with ActivityComponent
   with CollaboratorComponent
   with GroupMemberComponent
@@ -16,9 +11,11 @@ package object model extends {
   with PullRequestComponent
   with RepositoryComponent
   with SshKeyComponent
-  with WebHookComponent with Profile {
+  with WebHookComponent {
+
   /**
    * Returns system date.
    */
   def currentDate = new java.util.Date()
+
 }

src/main/scala/service/AccountService.scala

@@ -1,7 +1,7 @@
 package service
 
 import model._
-import simple._
+import profile.simple._
 // TODO [Slick 2.0]NOT import directly?
 import model.dateColumnType
 import service.SystemSettingsService.SystemSettings

src/main/scala/service/ActivityService.scala

@@ -1,7 +1,7 @@
 package service
 
 import model._
-import simple._
+import profile.simple._
 
 trait ActivityService {
 

src/main/scala/service/IssuesService.scala

@@ -4,7 +4,7 @@ import scala.slick.jdbc.{StaticQuery => Q}
 import Q.interpolation
 
 import model._
-import simple._
+import profile.simple._
 import util.Implicits._
 import util.StringUtil._
 

src/main/scala/service/LabelsService.scala

@@ -1,7 +1,7 @@
 package service
 
 import model._
-import simple._
+import profile.simple._
 
 trait LabelsService {
 

src/main/scala/service/MilestonesService.scala

@@ -1,7 +1,7 @@
 package service
 
 import model._
-import simple._
+import profile.simple._
 // TODO [Slick 2.0]NOT import directly?
 import model.dateColumnType
 

src/main/scala/service/PullRequestService.scala

@@ -1,7 +1,7 @@
 package service
 
 import model._
-import simple._
+import profile.simple._
 
 trait PullRequestService { self: IssuesService =>
   import PullRequestService._

src/main/scala/service/RepositorySearchService.scala

@@ -8,7 +8,7 @@ import org.eclipse.jgit.treewalk.TreeWalk
 import org.eclipse.jgit.lib.FileMode
 import org.eclipse.jgit.api.Git
 import model._
-import simple._
+import profile.simple._
 
 trait RepositorySearchService { self: IssuesService =>
   import RepositorySearchService._

src/main/scala/service/RepositoryService.scala

@@ -1,7 +1,7 @@
 package service
 
 import model._
-import simple._
+import profile.simple._
 import util.JGitUtil
 
 trait RepositoryService { self: AccountService =>

src/main/scala/service/SshKeyService.scala

@@ -1,7 +1,7 @@
 package service
 
 import model._
-import simple._
+import profile.simple._
 
 trait SshKeyService {
 

src/main/scala/service/WebHookService.scala

@@ -1,7 +1,7 @@
 package service
 
 import model._
-import simple._
+import profile.simple._
 import org.slf4j.LoggerFactory
 import service.RepositoryService.RepositoryInfo
 import util.JGitUtil

src/main/scala/servlet/PluginActionInvokeFilter.scala

@@ -50,7 +50,7 @@ class PluginActionInvokeFilter extends Filter with SystemSettingsService with Re
   }
 
   private def processRepositoryAction(path: String, request: HttpServletRequest, response: HttpServletResponse)
-                                     (implicit session: model.simple.Session): Boolean = {
+                                     (implicit session: model.profile.simple.Session): Boolean = {
     val elements = path.split("/")
     if(elements.length > 3){
       val owner  = elements(1)