--- a/src/main/scala/bootstrap/liftweb/Boot.scala	Mon Apr 02 00:06:52 2012 +0200
+++ b/src/main/scala/bootstrap/liftweb/Boot.scala	Mon Apr 02 00:48:43 2012 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 Tomas Zeman <tzeman@volny.cz>
+ * Copyright 2011-2012 Tomas Zeman <tzeman@volny.cz>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,27 +17,20 @@
 
 import fis.base.model._
 import fis.crm.ui.{ContactSnippet, ContactSnippet2}
+import fis.db.SquerylTxMgr
 import net.liftweb.common._
-import net.liftweb.db.{DB, ConnectionIdentifier}
 import net.liftweb.http._
 import net.liftweb.sitemap._
 import net.liftweb.squerylrecord.SquerylRecord
 import net.liftweb.util._
 import net.liftweb.util.Helpers._
 import net.tz.lift.boot.ProtoBoot
-import net.tz.lift.util.StandardDBVendor
 
 class Boot extends ProtoBoot {
   override def boot = {
 
     /* DB stuff */
-    val dbVendor = new FisDbVendor
-    DB.defineConnectionManager(FisConnectionIdentifier, dbVendor)
-    S.addAround(DB.buildLoanWrapper(List(FisConnectionIdentifier)))
-    SquerylRecord.init(() => new SeqIdPostgreSqlAdapter)
-    SquerylTxMgr.initSqueryl(FisConnectionIdentifier,
-      () => new SeqIdPostgreSqlAdapter)
-    LiftRules.unloadHooks.append(dbVendor.closeAllConnections_! _)
+    SquerylTxMgr.init()
 
     super.boot
 
@@ -50,47 +43,4 @@
   }
 }
 
-case object FisConnectionIdentifier extends ConnectionIdentifier {
-  val jndiName = "fis"
-}
-
-import java.sql.Connection
-
-class FisDbVendor extends StandardDBVendor(
-  "org.postgresql.Driver", Props.get("db.fis.url", ""),
-  Props.get("db.fis.user"), Props.get("db.fis.pass")) {
-
-  val testQuery = "SELECT version()"
-  override protected def testConnection(c: Connection) = {
-    c.prepareStatement(testQuery).executeQuery
-  }
-}
-
-import org.squeryl._
-import org.squeryl.internals.DatabaseAdapter
-
-object SquerylTxMgr {
-  def initSqueryl(name: ConnectionIdentifier,
-    mkAdapter: () => DatabaseAdapter) = {
-    SessionFactory.externalTransactionManagementAdapter =
-    Some(new SquerylTxMgr(name, mkAdapter))
-  }
-}
-
-class SquerylTxMgr(name: ConnectionIdentifier, mkAdapter: () => DatabaseAdapter)
-  extends Loggable with Function0[Session] {
-
-  private object currentSession extends DynoVar[Session]
-
-
-  def apply = currentSession.is openOr {
-    DB.use(name) { superConn =>
-      val sess = Session.create(superConn.connection, mkAdapter())
-      sess.setLogger(s => logger.debug(s))
-      currentSession.set(sess)
-      sess
-    }
-  }
-}
-
 // vim: set ts=2 sw=2 et: