|
From: <car...@us...> - 2010-05-02 14:30:38
|
Revision: 96
http://polepos.svn.sourceforge.net/polepos/?rev=96&view=rev
Author: carlrosenberger
Date: 2010-05-02 14:30:32 +0000 (Sun, 02 May 2010)
Log Message:
-----------
cr: Updating to db4o 8.0 beta build. Some fixes to the ClassLoader dance: Anything that references
db4o directly needs to be loaded late from Db4oTeam, so the version from the VersionClassloader is used.
Modified Paths:
--------------
trunk/polepos/.classpath
trunk/polepos/src/org/polepos/Db4oVersionRace.java
trunk/polepos/src/org/polepos/runner/db4o/AbstractDb4oVersionsRaceRunner.java
trunk/polepos/src/org/polepos/teams/db4o/BahrainDb4o.java
trunk/polepos/src/org/polepos/teams/db4o/BarcelonaDb4o.java
trunk/polepos/src/org/polepos/teams/db4o/Db4oCar.java
trunk/polepos/src/org/polepos/teams/db4o/Db4oDriver.java
trunk/polepos/src/org/polepos/teams/db4o/Db4oTeam.java
trunk/polepos/src/org/polepos/teams/db4o/ImolaDb4o.java
trunk/polepos/src/org/polepos/teams/db4o/MelbourneDb4o.java
trunk/polepos/src/org/polepos/teams/db4o/MonacoDb4o.java
trunk/polepos/src/org/polepos/teams/db4o/MontrealDb4o.java
trunk/polepos/src/org/polepos/teams/db4o/NurburgringDb4o.java
trunk/polepos/src/org/polepos/teams/db4o/SepangDb4o.java
Added Paths:
-----------
trunk/polepos/lib/db4o-8.0.145.14388-all-java5.jar
Removed Paths:
-------------
trunk/polepos/src/org/polepos/runner/db4o/Db4oEngine.java
Modified: trunk/polepos/.classpath
===================================================================
--- trunk/polepos/.classpath 2010-03-02 13:32:00 UTC (rev 95)
+++ trunk/polepos/.classpath 2010-05-02 14:30:32 UTC (rev 96)
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="lib" path="lib/mysql-connector-java-3.1.6-bin.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-2.1/cglib-full-2.0.2.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-2.1/commons-collections-2.1.1.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-2.1/commons-lang-1.0.1.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-2.1/commons-logging-1.0.4.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-2.1/dom4j-1.4.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-2.1/ehcache-0.9.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-2.1/hibernate2.jar" sourcepath="C:/Java/hibernate-2.1/src"/>
- <classpathentry kind="lib" path="lib/hibernate-2.1/jta.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-2.1/odmg-3.0.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-2.1/xalan-2.4.0.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-2.1/xerces-2.4.0.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-2.1/xml-apis.jar"/>
- <classpathentry kind="lib" path="lib/sqlitejdbc-v038-native.jar"/>
- <classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="/ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.1.0/src/org.junit_3.8.1/junitsrc.zip"/>
- <classpathentry kind="lib" path="lib/derby.jar"/>
- <classpathentry kind="lib" path="lib/gnu-regexp-1.1.4.jar"/>
- <classpathentry kind="lib" path="lib/hsqldb.jar"/>
- <classpathentry kind="lib" path="lib/mckoidb.jar"/>
- <classpathentry kind="lib" path="lib/mkjdbc.jar"/>
- <classpathentry kind="lib" path="lib/graph/gnujaxp.jar"/>
- <classpathentry kind="lib" path="lib/graph/itext-1.2.jar"/>
- <classpathentry kind="lib" path="lib/graph/jcommon-1.0.0-pre2.jar"/>
- <classpathentry kind="lib" path="lib/graph/jfreechart-1.0.0-pre2.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.8.jar"/>
- <classpathentry kind="lib" path="lib/graph/velocity-dep-1.4.jar"/>
- <classpathentry kind="lib" path="lib/jdo.jar"/>
- <classpathentry kind="lib" path="lib/ant.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/gna-jorm-runtime-05.07.jar"/>
- <classpathentry kind="lib" path="lib/javassist.jar"/>
- <classpathentry kind="lib" path="lib/db4o-7.13.136.14180-all-java5.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="lib" path="lib/mysql-connector-java-3.1.6-bin.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-2.1/cglib-full-2.0.2.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-2.1/commons-collections-2.1.1.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-2.1/commons-lang-1.0.1.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-2.1/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-2.1/dom4j-1.4.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-2.1/ehcache-0.9.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-2.1/hibernate2.jar" sourcepath="C:/Java/hibernate-2.1/src"/>
+ <classpathentry kind="lib" path="lib/hibernate-2.1/jta.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-2.1/odmg-3.0.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-2.1/xalan-2.4.0.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-2.1/xerces-2.4.0.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-2.1/xml-apis.jar"/>
+ <classpathentry kind="lib" path="lib/sqlitejdbc-v038-native.jar"/>
+ <classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="/ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.1.0/src/org.junit_3.8.1/junitsrc.zip"/>
+ <classpathentry kind="lib" path="lib/derby.jar"/>
+ <classpathentry kind="lib" path="lib/gnu-regexp-1.1.4.jar"/>
+ <classpathentry kind="lib" path="lib/hsqldb.jar"/>
+ <classpathentry kind="lib" path="lib/mckoidb.jar"/>
+ <classpathentry kind="lib" path="lib/mkjdbc.jar"/>
+ <classpathentry kind="lib" path="lib/graph/gnujaxp.jar"/>
+ <classpathentry kind="lib" path="lib/graph/itext-1.2.jar"/>
+ <classpathentry kind="lib" path="lib/graph/jcommon-1.0.0-pre2.jar"/>
+ <classpathentry kind="lib" path="lib/graph/jfreechart-1.0.0-pre2.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.8.jar"/>
+ <classpathentry kind="lib" path="lib/graph/velocity-dep-1.4.jar"/>
+ <classpathentry kind="lib" path="lib/jdo.jar"/>
+ <classpathentry kind="lib" path="lib/ant.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/gna-jorm-runtime-05.07.jar"/>
+ <classpathentry kind="lib" path="lib/javassist.jar"/>
+ <classpathentry kind="lib" path="lib/db4o-8.0.145.14388-all-java5.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/polepos/lib/db4o-8.0.145.14388-all-java5.jar
===================================================================
(Binary files differ)
Property changes on: trunk/polepos/lib/db4o-8.0.145.14388-all-java5.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/polepos/src/org/polepos/Db4oVersionRace.java
===================================================================
--- trunk/polepos/src/org/polepos/Db4oVersionRace.java 2010-03-02 13:32:00 UTC (rev 95)
+++ trunk/polepos/src/org/polepos/Db4oVersionRace.java 2010-05-02 14:30:32 UTC (rev 96)
@@ -83,16 +83,16 @@
};
}
- public Driver[] drivers(Db4oEngine engine) {
+ public Driver[] drivers() {
return new Driver [] {
- new MelbourneDb4o(engine),
- new SepangDb4o(engine),
- new BahrainDb4o(engine),
- new ImolaDb4o(engine),
- new BarcelonaDb4o(engine),
- new MonacoDb4o(engine),
- new NurburgringDb4o(engine),
- new MontrealDb4o(engine),
+ new MelbourneDb4o(),
+ new SepangDb4o(),
+ new BahrainDb4o(),
+ new ImolaDb4o(),
+ new BarcelonaDb4o(),
+ new MonacoDb4o(),
+ new NurburgringDb4o(),
+ new MontrealDb4o(),
};
}
Modified: trunk/polepos/src/org/polepos/runner/db4o/AbstractDb4oVersionsRaceRunner.java
===================================================================
--- trunk/polepos/src/org/polepos/runner/db4o/AbstractDb4oVersionsRaceRunner.java 2010-03-02 13:32:00 UTC (rev 95)
+++ trunk/polepos/src/org/polepos/runner/db4o/AbstractDb4oVersionsRaceRunner.java 2010-05-02 14:30:32 UTC (rev 96)
@@ -32,7 +32,7 @@
public abstract class AbstractDb4oVersionsRaceRunner extends AbstractRunner {
- public abstract Driver[] drivers(Db4oEngine engine);
+ public abstract Driver[] drivers();
private String _workspace;
@@ -45,22 +45,21 @@
return db4oTeam(jarName, null);
}
- /*
- * ConfigurationSettings will have to be run against TRUNK only
- * otherwise we get ClassCastExceptions in the callback.
- */
- public Team configuredDb4oTeam(ConfigurationSetting[] configurations) {
- Db4oEngine engine = new Db4oEngine();
- return db4oTeam(engine, workspace(), null, drivers(engine), configurations);
+ public Team configuredDb4oTeam(ConfigurationSetting... configurations) {
+ return db4oTeam(workspace(), null, drivers(), configurations);
}
+ public Team configuredDb4oTeam(String jarName, ConfigurationSetting... configurations) {
+ return db4oTeam(jarName, null, drivers(), configurations);
+ }
+
+
public Team db4oTeam(int[] options) {
return db4oTeam(null, options) ;
}
public Team db4oTeam(String jarName, int[] options) {
- Db4oEngine engine = new Db4oEngine();
- return db4oTeam(engine, jarName, options, drivers(engine), null) ;
+ return db4oTeam(jarName, options, drivers(), null) ;
}
@Override
@@ -68,11 +67,11 @@
return DefaultReporterFactory.defaultReporters();
}
- private Team db4oTeam(Db4oEngine engine, String jarName, int[] options, Driver[] drivers, ConfigurationSetting[] configurations) {
+ private Team db4oTeam(String jarName, int[] options, Driver[] drivers, ConfigurationSetting[] configurations) {
try {
Team team = null;
if(jarName == null){
- team = instantiateTeam(engine, (Class<? extends Team>)Class.forName(Db4oTeam.class.getName()));
+ team = instantiateTeam((Class<? extends Team>)Class.forName(Db4oTeam.class.getName()));
}else{
String[] prefixes={"com.db4o.","org.polepos.teams.db4o."};
@@ -84,7 +83,7 @@
urls[urls.length - 1] = jarURL(workspace(), jarName);
ClassLoader loader=new VersionClassLoader(urls, prefixes, Team.class.getClassLoader());
- team = instantiateTeam(engine, (Class<? extends Team>)loader.loadClass(Db4oTeam.class.getName()));
+ team = instantiateTeam((Class<? extends Team>)loader.loadClass(Db4oTeam.class.getName()));
}
team.configure(options, configurations);
if(jarName != null){
@@ -103,9 +102,9 @@
}
}
- private Team instantiateTeam(Db4oEngine engine, Class<? extends Team> clazz) throws Exception {
- Constructor<? extends Team> constr = clazz.getConstructor(new Class<?>[] { Db4oEngine.class, Boolean.TYPE });
- return constr.newInstance(new Object[] { engine, Boolean.FALSE });
+ private Team instantiateTeam(Class<? extends Team> clazz) throws Exception {
+ Constructor<? extends Team> constr = clazz.getConstructor(new Class<?>[] {});
+ return constr.newInstance(new Object[] {});
}
private URL jarURL(String workspace, String jarName) throws MalformedURLException{
Deleted: trunk/polepos/src/org/polepos/runner/db4o/Db4oEngine.java
===================================================================
--- trunk/polepos/src/org/polepos/runner/db4o/Db4oEngine.java 2010-03-02 13:32:00 UTC (rev 95)
+++ trunk/polepos/src/org/polepos/runner/db4o/Db4oEngine.java 2010-05-02 14:30:32 UTC (rev 96)
@@ -1,92 +0,0 @@
-/* Copyright (C) 2009 Versant Inc. http://www.db4o.com */
-package org.polepos.runner.db4o;
-
-import java.io.*;
-
-import org.polepos.teams.db4o.*;
-
-import com.db4o.*;
-import com.db4o.config.*;
-import com.db4o.ext.*;
-import com.db4o.io.*;
-
-public class Db4oEngine {
-
- private ObjectServer _server;
-
- public static final int SERVER_PORT = 4488;
-
- public static final String SERVER_HOST = "localhost";
-
- public static final String SERVER_USER = "db4o";
-
- public static final String SERVER_PASSWORD = "db4o";
-
- public static final String FOLDER;
-
- static {
- FOLDER = Db4oTeam.class.getResource("/").getPath() + "data/db4o";
- }
-
- public static final String DB4O_FILE = "dbbench.yap";
-
- public static final String PATH = FOLDER + "/" + DB4O_FILE;
-
- private final Storage _storage =
-// new MemoryStorage();
- new CachingStorage(new FileStorage());
-
- private void startServer(Configuration config) {
-// ??? try {
-// deleteDatabaseFile();
-// }
-// catch (IOException e) {
-// throw new RuntimeException(e);
-// }
- if(_server == null){
- _server = Db4o.openServer(config, PATH, SERVER_PORT);
- _server.grantAccess(SERVER_USER, SERVER_PASSWORD);
- }
- }
-
- public void stopServer() {
- if(_server != null){
- _server.close();
- _server = null;
- }
- }
-
- /**
- * get rid of the database file.
- * @throws IOException
- */
- public void deleteDatabaseFile() throws IOException {
- stopServer();
- _storage.delete(PATH);
- }
-
- public final String databaseFile(){
- return PATH;
- }
-
- public ExtObjectContainer openFile(Configuration config) {
- return Db4o.openFile(config(config), PATH).ext();
- }
-
- public ExtObjectContainer openNetworkingClient(Configuration config) {
- Configuration enhConfig = config(config);
- startServer(enhConfig);
- return Db4o.openClient(enhConfig, SERVER_HOST, SERVER_PORT, SERVER_USER, SERVER_PASSWORD).ext();
- }
-
- public ExtObjectContainer openEmbeddedClient(Configuration config) {
- Configuration enhConfig = config(config);
- startServer(enhConfig);
- return _server.openClient().ext();
- }
-
- private Configuration config(Configuration config) {
- config.storage(_storage);
- return config;
- }
-}
Modified: trunk/polepos/src/org/polepos/teams/db4o/BahrainDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/BahrainDb4o.java 2010-03-02 13:32:00 UTC (rev 95)
+++ trunk/polepos/src/org/polepos/teams/db4o/BahrainDb4o.java 2010-05-02 14:30:32 UTC (rev 96)
@@ -34,10 +34,6 @@
*/
public class BahrainDb4o extends Db4oDriver implements BahrainDriver{
- public BahrainDb4o(Db4oEngine engine) {
- super(engine);
-
- }
@Override
public void configure(Configuration config) {
Modified: trunk/polepos/src/org/polepos/teams/db4o/BarcelonaDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/BarcelonaDb4o.java 2010-03-02 13:32:00 UTC (rev 95)
+++ trunk/polepos/src/org/polepos/teams/db4o/BarcelonaDb4o.java 2010-05-02 14:30:32 UTC (rev 96)
@@ -29,10 +29,6 @@
public class BarcelonaDb4o extends Db4oDriver implements BarcelonaDriver{
- public BarcelonaDb4o(Db4oEngine engine) {
- super(engine);
-
- }
@Override
public void configure(Configuration config) {
Modified: trunk/polepos/src/org/polepos/teams/db4o/Db4oCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/Db4oCar.java 2010-03-02 13:32:00 UTC (rev 95)
+++ trunk/polepos/src/org/polepos/teams/db4o/Db4oCar.java 2010-05-02 14:30:32 UTC (rev 96)
@@ -19,16 +19,38 @@
package org.polepos.teams.db4o;
+import java.io.*;
+
import org.polepos.framework.*;
-import org.polepos.runner.db4o.*;
import com.db4o.*;
import com.db4o.config.*;
import com.db4o.ext.*;
+import com.db4o.io.*;
public class Db4oCar extends Car {
+
+ private ObjectServer _server;
+ public static final int SERVER_PORT = 4488;
+
+ public static final String SERVER_HOST = "localhost";
+
+ public static final String SERVER_USER = "db4o";
+
+ public static final String SERVER_PASSWORD = "db4o";
+
+ public static final String FOLDER;
+
+ static {
+ FOLDER = Db4oTeam.class.getResource("/").getPath() + "data/db4o";
+ }
+
+ public static final String DB4O_FILE = "dbbench.yap";
+
+ public static final String PATH = FOLDER + "/" + DB4O_FILE;
+
private String name;
private int[] _options;
@@ -54,21 +76,21 @@
/**
* Open database in the configured mode.
*/
- public ExtObjectContainer openObjectContainer(Db4oEngine engine, Configuration config)
+ public ExtObjectContainer openObjectContainer(Configuration config)
{
configure(config);
if (!isClientServer()) {
- return engine.openFile(config);
+ return openFile(config);
}
if(isClientServerOverTcp()){
- return engine.openNetworkingClient(config);
+ return openNetworkingClient(config);
}
// embedded client server mode
- return engine.openEmbeddedClient(config);
+ return openEmbeddedClient(config);
}
-
- private boolean isClientServer() {
+
+ private boolean isClientServer() {
return Db4oOptions.containsOption(_options, Db4oOptions.CLIENT_SERVER);
}
@@ -81,8 +103,22 @@
config.messageLevel(-1);
if(_configurations != null){
+
+ ClassLoader loader=this.getClass().getClassLoader();
+
for(ConfigurationSetting setting : _configurations){
- setting.apply(config);
+ try{
+ String settingsClassName = setting.getClass().getName();
+ Class<?> loadedClass = loader.loadClass(settingsClassName);
+ ConfigurationSetting newInstance = (ConfigurationSetting) loadedClass.newInstance();
+ newInstance.apply(config);
+ } catch ( Throwable t){
+ // Hint: ConfigurationSetting should be in the com.db4o namespace,
+ // so it gets loaded by the version ClassLoader.
+ System.err.println("db4o option not available in this version");
+
+ t.printStackTrace();
+ }
}
}
@@ -119,5 +155,71 @@
}
}
+ private Storage newStorage(){
+ // return new MemoryStorage();
+ return new CachingStorage(new FileStorage());
+ }
+ private Storage _storage;
+
+ private void startServer(Configuration config) {
+ if(_server == null){
+ _server = Db4o.openServer(config, PATH, SERVER_PORT);
+ _server.grantAccess(SERVER_USER, SERVER_PASSWORD);
+ }
+ }
+
+ public void stopServer() {
+ if(_server != null){
+ _server.close();
+ _server = null;
+ }
+ }
+
+ public void deleteDatabaseFile() throws IOException {
+ stopServer();
+ try{
+ storage().delete(PATH);
+ }catch (Throwable t){
+ System.err.println("Storages not yet available in this db4o version.");
+ new File(PATH).delete();
+ t.printStackTrace();
+ }
+ }
+
+ public final String databaseFile(){
+ return PATH;
+ }
+
+ public ExtObjectContainer openFile(Configuration config) {
+ return Db4o.openFile(config(config), PATH).ext();
+ }
+
+ public ExtObjectContainer openNetworkingClient(Configuration config) {
+ startServer(config(config));
+ return Db4o.openClient(config(config), SERVER_HOST, SERVER_PORT, SERVER_USER, SERVER_PASSWORD).ext();
+ }
+
+ public ExtObjectContainer openEmbeddedClient(Configuration config) {
+ startServer(config(config));
+ return _server.openClient().ext();
+ }
+
+ private Configuration config(Configuration config) {
+ try{
+ config.storage(storage());
+ }catch (Throwable t){
+ System.err.println("Storages not yet available in this db4o version.");
+ t.printStackTrace();
+ }
+ return config;
+ }
+
+ private Storage storage() {
+ if(_storage == null){
+ _storage = newStorage();
+ }
+ return _storage;
+ }
+
}
Modified: trunk/polepos/src/org/polepos/teams/db4o/Db4oDriver.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/Db4oDriver.java 2010-03-02 13:32:00 UTC (rev 95)
+++ trunk/polepos/src/org/polepos/teams/db4o/Db4oDriver.java 2010-05-02 14:30:32 UTC (rev 96)
@@ -20,7 +20,6 @@
package org.polepos.teams.db4o;
import org.polepos.framework.*;
-import org.polepos.runner.db4o.*;
import com.db4o.*;
import com.db4o.config.*;
@@ -32,18 +31,12 @@
*/
public abstract class Db4oDriver extends Driver {
- private final Db4oEngine _engine;
-
- protected Db4oDriver(Db4oEngine engine) {
- _engine = engine;
- }
-
private ExtObjectContainer _container;
public void prepare() {
Configuration config = Db4o.newConfiguration();
configure(config);
- _container = ((Db4oCar) car()).openObjectContainer(_engine, config);
+ _container = ((Db4oCar) car()).openObjectContainer(config);
}
public abstract void configure(Configuration config);
Modified: trunk/polepos/src/org/polepos/teams/db4o/Db4oTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/Db4oTeam.java 2010-03-02 13:32:00 UTC (rev 95)
+++ trunk/polepos/src/org/polepos/teams/db4o/Db4oTeam.java 2010-05-02 14:30:32 UTC (rev 96)
@@ -24,45 +24,39 @@
import java.util.*;
import org.polepos.framework.*;
-import org.polepos.runner.db4o.*;
public class Db4oTeam extends Team {
- private final Db4oEngine _engine;
-
private String _name = db4oName();
private final List<Driver> _drivers;
private int[] _options;
- private ConfigurationSetting[] _configurations;
+ private ConfigurationSetting[] _configurations;
- public Db4oTeam(Db4oEngine engine, boolean loadDrivers) {
- _engine = engine;
+ private final Car[] _cars = new Car[]{ new Db4oCar(_options, _configurations) };
+
+ public Db4oTeam(boolean loadDrivers) {
_drivers = new ArrayList<Driver>();
if(loadDrivers) {
- addDrivers(engine);
+ addDrivers();
}
}
- public Db4oTeam(Db4oEngine engine) {
- this(engine, true);
- }
-
public Db4oTeam() {
- this(new Db4oEngine());
+ this(true);
}
- private void addDrivers(Db4oEngine engine){
- addDriver(new MelbourneDb4o(engine));
- addDriver(new SepangDb4o(engine));
- addDriver(new BahrainDb4o(engine));
- addDriver(new ImolaDb4o(engine));
- addDriver(new BarcelonaDb4o(engine));
- addDriver(new MonacoDb4o(engine));
- addDriver(new NurburgringDb4o(engine));
- addDriver(new MontrealDb4o(engine));
+ private void addDrivers(){
+ addDriver(new MelbourneDb4o());
+ addDriver(new SepangDb4o());
+ addDriver(new BahrainDb4o());
+ addDriver(new ImolaDb4o());
+ addDriver(new BarcelonaDb4o());
+ addDriver(new MonacoDb4o());
+ addDriver(new NurburgringDb4o());
+ addDriver(new MontrealDb4o());
}
@Override
@@ -77,7 +71,7 @@
@Override
public Car[] cars(){
- return new Car[]{ new Db4oCar(_options, _configurations) };
+ return _cars;
}
public void addDriver(Driver driver){
@@ -87,8 +81,8 @@
public void addDriver(String driverName){
try {
Class<?> clazz = this.getClass().getClassLoader().loadClass(driverName);
- Constructor<?> constr = clazz.getConstructor(Db4oEngine.class);
- addDriver((Driver)constr.newInstance(_engine));
+ Constructor<?> constr = clazz.getConstructor();
+ addDriver((Driver)constr.newInstance());
} catch (Exception e) {
e.printStackTrace();
@@ -165,31 +159,27 @@
}
protected void setUp() {
- new File(Db4oEngine.FOLDER).mkdirs();
+ new File(Db4oCar.FOLDER).mkdirs();
try {
- _engine.deleteDatabaseFile();
+ defaultCar().deleteDatabaseFile();
}
catch (IOException e) {
throw new RuntimeException(e);
}
}
+ private Db4oCar defaultCar() {
+ Car car = cars()[0];
+ return (Db4oCar) car;
+ }
+
protected void tearDown() {
- _engine.stopServer();
+ defaultCar().stopServer();
}
public final String databaseFile(){
- return _engine.databaseFile();
+ return defaultCar().databaseFile();
}
-
- /**
- * get rid of the database file.
- * @throws IOException
- */
- private void deleteDatabaseFile() throws IOException
- {
- _engine.deleteDatabaseFile();
- }
public void setJarName(String jarName){
_name = _name.replaceAll("db4o", jarName);
Modified: trunk/polepos/src/org/polepos/teams/db4o/ImolaDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/ImolaDb4o.java 2010-03-02 13:32:00 UTC (rev 95)
+++ trunk/polepos/src/org/polepos/teams/db4o/ImolaDb4o.java 2010-05-02 14:30:32 UTC (rev 96)
@@ -28,10 +28,6 @@
public class ImolaDb4o extends Db4oDriver implements ImolaDriver {
- public ImolaDb4o(Db4oEngine engine) {
- super(engine);
-
- }
@Override
public void configure(Configuration config) {
Modified: trunk/polepos/src/org/polepos/teams/db4o/MelbourneDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/MelbourneDb4o.java 2010-03-02 13:32:00 UTC (rev 95)
+++ trunk/polepos/src/org/polepos/teams/db4o/MelbourneDb4o.java 2010-05-02 14:30:32 UTC (rev 96)
@@ -33,11 +33,6 @@
*/
public class MelbourneDb4o extends Db4oDriver implements MelbourneDriver{
-
- public MelbourneDb4o(Db4oEngine engine) {
- super(engine);
-
- }
@Override
public void configure(Configuration config) {
Modified: trunk/polepos/src/org/polepos/teams/db4o/MonacoDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/MonacoDb4o.java 2010-03-02 13:32:00 UTC (rev 95)
+++ trunk/polepos/src/org/polepos/teams/db4o/MonacoDb4o.java 2010-05-02 14:30:32 UTC (rev 96)
@@ -28,10 +28,6 @@
public class MonacoDb4o extends Db4oDriver implements MonacoDriver{
- public MonacoDb4o(Db4oEngine engine) {
- super(engine);
-
- }
@Override
public void configure(Configuration config) {
Modified: trunk/polepos/src/org/polepos/teams/db4o/MontrealDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/MontrealDb4o.java 2010-03-02 13:32:00 UTC (rev 95)
+++ trunk/polepos/src/org/polepos/teams/db4o/MontrealDb4o.java 2010-05-02 14:30:32 UTC (rev 96)
@@ -11,10 +11,6 @@
public class MontrealDb4o extends Db4oDriver implements MontrealDriver {
- public MontrealDb4o(Db4oEngine engine) {
- super(engine);
-
- }
@Override
public void configure(Configuration config) {
Modified: trunk/polepos/src/org/polepos/teams/db4o/NurburgringDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/NurburgringDb4o.java 2010-03-02 13:32:00 UTC (rev 95)
+++ trunk/polepos/src/org/polepos/teams/db4o/NurburgringDb4o.java 2010-05-02 14:30:32 UTC (rev 96)
@@ -28,10 +28,6 @@
public class NurburgringDb4o extends Db4oDriver implements NurburgringDriver{
- public NurburgringDb4o(Db4oEngine engine) {
- super(engine);
-
- }
@Override
public void configure(Configuration config) {
Modified: trunk/polepos/src/org/polepos/teams/db4o/SepangDb4o.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/db4o/SepangDb4o.java 2010-03-02 13:32:00 UTC (rev 95)
+++ trunk/polepos/src/org/polepos/teams/db4o/SepangDb4o.java 2010-05-02 14:30:32 UTC (rev 96)
@@ -29,10 +29,6 @@
*/
public class SepangDb4o extends Db4oDriver implements SepangDriver{
- public SepangDb4o(Db4oEngine engine) {
- super(engine);
-
- }
@Override
public void configure(Configuration config) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
