From: jprocter <jprocter@compbio.dundee.ac.uk>
Date: Fri, 30 Mar 2012 12:29:04 +0000 (+0100)
Subject: Merge branch 'JAL-972-dasobert-to-jdas' into JAL-972-jdas
X-Git-Tag: Jalview_2_9~532^2~31
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2a5cbe264ec842c1a0f93e6bd78294607a94e686;p=jalview.git

Merge branch 'JAL-972-dasobert-to-jdas' into JAL-972-jdas

Conflicts:
	.classpath
	src/jalview/ws/dbsources/DasSequenceSource.java
	src/jalview/ws/dbsources/das/DasSequenceSourceListener.java

merged jdas switchover into v2.8 development branch
---

2a5cbe264ec842c1a0f93e6bd78294607a94e686
diff --cc .classpath
index ab032e0,4a8ccc4..af48f6e
--- a/.classpath
+++ b/.classpath
@@@ -37,12 -36,14 +37,15 @@@
  	</classpathentry>
  	<classpathentry kind="lib" path="lib/miglayout-4.0-swing.jar"/>
  	<classpathentry kind="lib" path="lib/jswingreader-0.3.jar" sourcepath="/jswingreader"/>
 -	<classpathentry kind="lib" path="lib/min-jaba-client.jar"/>
  	<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
 +	<classpathentry kind="lib" path="lib/min-jaba-client-2.0.jar" sourcepath="/clustengine2"/>
  	<classpathentry kind="lib" path="lib/Jmol-12.2.4.jar"/>
  	<classpathentry kind="lib" path="appletlib/JmolApplet-12.2.4.jar"/>
+ 	<classpathentry kind="lib" path="lib/jdas-1.0.4.jar"/>
+ 	<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="con" path="org.eclipse.jdt.USER_LIBRARY/plugin.jar"/>
 -	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 +	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin.java"/>
 +	<classpathentry kind="lib" path="/Users/jimp/git/jalview_clean/lib/VARNAv3-9-dev.jar"/>
  	<classpathentry kind="output" path="classes"/>
  </classpath>