Permalink
Browse files

Issue #778. Moved the DB singleton to its own package

  • Loading branch information...
1 parent 9bc265b commit eca45300ae78e34623b54e52f5b5952a66681503 @dpp dpp committed Jan 25, 2011
@@ -52,7 +52,14 @@
<artifactId>lift-wizard_${scala.version}</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lift-mapper_${scala.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.26</version>
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2010 WorldWide Conferencing, LLC
+ * Copyright 2006-2011 WorldWide Conferencing, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package net.liftweb {
-package util {
+package net.liftweb
+package util
-import _root_.scala.xml._
+import scala.xml._
/**
* The Helpers object provides a lot of utility functions:<ul>
@@ -54,5 +54,7 @@ object SafeNodeSeq {
}
}
-}
-}
+/**
+ * The superclass for all Lift flow of control exceptions
+ */
+class LiftFlowOfControlException(msg: String) extends RuntimeException(msg)
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2010 WorldWide Conferencing, LLC
+ * Copyright 2007-2011 WorldWide Conferencing, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package net.liftweb {
-package http {
+package net.liftweb
+package http
-import _root_.net.liftweb.common._
-import _root_.net.liftweb.util._
+import net.liftweb.common._
+import net.liftweb.util._
/**
* This exception is used by LiftSession.destroySessionAndContinueInNewSession
@@ -38,10 +38,6 @@ object ContinueResponseException {
}
-/**
- * The superclass for all Lift flow of control exceptions
- */
-class LiftFlowOfControlException(msg: String) extends RuntimeException(msg)
class ResponseShortcutException(_response: => LiftResponse, val doNotices: Boolean) extends LiftFlowOfControlException("Shortcut") {
lazy val response = _response
@@ -73,5 +69,3 @@ object ResponseShortcutException {
}
-}
-}
@@ -21,6 +21,7 @@ package rest
import scala.collection.mutable.{HashMap, ListBuffer}
import net.liftweb.common._
import net.liftweb.actor._
+import net.liftweb.util._
final private[http] case class ContinuationException(req: Req, session: Box[LiftSession], f: ((=> LiftResponse) => Unit) => Unit) extends LiftFlowOfControlException("Continuation")
@@ -49,9 +49,16 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lift-mapper_${scala.version}</artifactId>
+ <artifactId>lift-webkit_${scala.version}</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lift-db_${scala.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.scala-tools.testing</groupId>
<artifactId>specs_${scala.version}</artifactId>
@@ -24,7 +24,7 @@ import JsCmds._
import common._
import util._
-import mapper._
+import db._
import Helpers._
import scala.xml._
import scala.reflect.Manifest
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2007-2010 WorldWide Conferencing, LLC
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <!--
+ ~ The Basics
+ -->
+ <parent>
+ <groupId>net.liftweb</groupId>
+ <artifactId>lift-persistence_2.8.1</artifactId>
+ <version>2.3-SNAPSHOT</version>
+ </parent>
+ <artifactId>lift-db_2.8.1</artifactId>
+
+ <!--
+ ~ More Project Information
+ -->
+ <name>Lift DB</name>
+ <description>
+ JDBC Database connection management
+ </description>
+
+ <!--
+ ~ Environment Settings
+ -->
+ <!-- <properties/> -->
+
+ <!--
+ ~ Dependency Settings
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>lift-util_${scala.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <!--
+ ~ Build Settings
+ -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ net.liftweb.db.*;version="${project.version}",
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!--
+ ~ Reporting Settings
+ -->
+ <!-- <reporting/> -->
+
+</project>
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2010 WorldWide Conferencing, LLC
+ * Copyright 2006-2011 WorldWide Conferencing, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package net.liftweb {
-package mapper {
+package net.liftweb
+package db
-import _root_.java.sql.Connection
-import _root_.net.liftweb.common._
+import java.sql.Connection
+import net.liftweb.common._
/**
* Vend JDBC connections
@@ -29,5 +29,3 @@ trait ConnectionManager {
def newSuperConnection(name: ConnectionIdentifier): Box[SuperConnection] = Empty
}
-}
-}
Oops, something went wrong.

0 comments on commit eca4530

Please sign in to comment.