Merge branch 'develop' into merge/JAL-1988_JAL-3772+JAL-3416+JAL-4054+JAL-4064

diff --git a/src/jalview/ws/dbsources/Rfam.java b/src/jalview/ws/dbsources/Rfam.java
index 98df166..12f2d27 100644 (file)
--- a/src/jalview/ws/dbsources/Rfam.java
+++ b/src/jalview/ws/dbsources/Rfam.java
@@ -35,7 +35,7 @@ abstract public class Rfam extends Xfam
 {
   static final String RFAM_BASEURL_KEY = "RFAM_BASEURL";
 
-  private static final String DEFAULT_RFAM_BASEURL = "https://rfam.xfam.org";
+  private static final String DEFAULT_RFAM_BASEURL = "https://rfam.org";
 
   static
   {

diff --git a/test/jalview/ws/dbsources/RfamFullTest.java b/test/jalview/ws/dbsources/RfamFullTest.java
index 87b963f..b0dbd8b 100644 (file)
--- a/test/jalview/ws/dbsources/RfamFullTest.java
+++ b/test/jalview/ws/dbsources/RfamFullTest.java
@@ -38,14 +38,14 @@ public class RfamFullTest
   @Test(groups = "Functional")
   public void testGetURL()
   {
-    String path = "rfam.xfam.org/family/ABC/alignment/full?gzip=1&download=1";
+    String path = "rfam.org/family/ABC/alignment/full?gzip=1&download=1";
 
     // with default value for domain
     String url = new RfamFull().getURL(" abc ");
     assertEquals(url, "https://" + path);
 
     // with override in properties
-    Cache.setProperty(Rfam.RFAM_BASEURL_KEY, "http://rfam.xfam.org");
+    Cache.setProperty(Rfam.RFAM_BASEURL_KEY, "http://rfam.org");
     url = new RfamFull().getURL(" abc ");
     assertEquals(url, "http://" + path);
   }

diff --git a/test/jalview/ws/dbsources/RfamSeedTest.java b/test/jalview/ws/dbsources/RfamSeedTest.java
index 1165d1f..3fc80b6 100644 (file)
--- a/test/jalview/ws/dbsources/RfamSeedTest.java
+++ b/test/jalview/ws/dbsources/RfamSeedTest.java
@@ -38,14 +38,14 @@ public class RfamSeedTest
   @Test(groups = "Functional")
   public void testGetURL()
   {
-    String path = "rfam.xfam.org/family/ABC/alignment/stockholm?gzip=1&download=1";
+    String path = "rfam.org/family/ABC/alignment/stockholm?gzip=1&download=1";
 
     // with default value for domain
     String url = new RfamSeed().getURL(" abc ");
     assertEquals(url, "https://" + path);
 
     // with override in properties
-    Cache.setProperty(Rfam.RFAM_BASEURL_KEY, "http://rfam.xfam.org");
+    Cache.setProperty(Rfam.RFAM_BASEURL_KEY, "http://rfam.org");
     url = new RfamSeed().getURL(" abc ");
     assertEquals(url, "http://" + path);
   }