beginning of 'automatic ws client' generation.
<!-- utils is a class path to additional utilities needed for
building docs, jars and webstart stuff -->
<!-- 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">
<target name="init">
<path id="axis.classpath">
+ <property name="" value=""/>
<property name="libDir" value="lib"/>
<property name="resourceDir" value="resources"/>
<property name="helpDir" value="help"/>
<property name="libDir" value="lib"/>
<property name="resourceDir" value="resources"/>
<property name="helpDir" value="help"/>
<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="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="wsdl.Files" value="http://anaplog.compbio.dundee.ac.uk:8080/axis/services/vamsas?wsdlFiles" />
+ <property name="wsdl.MsaWS" value="http://anaplog.compbio.dundee.ac.uk:8080/axis/services/MuscleWS?wsdl" />
+
<property name="WebStartLocation" value="http://www.compbio.dundee.ac.uk/~jimp/jalviewtest"/>
<property name="wsdl.Namespace" value="vamsas" />
<property name="WebStartLocation" value="http://www.compbio.dundee.ac.uk/~jimp/jalviewtest"/>
<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">
<path id="build.classpath">
<fileset dir="utils">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${libDir}">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${libDir}">
- <include name="*.jar"/>
+ <include name="*.jar"/>
<include name="**/*.jar"/>
</fileset>
<!-- <fileset dir="old_lib_signed">
<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"
</fileset>-->
</path>
<!--> <uptodate property="help.uptodate"
</target>
<target name="distclean" depends="init, clean">
</target>
<target name="distclean" depends="init, clean">
<echo message="REMOVING ALL BACKUP/AUTOSAVES!"/>
<delete>
<fileset dir=".">
<echo message="REMOVING ALL BACKUP/AUTOSAVES!"/>
<delete>
<fileset dir=".">
</fileset>
</delete>
</target>
</fileset>
</delete>
</target>
<target name="prepare" depends="init">
<mkdir dir="${outputDir}"/>
<copy todir="${outputDir}">
<target name="prepare" depends="init">
<mkdir dir="${outputDir}"/>
<copy todir="${outputDir}">
<javac source="1.4" target="1.4" srcdir="${sourceDir}" destdir="${outputDir}"
classpathref="build.classpath" />
</target>
<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"
unless="help.uptodate">
<java
classname="com.sun.java.help.search.Indexer"
<arg line="html"/>
</java>
</target>
<arg line="html"/>
</java>
</target>
<target name="makejars" depends="build, buildindices">
<!-- make the package jar -->
<mkdir dir="${packageDir}"/>
<target name="makejars" depends="build, buildindices">
<!-- make the package jar -->
<mkdir dir="${packageDir}"/>
<jar destfile="${packageDir}/${outputJar}">
<jar destfile="${packageDir}/${outputJar}">
- <fileset dir="${outputDir}">
+ <fileset dir="${outputDir}/">
+ <exclude name="*.jar.*" />
+ <exclude name="**/*.jar" />
+ <exclude name="**/*.jar.*" />
storepass="alignmentisfun"
keypass="alignmentisfun"
keystore="keys/.keystore"
storepass="alignmentisfun"
keypass="alignmentisfun"
keystore="keys/.keystore"
</fileset>
</signjar>
<taskdef classpathref="build.classpath" resource="com/roxes/tools/ant/taskdefs.properties"/>
</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>
<!-- 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>
<homepage href="www.jalview.org"/>
<description>Jalview Multiple Alignment Editor</description>
<description kind="short">Jalview</description>
</application_desc>
<security>
<all_permissions/>
</application_desc>
<security>
<all_permissions/>
</target>
<target name="runenv" depends="init">
<path id="run.classpath">
</target>
<target name="runenv" depends="init">
<path id="run.classpath">
</fileset>
</path>
<pathconvert targetos="unix" refid="run.classpath" property="run.classpath"/>
</fileset>
</path>
<pathconvert targetos="unix" refid="run.classpath" property="run.classpath"/>
<echo>java -classpath ${run.classpath} jalview.bin.Jalview
</echo>
</target>
<echo>java -classpath ${run.classpath} jalview.bin.Jalview
</echo>
</target>
<target name="buildextclients" depends="init">
<path id="axisbuild">
<!-- <path refid="axis.classpath"/> -->
<target name="buildextclients" depends="init">
<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">
</path>
<taskdef resource="axis-tasks.properties" classpathref="axisbuild"/>
<move todir="./bak">
<include name="${wsdl.ClientNS}/*.*"/>
</fileset>
</move>
<include name="${wsdl.ClientNS}/*.*"/>
</fileset>
</move>
<axis-wsdl2java
output="${sourceDir}"
verbose="true"
<axis-wsdl2java
output="${sourceDir}"
verbose="true"
serverside="false"
deployscope="Request"
debug="false"
serverside="false"
deployscope="Request"
debug="false"
+ helpergen="true"
+ all="true"
namespace="${wsdl.Namespace}"
package="${wsdl.ClientNS}"
/>
<mapping namespace="http://dataTypes.vamsas"
package="${wsdl.ClientNS}"/>
namespace="${wsdl.Namespace}"
package="${wsdl.ClientNS}"
/>
<mapping namespace="http://dataTypes.vamsas"
package="${wsdl.ClientNS}"/>
</axis-wsdl2java>
</target>
<target name="package" depends="init, build">
</axis-wsdl2java>
</target>
<target name="package" depends="init, build">