From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 23 Oct 2014 22:02:54 +0000 (+0100)
Subject: Merge branch 'hotfix/JAL-1521' into develop
X-Git-Tag: Jalview_2_9~152^2~10
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3b20366969476761c4756c0d19789953a66f26af;hp=bb8d445ac21fbb53ec754d9acdd18a693e6d80d9;p=jalview.git

Merge branch 'hotfix/JAL-1521' into develop

Conflicts:
	.classpath
	RELEASE
---

diff --git a/.classpath b/.classpath
index 73cb502..ada4002 100644
--- a/.classpath
+++ b/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="utils"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
 	<classpathentry kind="lib" path="lib/activation.jar"/>
 	<classpathentry kind="lib" path="lib/axis.jar" sourcepath="D:/axis-1_2RC2-src/axis-1_2RC2"/>
 	<classpathentry kind="lib" path="lib/commons-discovery.jar"/>
@@ -14,7 +14,6 @@
 	<classpathentry kind="lib" path="lib/saaj.jar"/>
 	<classpathentry kind="lib" path="lib/wsdl4j.jar"/>
 	<classpathentry kind="lib" path="lib/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="lib/xml-apis.jar"/>
 	<classpathentry kind="lib" path="lib/castor-1.1-cycle-xml.jar" sourcepath="C:/Documents and Settings/JimP/workspace-3.3/castor/src/main/java"/>
 	<classpathentry kind="lib" path="lib/JGoogleAnalytics_0.3.jar" sourcepath="/JGoogleAnalytics/src/main/java"/>
 	<classpathentry kind="lib" path="lib/vamsas-client.jar"/>
@@ -51,6 +50,8 @@
 	<classpathentry kind="lib" path="lib/slf4j-log4j12-1.7.7.jar"/>
 	<classpathentry kind="lib" path="lib/VARNAv3-91.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin.jar"/>
+	<classpathentry kind="lib" path="lib/xml-apis.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin17"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>
diff --git a/lib/xercesImpl.jar b/lib/xercesImpl.jar
index 6497101..0aaa990 100755
Binary files a/lib/xercesImpl.jar and b/lib/xercesImpl.jar differ
diff --git a/lib/xml-apis.jar b/lib/xml-apis.jar
index a3fd9a1..4673346 100755
Binary files a/lib/xml-apis.jar and b/lib/xml-apis.jar differ
diff --git a/test/jalview/ws/seqfetcher/DasSequenceFetcher.java b/test/jalview/ws/seqfetcher/DasSequenceFetcher.java
new file mode 100644
index 0000000..7f82252
--- /dev/null
+++ b/test/jalview/ws/seqfetcher/DasSequenceFetcher.java
@@ -0,0 +1,19 @@
+package jalview.ws.seqfetcher;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class DasSequenceFetcher
+{
+
+  @Test
+  public void testDasRegistryContact()
+  {
+    jalview.bin.Cache.getDasSourceRegistry().refreshSources();
+    assertTrue(
+            "Expected to find at least one DAS source at the registry. Check config.",
+            jalview.bin.Cache.getDasSourceRegistry().getSources().size() > 0);
+  }
+
+}