X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=conf%2FExecutable.properties;h=b8e7723e6941c46ff24fa8d4c805acefc5670387;hb=6ff5fdd71d597d015fdc1df7eb0a352f8086eaa9;hp=2e4e4194a7a8519bc2c9132781921302bc2e9f60;hpb=48a41a20fc325be91f8e6da1f42a75a983437b70;p=jabaws.git

diff --git a/conf/Executable.properties b/conf/Executable.properties
index 2e4e419..b8e7723 100644
--- a/conf/Executable.properties
+++ b/conf/Executable.properties
@@ -72,14 +72,15 @@ jronn.cluster.cpunum=4
 jronn.cluster.settings=-q 64bit-pri.q -pe smp 4 -l h_vmem=1700M -l ram=1700M -l h_cpu=24:00:00
 
 
-### Disembl configuration - NOT DISTRIBUTED ### 
+### Disembl configuration Tisean - Disembl dependancy cannot be redistributed (!) ### 
 #local.disembl.bin.windows= 
 local.disembl.bin=/homes/pvtroshin/soft/DisEMBL-1.4raw/DisEMBL.py
 cluster.disembl.bin=/homes/pvtroshin/soft/DisEMBL-1.4raw/DisEMBL.py
-#disembl.parameters.file=conf/settings/JronnParameters.xml
+disembl.parameters.file=conf/settings/DisemblParameters.xml
 disembl.limits.file=conf/settings/DisemblLimits.xml
 disembl.cluster.settings=-l h_cpu=24:00:00 -l h_vmem=6000M -l ram=6000M
 
+### AACon configuration ###
 local.aacon.bin.windows=D:\\Java\\jdk1.6.0_14\\bin\\java.exe 
 local.aacon.bin=/sw/java/latest/bin/java
 cluster.aacon.bin=/sw/java/latest/bin/java