X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=build.xml;h=ce4db9e06e8d249eb21b18b1190bc35d1858db16;hb=faac65905c5e92cfb1e718b3bd3e51c21c40387a;hp=ef22f31e1fea4ead652ac97d472f6fe6dc92c1b7;hpb=b99914def4f8ca33b194b943298c82bc2698a1a6;p=jalview.git

diff --git a/build.xml b/build.xml
index ef22f31..ce4db9e 100755
--- a/build.xml
+++ b/build.xml
@@ -1,9 +1,29 @@
 <?xml version="1.0"?>
   <project name="jalviewX" default="build" basedir=".">
+<!-- we use jalopy to format our sources -->
+<taskdef name="jalopy"
+         classname="de.hunsicker.jalopy.plugin.ant.AntPlugin">
+  <classpath>
+    <fileset dir="utils/jalopy/lib">
+      <include name="*.jar" />
+    </fileset>
+  </classpath>
+</taskdef>
     <!-- utils is a class path to additional utilities needed for
     building docs, jars and webstart stuff -->
 
+<!--
+        Userdefined build property defaults
 
+        wsdl.server list (plus namespace mapping info ???)  - also want
+                ... to make this a dynamically generatable property
+        WebStart Location
+        Build location - provide a temporary root for speed
+        jarsigner keystore and info
+        Jakarta and axis classpath ?
+        Default argument for starting Jalview (if it exists).
+
+-->
 
     <target name="init">
       <path id="axis.classpath">
@@ -16,6 +36,7 @@
         </fileset> -->
       </path>
 
+      <property name="" value=""/>
       <property name="libDir" value="lib"/>
       <property name="resourceDir" value="resources"/>
       <property name="helpDir" value="help"/>
@@ -24,10 +45,15 @@
       <property name="outputDir" value="classes" />
       <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://www.compbio.dundee.ac.uk/~jimp/jalviewtest"/>
+      <property name="wsdl.File" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/jpred?wsdl" />
+      <property name="wsdl.Files" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/vamsas?wsdlFiles" />
+      <property name="wsdl.MsaWS" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/MuscleWS?wsdl" />
+      <property name="wsdl.MsaWS2" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/ClustalWS?wsdl" />
+      <property name="wsdl.MsaWS2" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/ClustalWS?wsdl" />
+        <property name="WSInterf" value="MsaWS" />
+      <property name="WebStartLocation" value="http://www.jalview.org/webstart"/>
       <property name="wsdl.Namespace" value="vamsas" />
-      <property name="wsdl.ClientNS" value="ext.vamsas" />  
+      <property name="wsdl.ClientNS" value="ext.vamsas" />
 
       <path id="build.classpath">
         <fileset dir="utils">
@@ -35,12 +61,12 @@
           <include name="**/*.jar"/>
         </fileset>
         <fileset dir="${libDir}">
-          <include name="*.jar"/>      
+          <include name="*.jar"/>
           <include name="**/*.jar"/>
         </fileset>
 <!--        <fileset dir="old_lib_signed">
-<include name="lib_axis.jar"/> 
-        
+<include name="lib_axis.jar"/>
+
         </fileset>-->
       </path>
       <!-->    <uptodate property="help.uptodate"
@@ -58,7 +84,7 @@
     </target>
 
     <target name="distclean" depends="init, clean">
-      
+
       <echo message="REMOVING ALL BACKUP/AUTOSAVES!"/>
       <delete>
         <fileset dir=".">
@@ -74,7 +100,7 @@
         </fileset>
       </delete>
     </target>
-    
+
     <target name="prepare" depends="init">
       <mkdir dir="${outputDir}"/>
       <copy todir="${outputDir}">
@@ -95,7 +121,7 @@
       <javac source="1.4" target="1.4" srcdir="${sourceDir}" destdir="${outputDir}"
       classpathref="build.classpath" />
     </target>
-    <target name="buildindices" depends="init, prepare" 
+    <target name="buildindices" depends="init, prepare"
     unless="help.uptodate">
     <java
       classname="com.sun.java.help.search.Indexer"
@@ -106,14 +132,17 @@
       <arg line="html"/>
     </java>
     </target>
-    
+
     <target name="makejars" depends="build, buildindices">
       <!-- make the package jar -->
       <mkdir dir="${packageDir}"/>
