enabling validation by requiring server and using OpenTox::Applicaiton, remove unnecessary subjectid

4 files changed, 5 insertions, 7 deletions

diff --git a/application.rb b/application.rb
index 6d489d3..2cc433c 100755
--- a/application.rb
+++ b/application.rb
@@ -1,8 +1,6 @@
 require 'rubygems'
-#gem "opentox-ruby"
-[ 'sinatra', 'ohm', 'benchmark' ].each do |lib|
-  require lib
-end
+require 'benchmark'
+require 'opentox-server'
 
 require "./test/test_application.rb"
 require "./report/report_application.rb"
diff --git a/lib/validation_db.rb b/lib/validation_db.rb
index ea9ceba..73a455e 100755
--- a/lib/validation_db.rb
+++ b/lib/validation_db.rb
@@ -177,7 +177,7 @@ module Validation
     
     def save
       super
-      OpenTox::Authorization.check_policy(crossvalidation_uri, OpenTox::RestClientWrapper.subjectid)
+      OpenTox::Authorization.check_policy(crossvalidation_uri)
     end
     
     public
diff --git a/report/report_application.rb b/report/report_application.rb
index 437fa0b..058a559 100755
--- a/report/report_application.rb
+++ b/report/report_application.rb
@@ -1,6 +1,6 @@
 require "./report/environment.rb"
 
-class Validation::Application < OpenTox::Service
+class Validation::Application < OpenTox::Application
 
   def perform
     @@report_service = Reports::ReportService.instance( to("/validation/report", :full) ) unless defined?@@report_service  
diff --git a/validation/validation_application.rb b/validation/validation_application.rb
index fa4f4d3..3deedc7 100755
--- a/validation/validation_application.rb
+++ b/validation/validation_application.rb
@@ -5,7 +5,7 @@ end
 require './lib/dataset_cache.rb'
 require './validation/validation_service.rb'
 
-class Validation::Application < OpenTox::Service
+class Validation::Application < OpenTox::Application
   
     helpers do
       def check_stratified(params)