JWS-112 Updated AACon to version 1.1.

diff --git a/binaries/windows/compbio-conservation-1.1.jar b/binaries/windows/compbio-conservation-1.1.jar
new file mode 100755 (executable)
index 0000000..055f8e6
Binary files /dev/null and b/binaries/windows/compbio-conservation-1.1.jar differ

diff --git a/conf/Executable.properties b/conf/Executable.properties
index bd567f9..40cdf72 100644 (file)
--- a/conf/Executable.properties
+++ b/conf/Executable.properties
@@ -198,7 +198,7 @@ iupred.cluster.settings  = -P webservices -R y -q 64bit-pri.q -q c6100.q -l h_cp
 local.aacon.bin          = /homes/www-jws2/java/jdk/bin/java\r
 cluster.aacon.bin        = /homes/www-jws2/java/jdk/bin/java\r
 ### Path to the AACon library\r
-aacon.jar.file           = binaries/windows/aaconservation.jar\r
+aacon.jar.file           = binaries/windows/compbio-conservation-1.1.jar\r
 aacon.parameters.file    = conf/settings/AAConParameters.xml\r
 aacon.presets.file       = conf/settings/AAConPresets.xml\r
 aacon.limits.file        = conf/settings/AAConLimits.xml\r

diff --git a/conf/Executable.properties.dundee b/conf/Executable.properties.dundee
index d11fdc3..2e422ff 100644 (file)
--- a/conf/Executable.properties.dundee
+++ b/conf/Executable.properties.dundee
@@ -198,7 +198,7 @@ iupred.cluster.settings  = -P webservices -R y -q 64bit-pri.q -q c6100.q -l h_cp
 local.aacon.bin          = /homes/www-jws2/java/jdk/bin/java
 cluster.aacon.bin        = /homes/www-jws2/java/jdk/bin/java
 ### Path to the AACon library
-aacon.jar.file           = binaries/windows/aaconservation.jar
+aacon.jar.file           = binaries/windows/compbio-conservation-1.1.jar
 aacon.parameters.file    = conf/settings/AAConParameters.xml
 aacon.presets.file       = conf/settings/AAConPresets.xml
 aacon.limits.file        = conf/settings/AAConLimits.xml

diff --git a/webservices/compbio/ws/client/Services.java b/webservices/compbio/ws/client/Services.java
index a923f19..ec6ea0f 100644 (file)
--- a/webservices/compbio/ws/client/Services.java
+++ b/webservices/compbio/ws/client/Services.java
@@ -283,7 +283,10 @@ public enum Services {
        }\r
        \r
        static ServiceInfo AACON_INFO = new ServiceInfo(AAConWS,\r
-                       "in preparation", "1.0", "http://www.compbio.dundee.ac.uk/aacon");\r
+                       "Peter V. Troshin, Agnieszka Golicz, David M. A. Martin, Fábio Madeira, James B. Procter and Geoffrey J. Barton\r\n" +\r
+                       "\"AACon: A Fast Amino Acid Conservation Calculation Service\"\r\n" +\r
+                       "(2017) Paper in preparation.",\r
+                       "1.1", "http://www.compbio.dundee.ac.uk/aacon");\r
 \r
 //     static ServiceInfo JPRED_INFO = new ServiceInfo(JpredWS,\r
 //                     "Cole C, Barber JD, Barton GJ,\r\n" +\r