Merge branch 'docs/2_8_1_Release' into Release_2_8_1_Branch

diff --git a/RELEASE b/RELEASE
index 7f0d6ec..f182c58 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -1,2 +1,2 @@
-jalview.release=Release_2_8_0b1_Branch\r
-jalview.version=2.8.0b1\r
+jalview.release=Release_2_8_1_Branch\r
+jalview.version=2.8.1\r

diff --git a/build.xml b/build.xml
index 01aea93..0869a7f 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -338,18 +338,6 @@
           <description kind="short">Jalview</description>
           <icon href="${WebStartImage}" />
           <offline_allowed />
-          <association mime-type="application-x/ext-file" extensions="fa" />
-          <association mime-type="application-x/ext-file" extensions="fasta" />
-          <association mime-type="application-x/ext-file" extensions="mfa" />
-          <association mime-type="application-x/ext-file" extensions="fastq" />
-          <association mime-type="application-x/ext-file" extensions="blc" />
-          <association mime-type="application-x/ext-file" extensions="msf" />
-          <association mime-type="application-x/ext-file" extensions="pfam" />
-          <association mime-type="application-x/ext-file" extensions="aln"/>
-          <association mime-type="application-x/ext-file" extensions="pir"/>
-          <association mime-type="application-x/ext-file" extensions="amsa"/>
-          <association mime-type="application-x/ext-file" extensions="stk"/>
-          <association mime-type="application-x/ext-file" extensions="jvp"/>
         </information>
         <resources>
           <j2se version="${j2sev}" initial_heap_size="${inih}" max_heap_size="${maxh}" />
@@ -372,6 +360,23 @@
     </presetdef>
 
     <jnlpf toFile="${jnlpFile}"/>
+    <replace file="${jnlpFile}">
+      <replacetoken><![CDATA[</information>]]></replacetoken>
+      <replacevalue><![CDATA[
+        <association mime-type="application-x/ext-file" extensions="fa" />
+        <association mime-type="application-x/ext-file" extensions="fasta" />
+        <association mime-type="application-x/ext-file" extensions="mfa" />
+        <association mime-type="application-x/ext-file" extensions="fastq" />
+        <association mime-type="application-x/ext-file" extensions="blc" />
+        <association mime-type="application-x/ext-file" extensions="msf" />
+        <association mime-type="application-x/ext-file" extensions="pfam" />
+        <association mime-type="application-x/ext-file" extensions="aln"/>
+        <association mime-type="application-x/ext-file" extensions="pir"/>
+        <association mime-type="application-x/ext-file" extensions="amsa"/>
+        <association mime-type="application-x/ext-file" extensions="stk"/>
+        <association mime-type="application-x/ext-file" extensions="jvp"/>
+      </information>]]></replacevalue>
+    </replace>
   </target>
   <target name="buildextclients" depends="init">
     <input message="Building external client source from WSDLs - Do you really want to do this ? (Yy/Nn)" validargs="Y,y,n,N" defaultvalue="N" addproperty="doextbuild.response" />