Merge branch 'master' into webhook

src/main/scala/servlet/AutoUpdateListener.scala

@@ -113,6 +113,7 @@ class AutoUpdateListener extends org.h2.server.web.DbStarter {
   private val logger = LoggerFactory.getLogger(classOf[AutoUpdateListener])
   
   override def contextInitialized(event: ServletContextEvent): Unit = {
+    event.getServletContext.setInitParameter("db.url", s"jdbc:h2:${Directory.DatabaseHome}")
     super.contextInitialized(event)
     logger.debug("H2 started")
     

src/main/scala/servlet/GitRepositoryServlet.scala

@@ -24,21 +24,9 @@ class GitRepositoryServlet extends GitServlet {
   
   override def init(config: ServletConfig): Unit = {
     setReceivePackFactory(new GitBucketReceivePackFactory())
-    
-    // TODO are there any other ways...?
-    super.init(new ServletConfig(){
-      def getInitParameter(name: String): String = name match {
-        case "base-path"  => Directory.RepositoryHome
-        case "export-all" => "true"
-        case name => config.getInitParameter(name)
-      }
-      def getInitParameterNames(): java.util.Enumeration[String] = {
-        config.getInitParameterNames
-      }
-      
-      def getServletContext(): ServletContext = config.getServletContext
-      def getServletName(): String = config.getServletName
-    });
+    config.getServletContext.setInitParameter("base-path", Directory.RepositoryHome)
+    config.getServletContext.setInitParameter("export-all", "true")
+    super.init(config)
   }
   
 }

src/main/scala/servlet/TransactionFilter.scala

@@ -3,7 +3,6 @@ package servlet
 import javax.servlet._
 import org.slf4j.LoggerFactory
 import javax.servlet.http.HttpServletRequest
-import scala.slick.session.Database
 
 /**
  * Controls the transaction with the open session in view pattern.
@@ -21,15 +20,19 @@ class TransactionFilter extends Filter {
       // assets don't need transaction
       chain.doFilter(req, res)
     } else {
-      val context = req.getServletContext
-      Database.forURL(context.getInitParameter("db.url"),
-          context.getInitParameter("db.user"),
-          context.getInitParameter("db.password")) withTransaction {
+      Database(req.getServletContext) withTransaction {
         logger.debug("TODO begin transaction")
         chain.doFilter(req, res)
         logger.debug("TODO 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"))
+}