From: jprocter <Jim Procter>
Date: Fri, 8 Apr 2005 14:51:09 +0000 (+0000)
Subject: Fixed broken jnlp creation.
X-Git-Tag: Release_2_0~458
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=235f0b3be2a652c4784dd2885d7d4f2a8efc9c99;p=jalview.git

Fixed broken jnlp creation.
---

diff --git a/build.xml b/build.xml
index ff25b09..63a067b 100755
--- a/build.xml
+++ b/build.xml
@@ -7,13 +7,13 @@
 
     <target name="init">
       <path id="axis.classpath">
-        <fileset dir="/usr/local/axis/lib">
+<!-->        <fileset dir="/usr/local/axis/lib">
           <include name="**/*.jar" />
         </fileset>
         <fileset dir="/usr/local/jakarta-tomcat-5/webapps/axis/WEB-INF/lib">
           <include name="**/*.jar"/>
           <include name="*.jar"/>
-        </fileset>
+        </fileset> -->
       </path>
 
       <property name="libDir" value="lib"/>
@@ -25,7 +25,7 @@
       <property name="packageDir" value="dist" />
       <property name="outputJar" value="jalview.jar" />
       <property name="wsdl.File" value="http://anaplog.compbio.dundee.ac.uk:8080/axis/services/jpred?wsdl" />
-        <property name="WebStartLocation" value="http://compbio.dundee.ac.uk/~jimp/jalviewtest/"/>
+        <property name="WebStartLocation" value="http://www.compbio.dundee.ac.uk/~jimp/public_html/jalviewtest/"/>
       <property name="wsdl.Namespace" value="vamsas" />
       <property name="wsdl.ClientNS" value="ext.vamsas" />  
 
@@ -153,13 +153,15 @@
         <resources>
           <j2se version="1.3+"/>
           <fileset dir="${packageDir}">
+            <include name="jalview.jar"/>
+          </fileset>
+          <fileset dir="${packageDir}">
             <include name="*.jar"/>
+            <exclude name="jalview.jar"/>
           </fileset>
         </resources>
-        <application_desc main_class="jalview.gui.AlignFrame">
+        <application_desc main_class="jalview.bin.Jalview">
           <argument>http://www.compbio.dundee.ac.uk/~andrew/jalview/glut.msf</argument>
-          <argument>URL</argument>
-          <argument>MSF</argument>
         </application_desc>
         <security>
           <all_permissions/>