You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by rh...@apache.org on 2009/12/06 20:51:39 UTC
svn commit: r887754 - in /incubator/esme/trunk/server: pom.xml
src/main/scala/bootstrap/liftweb/Boot.scala
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)