New ProteoCache configuration

diff --git a/conf/Engine.properties b/conf/Engine.properties
deleted file mode 100644 (file)
index dd2a0db..0000000
--- a/conf/Engine.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-#################################################################################\r
-# enable or disable engine true | false\r
-# OPTIONAL defaults to true\r
-engine.local.enable=true \r
-\r
-#################################################################################\r
-# 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=/cluster/gjb_lab/fc/www-jws2/jaba/local_jobsout \r
-local.tmp.directory=jobsout \r
-\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
-# OPTIONAL defaults to the number of cores for core number <=4 and \r
-# number of cores-1 for greater core numbers\r
-engine.local.thread.number=2\r
-\r
-#################################################################################\r
-# Enable/disable cluster statistics collector\r
-local.stat.collector.enable=true\r
-# Frequency of statistics collecting (in minutes)\r
-# normal rate: once a date = 24 * 60 = 1440\r
-local.stat.collector.update.frequency=1\r
-\r
-# Maximum amount of time the job is considered running in hours\r
-# Optional defaults to 24 hours\r
-local.stat.maxruntime=6\r
-\r
-#################################################################################\r
-# Maximum amount of time the job directory is living (in hours), \r
-# -1 means the directories are never deleted\r
-# Defaults is one week, i.e. 168 hours\r
-local.jobdir.maxlifespan=168\r
-# Frequency of cleaning job directory (in minutes)\r
-# normal rate: once a date = 24 * 60 = 1440\r
-local.jobdir.cleaning.frequency=1\r

diff --git a/conf/Proteocache.properties b/conf/Proteocache.properties
index ae10be4..d52f487 100644 (file)
--- a/conf/Proteocache.properties
+++ b/conf/Proteocache.properties
@@ -1,7 +1,9 @@
 #################################################################################
 # Cassandra host or IP
 # test server is 10.0.115.190
-cassandra.host=localhost
+#cassandra.host=localhost
+#cassandra.host=10.31.0.97
+cassandra.host=gjb-www-1.cluster.lifesci.dundee.ac.uk
 
 cassandra.newtables.update=false
 
@@ -16,7 +18,6 @@ cassandra.jpred.web.updaterate=30
 # by defauls for 100 past days
 cassandra.jpred.web.period=5
 
-
 #################################################################################
 # local test job source
 cassandra.jpred.local.update=false
@@ -26,3 +27,9 @@ cassandra.jpred.local.updaterate=200
 # update time period (in days)
 # by defauls for 100 past days
 cassandra.jpred.local.period=300
+
+#################################################################################
+# archive features
+archive.enable=true
+archive.path = /home/asherstnev/Projects/Java.projects/proteocache/archive
+archive.web.dir=results
\ No newline at end of file