remaining merge conflicts removed

1 files changed, 8 insertions, 0 deletions

diff --git a/application.rb b/application.rb
index f543167..ad9653a 100755
--- a/application.rb
+++ b/application.rb
@@ -3,6 +3,14 @@ gem "opentox-ruby", "~> 0"
 [ 'sinatra', 'sinatra/url_for', 'opentox-ruby' ].each do |lib|
   require lib
 end
+['dm-core', 'dm-serializer', 'dm-timestamps', 'dm-types', 'dm-migrations', 'dm-validations' ].each{|lib| require lib }
+DataMapper.setup(:default, { 
+    :adapter  => CONFIG[:database][:adapter],
+    :database => CONFIG[:database][:database],
+    :username => CONFIG[:database][:username],
+    :password => CONFIG[:database][:password],
+    :host     => CONFIG[:database][:host]})
+set :lock, true
 
 #unless(defined? LOGGER)
   #LOGGER = Logger.new(STDOUT)