New properties to work with work directories

git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4192 e3abac25-378b-4346-85de-24260fe3988d

diff --git a/conf/Engine.cluster.properties b/conf/Engine.cluster.properties
index 8ccacd6..7d0ccfb 100644 (file)
--- a/conf/Engine.cluster.properties
+++ b/conf/Engine.cluster.properties
@@ -7,19 +7,16 @@ engine.cluster.enable=true
 # Directory to use for temporary files storage\r
 # REQUIRED - cluster nodes must have access to this directory!\r
 # An absolute path is required \r
-cluster.tmp.directory=/homes/pvtroshin/workspace/jaba2/jobsout\r
+\r
+# Please note that statistic web application will only be able to generate links\r
+# to the job folders if this path is within JABA web application. \r
+# JABAWS statistic application just assume that the last name in the path is the \r
+# application folder in the root of JABAWS web application. \r
+cluster.tmp.directory=/cluster/gjb_lab/fc/www-jws2/jaba/jobsout\r
 \r
 # Enable/disable cluster statistics collector \r
 cluster.stat.collector.enable=true\r
 \r
-# The relative path for the JABAWS usage statistic application. \r
-# Optional.\r
-# Set this path if you would like to enable usage statistics \r
-# application to enable it to collect and display usage statistics.\r
-# This path must be relevant to the web application folder. Otherwise\r
-# the application will be unable to access the statistics. \r
-cluster.tmp.directory.relative=jobsout\r
-\r
 # Maximum amount of time the job is considered running in hours\r
 # Optional defaults to 7 days (168h) \r
 cluster.stat.maxruntime=24\r

diff --git a/conf/Engine.local.properties b/conf/Engine.local.properties
index ab0b229..d92c157 100644 (file)
--- a/conf/Engine.local.properties
+++ b/conf/Engine.local.properties
@@ -5,7 +5,7 @@ engine.local.enable=true
 # Directory to use for temporary files storage\r
 # OPTIONAL defaults to java temporary directory \r
 # Relative path within the project will be converted in absolute at runtime\r
-local.tmp.directory=jobsout \r
+local.tmp.directory=local_jobsout \r
  \r
 # Number of threads for tasks execution (valid values between 1 and 2x cpu. \r
 # Where x is a number of cores available in the system)\r