From: Daniel Barton <daluke.barton@gmail.com>
Date: Sat, 31 Aug 2013 11:04:35 +0000 (+0100)
Subject: merged conf/Executable.properties
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=dda5bcc58ff382e69cfda6749521d38771c9c0ad;p=jabaws.git

merged conf/Executable.properties
---

dda5bcc58ff382e69cfda6749521d38771c9c0ad
diff --cc conf/Executable.properties
index 333477e,28b9f66..3f2cbbb
--- a/conf/Executable.properties
+++ b/conf/Executable.properties
@@@ -199,5 -199,9 +199,9 @@@ aacon.presets.file=conf/settings/AAConP
  #####					RNAALIFOLD CONFIGURATION			 ######
  local.rnaalifold.bin.windows=binaries/windows/ViennaRNA/RNAalifold.exe
  local.rnaalifold.bin=binaries/src/ViennaRNA/Progs/RNAalifold
+ #cluster.rnaalifold.bin=/homes/www-jws2/test-servers/tomcat7-jaba3/webapps/jabawsRNA/binaries/src/ViennaRNA/Progs/RNAalifold
 -rnaalifold.parameters.file=conf/settings/RNAalifoldOptionsOnly.xml
 +rnaalifold.parameters.file=conf/settings/RNAalifoldParameters.xml
+ rnaalifold.limits.file=conf/settings/RNAalifoldLimits.xml
+ rnaalifold.cluster.settings=-P webservices -R y -l h_cpu=24:00:00 -l ram=6000M
+