Return-Path: 
 <esme-commits-return-266-apmail-incubator-esme-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-esme-commits-archive@minotaur.apache.org
Received: (qmail 72953 invoked from network); 6 Dec 2009 19:52:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 6 Dec 2009 19:52:09 -0000
Received: (qmail 82830 invoked by uid 500); 6 Dec 2009 19:52:09 -0000
Delivered-To: apmail-incubator-esme-commits-archive@incubator.apache.org
Received: (qmail 82802 invoked by uid 500); 6 Dec 2009 19:52:09 -0000
Mailing-List: contact esme-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:esme-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:esme-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:esme-commits@incubator.apache.org>
List-Id: <esme-commits.incubator.apache.org>
Reply-To: esme-dev@incubator.apache.org
Delivered-To: mailing list esme-commits@incubator.apache.org
Received: (qmail 82792 invoked by uid 99); 6 Dec 2009 19:52:09 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Dec 2009 19:52:09 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Dec 2009 19:52:00 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7A4012388962; Sun,  6 Dec 2009 19:51:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r887754 - in /incubator/esme/trunk/server: pom.xml
 src/main/scala/bootstrap/liftweb/Boot.scala
Date: Sun, 06 Dec 2009 19:51:39 -0000
To: esme-commits@incubator.apache.org
From: rhirsch@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091206195139.7A4012388962@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rhirsch
Date: Sun Dec  6 19:51:39 2009
New Revision: 887754

URL: http://svn.apache.org/viewvc?rev=887754&view=rev
Log:
[ESME-142] Get tests running on an in-memory DB (H2 or Derby)
Patch from Ethan Jewett applied

Modified:
    incubator/esme/trunk/server/pom.xml
    incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala

Modified: incubator/esme/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/pom.xml?rev=887754&r1=887753&r2=887754&view=diff
==============================================================================
--- incubator/esme/trunk/server/pom.xml (original)
+++ incubator/esme/trunk/server/pom.xml Sun Dec  6 19:51:39 2009
@@ -47,8 +47,14 @@
         <repository>
             <id>opendmk</id>
             <name>Java Dynamic Management Kit</name>
-            <url>http://maven.tigase.org/</url>
-        </repository>
+            <url>http://maven.tigase.org/</url>    
+        </repository>                              
+		<repository>
+		  <id>Apache Repo</id>
+		  <name>Apache repository for Derby 10.5.1.1</name>
+		  <url>http://people.apache.org/repo/m1-ibiblio-rsync-repository</url>
+		  <layout>legacy</layout>
+		</repository>
     </repositories>
 
     <pluginRepositories>
@@ -141,17 +147,23 @@
             <artifactId>compass</artifactId>
             <version>${compass.version}</version>
         </dependency>
-
         <dependency>
             <groupId>postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <version>8.2-507.jdbc3</version>
-        </dependency>
+        </dependency>   
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>10.2.2.0</version>
-        </dependency>
+            <version>10.5.1.1</version>
+        </dependency>       
+      <!--
+        <dependency>
+	        <groupId>com.h2database</groupId>
+	        <artifactId>h2</artifactId>
+	        <version>1.2.124</version>
+	    </dependency>
+	  -->  
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>

Modified: incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=887754&r1=887753&r2=887754&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Sun Dec  6 19:51:39 2009
@@ -258,8 +258,8 @@
       Full(dm)
     } else {
       val driverName = Props.mode match {
-        case Props.RunModes.Test => "jdbc:derby:esme_test_db;create=true"
-        case _ => "jdbc:derby:esme_db;create=true"
+        case Props.RunModes.Test => "jdbc:derby:memory:esme_test_db;create=true"
+        case _ => "jdbc:derby:memory:esme_db;create=true"
       }
 
       val dm = DriverManager.getConnection(driverName)