Author: ieb
Date: Tue Jan 20 01:21:56 2009
New Revision: 735975
URL: http://svn.apache.org/viewvc?rev=735975&view=rev
Log:
SHINDIG-874
Switched to using Derby DB for the tests to ensure that transactions are fully
isolated and the there are no issues with
the DB. HSQLDB AFAIK does not have READ_COMMITTED which break transactions
between threads. It may not matter for the current
set of tests, but at some point we may create tests that need proper ACID
isolation.
Modified:
incubator/shindig/trunk/java/samples/pom.xml
incubator/shindig/trunk/java/samples/src/main/resources/META-INF/persistence.xml
Modified: incubator/shindig/trunk/java/samples/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/pom.xml?rev=735975&r1=735974&r2=735975&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/pom.xml (original)
+++ incubator/shindig/trunk/java/samples/pom.xml Tue Jan 20 01:21:56 2009
@@ -147,10 +147,5 @@
<artifactId>hibernate-tools</artifactId>
<version>3.2.0.ga</version>
</dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.1</version>
- </dependency>
</dependencies>
</project>
Modified:
incubator/shindig/trunk/java/samples/src/main/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/resources/META-INF/persistence.xml?rev=735975&r1=735974&r2=735975&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/main/resources/META-INF/persistence.xml
(original)
+++
incubator/shindig/trunk/java/samples/src/main/resources/META-INF/persistence.xml
Tue Jan 20 01:21:56 2009
@@ -11,11 +11,11 @@
<properties>
<property name="hibernate.hbm2ddl.auto" value="create"/>
<property name="hibernate.show_sql" value="true"/>
- <property name="hibernate.connection.driver_class"
value="org.hsqldb.jdbcDriver"/>
+ <property name="hibernate.connection.driver_class"
value="org.apache.derby.jdbc.EmbeddedDriver"/>
<property name="hibernate.connection.password" value=""/>
- <property name="hibernate.connection.url"
value="jdbc:hsqldb:."/>
+ <property name="hibernate.connection.url"
value="jdbc:derby:target/hibernatedb;create=true"/>
<property name="hibernate.connection.username" value="sa"/>
- <property name="hibernate.dialect"
value="org.hibernate.dialect.HSQLDialect"/>
+ <property name="hibernate.dialect"
value="org.hibernate.dialect.DerbyDialect"/>
</properties>
</persistence-unit>
@@ -25,11 +25,11 @@
<properties>
<property name="hibernate.hbm2ddl.auto" value="create"/>
<property name="hibernate.show_sql" value="true"/>
- <property name="hibernate.connection.driver_class"
value="org.hsqldb.jdbcDriver"/>
+ <property name="hibernate.connection.driver_class"
value="org.apache.derby.jdbc.EmbeddedDriver"/>
<property name="hibernate.connection.password" value=""/>
- <property name="hibernate.connection.url"
value="jdbc:hsqldb:."/>
+ <property name="hibernate.connection.url"
value="jdbc:derby:target/hibernatedb;create=true"/>
<property name="hibernate.connection.username" value="sa"/>
- <property name="hibernate.dialect"
value="org.hibernate.dialect.HSQLDialect"/>
+ <property name="hibernate.dialect"
value="org.hibernate.dialect.DerbyDialect"/>
</properties>
</persistence-unit>
@@ -43,7 +43,7 @@
<!-- properties are set in Bootstrap no here -->
<properties>
<property name="eclipselink.jdbc.driver"
value="org.apache.derby.jdbc.EmbeddedDriver"/>
- <property name="eclipselink.jdbc.url"
value="jdbc:derby:testdb;create=true"/>
+ <property name="eclipselink.jdbc.url"
value="jdbc:derby:target/eclipselinkdb;create=true"/>
<property name="eclipselink.jdbc.user" value="sa"/>
<property name="eclipselink.jdbc.password" value=" "/>
<property name="eclipselink.target-server" value="None"/>
@@ -90,4 +90,4 @@
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/>
</properties>
</persistence-unit>
-</persistence>
\ No newline at end of file
+</persistence>
