Merge remote branch 'mguetlein/test' into development

Conflicts:
	application.rb
	example.rb
	lib/validation_db.rb
	nightly/nightly.rb
	report/environment.rb
	test/test_examples.rb
	test/test_examples_util.rb

1 files changed, 3 insertions, 7 deletions

diff --git a/nightly/nightly.rb b/nightly/nightly.rb
index f68691e..07cd11a 100644..100755
--- a/nightly/nightly.rb
+++ b/nightly/nightly.rb
@@ -21,7 +21,7 @@ class Nightly
     validationExamples = ValidationExamples.select(select)
     return "please \"select\" validation examples:\n"+ValidationExamples.list if validationExamples.size==0
     
-    task_uri = OpenTox::Task.as_task() do
+    task = OpenTox::Task.create("Build nightly","nightly-validation-test-service") do |task| #,{:select => select, :dry_run => dry_run})
       LOGGER.info("Building nightly report")
       
       benchmarks = validationExamples.collect{ |e| ValidationBenchmark.new(e) }
@@ -35,7 +35,7 @@ class Nightly
         running << id
         Thread.new do
           begin
-            b.build
+            b.build()
           rescue => ex
             LOGGER.error "uncaught nightly build error: "+ex.message
           ensure
@@ -100,11 +100,7 @@ class Nightly
       #benchmarks.collect{|b| b.uris}.join(",")
       File.join(CONFIG[:services]["opentox-validation"],"nightly")
     end
-    if defined?(halt)
-      halt 202,task_uri
-    else
-      return task_uri
-    end
+    return_task(task)
   end
   
   class ValidationBenchmark