jnlps with and without file associations for default,1G and 2G memory.

diff --git a/build.xml b/build.xml
index e9528fc..6cfaf4e 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -88,6 +88,8 @@
                <!-- Don't change anything below here unless you know what you are doing! -->
                <!-- Url path for WebStart in JNLP file -->
                <property name="WebStartLocation" value="http://www.jalview.org/webstart" />
+               <!-- J2SE version needed for webstart launch -->
+               <property name="j2sev" value="1.6+"/>
                <!-- build directory configuration -->
                <property name="libDir" value="lib" />
                <property name="resourceDir" value="resources" />
@@ -234,6 +236,45 @@
 
                <!--    codebase="http://www.jalview.org/jalview/webstart" -->
                <!-- href="jalview.jnlp" prevent hard-wired pickup of jnlp in certain javaws versions -->
+               <jnlp toFile="${packageDir}/jalview_noa.jnlp" codebase="${WebStartLocation}">
+                       <information>
+                               <title>Jalview</title>
+                               <vendor>The Barton Group</vendor>
+                               <homepage href="http://www.jalview.org" />
+                               <description>Jalview Multiple Alignment Editor</description>
+                               <description kind="short">Jalview</description>
+                               <icon href="logo_big.gif" />
+                               <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="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"/>-->
+                       </information>
+                       <resources>
+                               <j2se version="${j2sev}" initial_heap_size="10M"  />
+                               <fileset dir="${packageDir}">
+                                       <include name="jalview.jar" />
+                               </fileset>
+                               <fileset dir="${packageDir}">
+                                       <include name="*.jar" />
+                                       <include name="*_*.jar" />
+                                       <exclude name="jalview.jar" />
+                               </fileset>
+                               <property name="jalview.version" value="${JALVIEW_VERSION}" />
+                       </resources>
+                       <application_desc main_class="jalview.bin.Jalview">
+                       </application_desc>
+                       <security>
+                               <all_permissions />
+                       </security>
+               </jnlp>
                <jnlp toFile="${packageDir}/jalview.jnlp" codebase="${WebStartLocation}">
                        <information>
                                <title>Jalview</title>
@@ -243,8 +284,47 @@
                                <description kind="short">Jalview</description>
                                <icon href="logo_big.gif" />
                                <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="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"/>
+                       </information>
+                       <resources>
+                               <j2se version="${j2sev}" initial_heap_size="10M"/>
+                               <fileset dir="${packageDir}">
+                                       <include name="jalview.jar" />
+                               </fileset>
+                               <fileset dir="${packageDir}">
+                                       <include name="*.jar" />
+                                       <include name="*_*.jar" />
+                                       <exclude name="jalview.jar" />
+                               </fileset>
+                               <property name="jalview.version" value="${JALVIEW_VERSION}" />
+                       </resources>
+                       <application_desc main_class="jalview.bin.Jalview">
+                       </application_desc>
+                       <security>
+                               <all_permissions />
+                       </security>
+               </jnlp>
+               
+               <jnlp toFile="${packageDir}/jalview_noa_1G.jnlp" codebase="${WebStartLocation}">
+                       <information>
+                               <title>Jalview</title>
+                               <vendor>The Barton Group</vendor>
+                               <homepage href="http://www.jalview.org" />
+                               <description>Jalview Multiple Alignment Editor</description>
+                               <description kind="short">Jalview</description>
+                               <icon href="logo_big.gif" />
+                               <offline_allowed />
                                <!--
-       <association mime-type="application-x/ext-file" extensions="fa"/>
+                               <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="fastq"/>
         <association mime-type="application-x/ext-file" extensions="blc"/>
@@ -253,10 +333,10 @@
         <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"/>-->
                        </information>
                        <resources>
-                               <j2se version="1.5+" initial_heap_size="10M" />
+                               <j2se version="${j2sev}" initial_heap_size="128M" max_heap_size="512M" />
                                <fileset dir="${packageDir}">
                                        <include name="jalview.jar" />
                                </fileset>
@@ -273,7 +353,6 @@
                                <all_permissions />
                        </security>
                </jnlp>
-               <!-- the rest of these jnlp tasks are copy and pastes of the above but with different Vm args -->
                <jnlp toFile="${packageDir}/jalview_1G.jnlp" codebase="${WebStartLocation}">
                        <information>
                                <title>Jalview</title>
@@ -283,20 +362,19 @@
                                <description kind="short">Jalview</description>
                                <icon href="logo_big.gif" />
                                <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="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="fa"/>
+        <association mime-type="application-x/ext-file" extensions="fasta"/>
+        <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"/>
                        </information>
                        <resources>
-                               <j2se version="1.5+" initial_heap_size="64M" max_heap_size="512M" />
+                               <j2se version="${j2sev}" initial_heap_size="128M" max_heap_size="512M" />
                                <fileset dir="${packageDir}">
                                        <include name="jalview.jar" />
                                </fileset>
@@ -313,7 +391,7 @@
                                <all_permissions />
                        </security>
                </jnlp>
-               <jnlp toFile="${packageDir}/jalview_2G.jnlp" codebase="${WebStartLocation}">
+               <jnlp toFile="${packageDir}/jalview_noac_2G.jnlp" codebase="${WebStartLocation}">
                        <information>
                                <title>Jalview</title>
                                <vendor>The Barton Group</vendor>
@@ -323,19 +401,58 @@
                                <icon href="logo_big.gif" />
                                <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="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="fa"/>
+        <association mime-type="application-x/ext-file" extensions="fasta"/>
+        <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"/>
                        -->
                        </information>
                        <resources>
-                               <j2se version="1.5+" initial_heap_size="256M" max_heap_size="1024M" />
+                               <j2se version="${j2sev}" initial_heap_size="256M" max_heap_size="1024M" />
+                               <fileset dir="${packageDir}">
+                                       <include name="jalview.jar" />
+                               </fileset>
+                               <fileset dir="${packageDir}">
+                                       <include name="*.jar" />
+                                       <include name="*_*.jar" />
+                                       <exclude name="jalview.jar" />
+                               </fileset>
+                               <property name="jalview.version" value="${JALVIEW_VERSION}" />
+                       </resources>
+                       <application_desc main_class="jalview.bin.Jalview">
+                       </application_desc>
+                       <security>
+                               <all_permissions />
+                       </security>
+               </jnlp>
+               <jnlp toFile="${packageDir}/jalview_2G.jnlp" codebase="${WebStartLocation}">
+                       <information>
+                               <title>Jalview</title>
+                               <vendor>The Barton Group</vendor>
+                               <homepage href="http://www.jalview.org" />
+                               <description>Jalview Multiple Alignment Editor</description>
+                               <description kind="short">Jalview</description>
+                               <icon href="logo_big.gif" />
+                               <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="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"/>
+                       </information>
+                       <resources>
+                               <j2se version="${j2sev}" initial_heap_size="256M" max_heap_size="1024M" />
                                <fileset dir="${packageDir}">
                                        <include name="jalview.jar" />
                                </fileset>