JAL-1378 JWS-71 update to from-source build of JABA v2.1 client for use with JABA...

diff --git a/.classpath b/.classpath
index 20610cc..c22cae5 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -45,7 +45,8 @@
        <classpathentry kind="lib" path="lib/spring-core-3.0.5.RELEASE.jar"/>
        <classpathentry kind="lib" path="lib/spring-web-3.0.5.RELEASE.jar"/>
        <classpathentry kind="lib" path="lib/VARNAv3-9-dev.jar"/>
-       <classpathentry kind="lib" path="lib/min-jabaws-client-3.0.0.jar"/>
+       <classpathentry kind="lib" path="lib/groovy-all-1.8.2.jar"/>
+       <classpathentry kind="lib" path="lib/min-jabaws-client-2.1.0.jar" sourcepath="/clustengine"/>
        <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
        <classpathentry kind="output" path="classes"/>

diff --git a/lib/min-jabaws-client-3.0.0.jar b/lib/min-jabaws-client-2.1.0.jar
similarity index 71%
rename from lib/min-jabaws-client-3.0.0.jar
rename to lib/min-jabaws-client-2.1.0.jar
index bfa91f0..7ad030a 100644 (file)
Binary files a/lib/min-jabaws-client-3.0.0.jar and b/lib/min-jabaws-client-2.1.0.jar differ

diff --git a/src/jalview/ws/jws2/ParameterUtils.java b/src/jalview/ws/jws2/ParameterUtils.java
index 16959ff..e6b9f53 100644 (file)
--- a/src/jalview/ws/jws2/ParameterUtils.java
+++ b/src/jalview/ws/jws2/ParameterUtils.java
@@ -17,6 +17,7 @@
  */
 package jalview.ws.jws2;
 
+import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -126,6 +127,7 @@ public class ParameterUtils
   {
     copy.setName(option.getName());
     copy.setDescription(option.getDescription());
+    copy.setBasicURL(option.getBasicURL());
     copy.setFurtherDetails(option.getFurtherDetails());
     copy.setRequired(option.isRequired());
     List<String> names = option.getOptionNames();

diff --git a/src/jalview/ws/jws2/dm/JabaOption.java b/src/jalview/ws/jws2/dm/JabaOption.java
index 69f8f7b..7316d2f 100644 (file)
--- a/src/jalview/ws/jws2/dm/JabaOption.java
+++ b/src/jalview/ws/jws2/dm/JabaOption.java
@@ -20,6 +20,7 @@ package jalview.ws.jws2.dm;
 import jalview.ws.jws2.ParameterUtils;
 import jalview.ws.params.OptionI;
 
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 
@@ -49,7 +50,15 @@ public class JabaOption implements jalview.ws.params.OptionI
   @Override
   public URL getFurtherDetails()
   {
-    return opt.getFurtherDetails();
+    try {
+    return new URL(opt.getBasicURL().toExternalForm()+"/"+opt.getFurtherDetails());
+    }
+    catch (NullPointerException q) {}
+    catch (MalformedURLException q)
+    {
+      
+    }
+    return null;
   }
 
   @Override