You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2006/11/21 07:53:46 UTC
svn commit: r477532 - in /incubator/openejb/trunk/openejb3: ./
assembly/openejb-standalone/ container/openejb-core/
container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/
container/openejb-core/src/main/resources/ container/openejb-core...
Author: dblevins
Date: Mon Nov 20 22:53:45 2006
New Revision: 477532
URL: http://svn.apache.org/viewvc?view=rev&rev=477532
Log:
OPENEJB-336: Derby Support
Added:
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/DerbyTestDatabase.java
Modified:
incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/JdbcManagedConnectionFactory.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java
incubator/openejb/trunk/openejb3/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java
incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml
incubator/openejb/trunk/openejb3/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpEjbServerTest.java
Modified: incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml?view=diff&rev=477532&r1=477531&r2=477532
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml Mon Nov 20 22:53:45 2006
@@ -155,6 +155,14 @@
<version>${pom.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ </dependency>
+ <dependency>
<groupId>idb</groupId>
<artifactId>idb</artifactId>
</dependency>
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml?view=diff&rev=477532&r1=477531&r2=477532
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml Mon Nov 20 22:53:45 2006
@@ -257,8 +257,8 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>idb</groupId>
- <artifactId>idb</artifactId>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/JdbcManagedConnectionFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/JdbcManagedConnectionFactory.java?view=diff&rev=477532&r1=477531&r2=477532
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/JdbcManagedConnectionFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/JdbcManagedConnectionFactory.java Mon Nov 20 22:53:45 2006
@@ -93,6 +93,8 @@
if (driver.equals("org.enhydra.instantdb.jdbc.idbDriver")) {
factory = new InstantdbPropertiesHack(factory, url);
factory = new ManagedConnectionFactoryPathHack(factory);
+ } else if (driver.equals("org.apache.derby.jdbc.EmbeddedDriver")) {
+ factory = new ManagedConnectionFactoryPathHack(factory);
}
JdbcConnectionRequestInfo info = new JdbcConnectionRequestInfo(defaultUserName, defaultPassword, driver, url);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?view=diff&rev=477532&r1=477531&r2=477532
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml Mon Nov 20 22:53:45 2006
@@ -58,21 +58,21 @@
PoolSize 100
- Engine instantdb
+ Engine derby
ConnectorName Default JDBC Database
# Driver class name
- JdbcDriver org.enhydra.instantdb.jdbc.idbDriver
+ JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
# Url for creating connections
- JdbcUrl jdbc:idb:conf/instantdb.properties
+ JdbcUrl jdbc:derby:derbyDB;create=true
# Default user name
- UserName Admin
+ UserName admin
# Default password
@@ -236,20 +236,19 @@
# Driver class name
- JdbcDriver org.enhydra.instantdb.jdbc.idbDriver
+ JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
# Url for creating connections
- JdbcUrl jdbc:idb:conf/instantdb.properties
+ JdbcUrl jdbc:derby:derbyDB;create=true
# Default user name
- UserName Admin
+ UserName admin
# Default password
Password pass
-
</ServiceProvider>
<!--
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml?view=diff&rev=477532&r1=477531&r2=477532
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml Mon Nov 20 22:53:45 2006
@@ -44,8 +44,8 @@
<o:jdbcConnectionFactory id="defaultJdbcDatabase"
defaultUserName="Admin"
defaultPassword="pass"
- url="jdbc:idb:conf/instantdb.properties"
- driver="org.enhydra.instantdb.jdbc.idbDriver"/>
+ url="jdbc:derby:derbyDB;create=true"
+ driver="org.apache.derby.jdbc.EmbeddedDriver"/>
<o:jndiBinding id="jndiBinding" context="#jndiContext">
<property name="bindings">
@@ -77,21 +77,21 @@
poolSize 100
- engine instantdb
+ engine derby
connectorName Default JDBC Database
# Driver class name
- jdbcDriver org.enhydra.instantdb.jdbc.idbDriver
+ jdbcDriver org.apache.derby.jdbc.EmbeddedDriver
# Url for creating connections
- jdbcUrl jdbc:idb:conf/instantdb.properties
+ jdbcUrl jdbc:derby:derbyDB;create=true
# Default user name
- userName Admin
+ userName admin
# Default password
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml?view=diff&rev=477532&r1=477531&r2=477532
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml Mon Nov 20 22:53:45 2006
@@ -41,8 +41,8 @@
<o:jdbcConnectionFactory id="defaultJdbcDatabase"
defaultUserName="Admin"
defaultPassword="pass"
- url="jdbc:idb:conf/instantdb.properties"
- driver="org.enhydra.instantdb.jdbc.idbDriver"/>
+ url="jdbc:derby:derbyDB;create=true"
+ driver="org.apache.derby.jdbc.EmbeddedDriver"/>
<o:jndiBinding id="jndiBinding" context="#jndiContext">
<property name="bindings">
@@ -74,21 +74,21 @@
poolSize 100
- engine instantdb
+ engine derby
connectorName Default JDBC Database
# Driver class name
- jdbcDriver org.enhydra.instantdb.jdbc.idbDriver
+ jdbcDriver org.apache.derby.jdbc.EmbeddedDriver
# Url for creating connections
- jdbcUrl jdbc:idb:conf/instantdb.properties
+ jdbcUrl jdbc:derby:derbyDB;create=true
# Default user name
- userName Admin
+ userName admin
# Default password
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf?view=diff&rev=477532&r1=477531&r2=477532
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf Mon Nov 20 22:53:45 2006
@@ -30,21 +30,21 @@
PoolSize 100
- Engine instantdb
+ Engine derby
ConnectorName Default JDBC Database
# Driver class name
- JdbcDriver org.enhydra.instantdb.jdbc.idbDriver
+ JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
# Url for creating connections
- JdbcUrl jdbc:idb:conf/instantdb.properties
+ JdbcUrl jdbc:derby:derbyDB;create=true
# Default user name
- UserName Admin
+ UserName admin
# Default password
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java?view=diff&rev=477532&r1=477531&r2=477532
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/iTest.java Mon Nov 20 22:53:45 2006
@@ -44,7 +44,7 @@
}
// org.apache.log4j.BasicConfigurator.configure();
System.setProperty("openejb.test.server", org.apache.openejb.test.IvmTestServer.class.getName());
- System.setProperty("openejb.test.database", org.apache.openejb.test.InstantDbTestDatabase.class.getName());
+ System.setProperty("openejb.test.database", org.apache.openejb.test.DerbyTestDatabase.class.getName());
System.setProperty("openejb.deployments.classpath", "true");
TestManager.init(null);
TestManager.start();
Added: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/DerbyTestDatabase.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/DerbyTestDatabase.java?view=auto&rev=477532
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/DerbyTestDatabase.java (added)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/DerbyTestDatabase.java Mon Nov 20 22:53:45 2006
@@ -0,0 +1,136 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.openejb.test;
+
+import org.apache.openejb.test.beans.Database;
+import org.apache.openejb.test.beans.DatabaseHome;
+
+import javax.naming.InitialContext;
+import java.rmi.RemoteException;
+import java.util.Properties;
+
+/**
+ *
+ * @author <a href="mailto:david.blevins@visi.com">David Blevins</a>
+ */
+public class DerbyTestDatabase implements TestDatabase{
+
+ protected Database database;
+ protected InitialContext initialContext;
+
+ private static String _createAccount = "CREATE TABLE account ( ssn VARCHAR(25), first_name VARCHAR(256), last_name VARCHAR(256), balance integer)";
+
+ private static String _dropAccount = "DROP TABLE account";
+
+ private static String _createEntity = "CREATE TABLE entity ( id integer GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), first_name VARCHAR(256), last_name VARCHAR(256) )";
+
+ private static String _dropEntity = "DROP TABLE entity";
+
+ static{
+ System.setProperty("noBanner", "true");
+ }
+
+
+ public void createEntityTable() throws java.sql.SQLException {
+ try{
+ try{
+ database.execute(DerbyTestDatabase._dropEntity);
+ } catch (Exception e){
+ // not concerned
+ }
+ database.execute(DerbyTestDatabase._createEntity);
+ } catch (RemoteException re){
+ if (re.detail != null && re.detail instanceof java.sql.SQLException) {
+ throw (java.sql.SQLException)re.detail;
+ } else {
+ throw new java.sql.SQLException("Cannot create entity table: "+re.getMessage(), DerbyTestDatabase._createEntity);
+ }
+ }
+ }
+ public void dropEntityTable() throws java.sql.SQLException {
+ try {
+ database.execute(DerbyTestDatabase._dropEntity);
+ } catch (RemoteException re){
+ if (re.detail != null && re.detail instanceof java.sql.SQLException) {
+ throw (java.sql.SQLException)re.detail;
+ } else {
+ throw new java.sql.SQLException("Unable to drop entity table: "+re.getMessage(), DerbyTestDatabase._dropEntity);
+ }
+ }
+ }
+
+
+ public void createAccountTable() throws java.sql.SQLException {
+ try{
+ try{
+ database.execute(DerbyTestDatabase._dropAccount);
+ } catch (Exception e){
+ // not concerned
+ }
+ database.execute(DerbyTestDatabase._createAccount);
+ } catch (RemoteException re){
+ if (re.detail != null && re.detail instanceof java.sql.SQLException) {
+ throw (java.sql.SQLException)re.detail;
+ } else {
+ throw new java.sql.SQLException("Cannot create account table: "+re.getMessage(), DerbyTestDatabase._createAccount);
+ }
+ }
+ }
+
+ public void dropAccountTable() throws java.sql.SQLException {
+ try {
+ database.execute(DerbyTestDatabase._dropAccount);
+ } catch (RemoteException re){
+ if (re.detail != null && re.detail instanceof java.sql.SQLException) {
+ throw (java.sql.SQLException)re.detail;
+ } else {
+ throw new java.sql.SQLException("Cannot drop account table: "+re.getMessage(), DerbyTestDatabase._dropAccount);
+ }
+ }
+ }
+
+ public void start() throws IllegalStateException {
+ try {
+ Properties properties = TestManager.getServer().getContextEnvironment();
+ initialContext = new InitialContext(properties);
+ } catch (Exception e){
+ throw (IllegalStateException) new IllegalStateException("Cannot create initial context: "+e.getClass().getName()+" "+e.getMessage()).initCause(e);
+ }
+
+ Object obj =null;
+ DatabaseHome databaseHome =null;
+ try {
+ /* Create database */
+ obj = initialContext.lookup("client/tools/DatabaseHome");
+ databaseHome = (DatabaseHome)javax.rmi.PortableRemoteObject.narrow( obj, DatabaseHome.class);
+ } catch (Exception e){
+ throw new IllegalStateException("Cannot find 'client/tools/DatabaseHome': "+e.getClass().getName()+" "+e.getMessage());
+ }
+ try {
+ database = databaseHome.create();
+ } catch (Exception e){
+ throw new IllegalStateException("Cannot start database: "+e.getClass().getName()+" "+e.getMessage());
+ }
+ }
+
+
+ public void stop() throws IllegalStateException {
+ }
+
+ public void init(Properties props) throws IllegalStateException {
+ }
+}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java?view=diff&rev=477532&r1=477531&r2=477532
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java Mon Nov 20 22:53:45 2006
@@ -110,7 +110,7 @@
System.setProperty("openejb.test.server",
"org.apache.openejb.test.IvmTestServer");
System.setProperty("openejb.test.database",
- "org.apache.openejb.test.InstantDbTestDatabase");
+ "org.apache.openejb.test.DerbyTestDatabase");
System.out.println("_________________________________________________");
System.out
@@ -123,7 +123,7 @@
System.setProperty("openejb.test.server",
"org.apache.openejb.test.RemoteTestServer");
System.setProperty("openejb.test.database",
- "org.apache.openejb.test.InstantDbTestDatabase");
+ "org.apache.openejb.test.DerbyTestDatabase");
System.out.println("_________________________________________________");
System.out
@@ -136,7 +136,7 @@
System.setProperty("openejb.test.server",
"org.apache.openejb.test.RemoteHttpTestServer");
System.setProperty("openejb.test.database",
- "org.apache.openejb.test.InstantDbTestDatabase");
+ "org.apache.openejb.test.DerbyTestDatabase");
System.out.println("_________________________________________________");
System.out
@@ -147,7 +147,7 @@
private static void runTomcatRemoteHttpTests() {
System.setProperty("openejb.test.server", TomcatRemoteTestServer.class.getName());
- System.setProperty("openejb.test.database", "org.apache.openejb.test.InstantDbTestDatabase");
+ System.setProperty("openejb.test.database", "org.apache.openejb.test.DerbyTestDatabase");
System.out.println("_________________________________________________");
System.out
Modified: incubator/openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/pom.xml?view=diff&rev=477532&r1=477531&r2=477532
==============================================================================
--- incubator/openejb/trunk/openejb3/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/pom.xml Mon Nov 20 22:53:45 2006
@@ -343,6 +343,16 @@
<version>1.0.4</version>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.2.1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>10.2.1.6</version>
+ </dependency>
+ <dependency>
<groupId>org.tranql</groupId>
<artifactId>tranql</artifactId>
<version>1.4-SNAPSHOT</version>
Modified: incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml?view=diff&rev=477532&r1=477531&r2=477532
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml Mon Nov 20 22:53:45 2006
@@ -49,8 +49,8 @@
<artifactId>geronimo-ejb_3.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>idb</groupId>
- <artifactId>idb</artifactId>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java?view=diff&rev=477532&r1=477531&r2=477532
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/RemoteiTest.java Mon Nov 20 22:53:45 2006
@@ -43,7 +43,7 @@
protected void setUp() throws Exception {
System.setProperty("openejb.test.server", EjbTestServer.class.getName());
- System.setProperty("openejb.test.database", org.apache.openejb.test.InstantDbTestDatabase.class.getName());
+ System.setProperty("openejb.test.database", org.apache.openejb.test.DerbyTestDatabase.class.getName());
TestManager.init(null);
TestManager.start();
}
Modified: incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml?view=diff&rev=477532&r1=477531&r2=477532
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml Mon Nov 20 22:53:45 2006
@@ -66,8 +66,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>idb</groupId>
- <artifactId>idb</artifactId>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/openejb/trunk/openejb3/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpEjbServerTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpEjbServerTest.java?view=diff&rev=477532&r1=477531&r2=477532
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpEjbServerTest.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/HttpEjbServerTest.java Mon Nov 20 22:53:45 2006
@@ -42,7 +42,7 @@
protected void setUp() throws Exception {
System.setProperty("openejb.test.server", HttpEjbTestServer.class.getName());
- System.setProperty("openejb.test.database", org.apache.openejb.test.InstantDbTestDatabase.class.getName());
+ System.setProperty("openejb.test.database", org.apache.openejb.test.DerbyTestDatabase.class.getName());
TestManager.init(null);
TestManager.start();
}