From 1a9fc00301c42622302b0cbed6a7e86356025522 Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.de>
Date: Tue, 2 Feb 2010 17:00:49 +0100
Subject: centralized database configuration

---
 application.rb | 10 +---------
 config.ru      |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/application.rb b/application.rb
index 4abb1f7..26c5352 100644
--- a/application.rb
+++ b/application.rb
@@ -1,14 +1,6 @@
 require 'rubygems'
-gem 'opentox-ruby-api-wrapper', '=1.2.6'
+gem 'opentox-ruby-api-wrapper', '= 1.2.7'
 require 'opentox-ruby-api-wrapper'
-require 'dm-core'
-require 'dm-serializer'
-require 'dm-timestamps'
-require 'dm-types'
-
-
-#set :default_content, :yaml
-DataMapper::setup(:default, "sqlite3://#{Dir.pwd}/model.sqlite3")
 
 class Model
 	include DataMapper::Resource
diff --git a/config.ru b/config.ru
index 2863bdc..489932f 100644
--- a/config.ru
+++ b/config.ru
@@ -1,5 +1,5 @@
 require 'rubygems'
 require 'opentox-ruby-api-wrapper'
-require 'tasks/config'
+require 'config/config_ru'
 run Sinatra::Application
 
-- 
cgit v1.2.3