-      
+
       <jar destfile="${packageDir}/${outputJar}">
-        <fileset dir="${outputDir}">
+        <fileset dir="${outputDir}/">
           <exclude name="*.jar" />
+          <exclude name="*.jar.*" />
+          <exclude name="**/*.jar" />
+          <exclude name="**/*.jar.*" />
         </fileset>
       </jar>
 
@@ -123,8 +152,8 @@
           <include name="**/*.jar"/>
         </fileset>
       </copy>
-
-      <signjar 
+<!-- the default keystore details might need to be edited here -->
+      <signjar
       storepass="alignmentisfun"
       keypass="alignmentisfun"
       keystore="keys/.keystore"
@@ -138,13 +167,13 @@
       </fileset>
       </signjar>
       <taskdef classpathref="build.classpath" resource="com/roxes/tools/ant/taskdefs.properties"/>
-      
+
       <!--    codebase="http://www.jalview.org/jalview/webstart" -->
       <jnlp toFile="${packageDir}/Jalview.jnlp" href="Jalview.jnlp"
       codebase="${WebStartLocation}">
       <information>
         <title>Jalview</title>
-        <vendor>M Clamp</vendor>
+        <vendor>Barton Group</vendor>
         <homepage href="www.jalview.org"/>
         <description>Jalview Multiple Alignment Editor</description>
         <description kind="short">Jalview</description>
@@ -161,12 +190,11 @@
           </fileset>
         </resources>
         <application_desc main_class="jalview.bin.Jalview">
-          <argument>http://www.compbio.dundee.ac.uk/~andrew/jalview/glut.msf</argument>
-        </application_desc>
+          </application_desc>
         <security>
           <all_permissions/>
-        </security>  
-      </jnlp>        
+        </security>
+      </jnlp>
     </target>
     <target name="runenv" depends="init">
       <path id="run.classpath">
@@ -176,15 +204,25 @@
         </fileset>
       </path>
       <pathconvert targetos="unix" refid="run.classpath" property="run.classpath"/>
-      
+
       <echo>java -classpath ${run.classpath} jalview.bin.Jalview
       </echo>
     </target>
-    
+
     <target name="buildextclients" depends="init">
+<!-- Currently, this doesn't happen automatically.
+     1. Run WSDL2Java as below, which generates an ext.vamsas +
+     vamsas.<datapackages> fileset.
+     2. refactor ext.vamsas.SpecificserviceWS* to
+     ext.vamsas.ServiceclassWS* that implements the ServiceclassWSI interface.
+     3. Update the jalview.ws.*WServices classes to reflect the
+     interface type, and all locations of this wsdl type that Jalview
+     might be using.
+
+-->
       <path id="axisbuild">
         <!--        <path refid="axis.classpath"/> -->
-        <path refid="build.classpath"/>        
+        <path refid="build.classpath"/>
       </path>
       <taskdef resource="axis-tasks.properties" classpathref="axisbuild"/>
       <move todir="./bak">
@@ -192,27 +230,41 @@
           <include name="${wsdl.ClientNS}/*.*"/>
         </fileset>
       </move>
-      
+
       <axis-wsdl2java
       output="${sourceDir}"
       verbose="true"
-      url="${wsdl.File}" 
+      url="${wsdl.MsaWS2}"
       serverside="false"
       deployscope="Request"
       debug="false"
+      helpergen="true"
+      all="true"
       >
       <mappingSet>
-        <mapping 
+        <mapping
         namespace="${wsdl.Namespace}"
         package="${wsdl.ClientNS}"
         />
         <mapping namespace="http://dataTypes.vamsas"
         package="${wsdl.ClientNS}"/>
-        </mappingSet>      
+        </mappingSet>
     </axis-wsdl2java>
 
   </target>
   <target name="package" depends="init, build">
-    
+
+  </target>
+  <!-- jalopy code reformatter -->
+  <target name="sourcescrub" depends="init,build">
+    <jalopy destdir="jsrc" classpathref="run.classpath"
+      convention="jalview-jalopy.xml">
+      <fileset dir="${sourceDir}">
+        <include name="*.java"/>
+        <include name="**/*.java"/>
+        <include name="**/**/*.java"/>
+      </fileset>
+      </jalopy>
   </target>
+
 </project>