Merge branch 'develop' of https://source.jalview.org/git/jabaws into develop

[jabaws.git] / wsbuild.xml

diff --git a/wsbuild.xml b/wsbuild.xml
index b1a56b4..c8aa0e5 100644 (file)
--- a/wsbuild.xml
+++ b/wsbuild.xml
@@ -24,12 +24,16 @@
        <property name="muscle.wsdl" location="${wsdl.dir}/MuscleWS.wsdl" />\r
        <property name="tcoffee.wsdl" location="${wsdl.dir}/TcoffeeWS.wsdl" />\r
        <property name="mafft.wsdl" location="${wsdl.dir}/MafftWS.wsdl" />\r
+       <property name="glprobs.wsdl" location="${wsdl.dir}/GLprobsWS.wsdl" />\r
+       <property name="msaprobs.wsdl" location="${wsdl.dir}/MSAprobsWS.wsdl" />\r
+\r
        <property name="disembl.wsdl" location="${wsdl.dir}/DisemblWS.wsdl" />\r
        <property name="globplot.wsdl" location="${wsdl.dir}/GlobPlotWS.wsdl" />\r
        <property name="iupred.wsdl" location="${wsdl.dir}/IUPredWS.wsdl" />\r
        <property name="jronn.wsdl" location="${wsdl.dir}/JronnWS.wsdl" />\r
+\r
        <property name="registry.wsdl" location="${wsdl.dir}/RegistryWS.wsdl" />\r
-       <property name="rnaalifold.wsdl" location="${wsdl.dir}/RNAalifold.wsdl" />  \r
+       <property name="rnaalifold.wsdl" location="${wsdl.dir}/RNAalifold.wsdl" />\r
 \r
        <taskdef name="wsgen" onerror="report" classname="com.sun.tools.ws.ant.WsGen">\r
                <classpath refid="project.classpath" />\r
@@ -76,6 +80,30 @@
                                <classpath refid="classes.path" />\r
                                <classpath refid="project.classpath" />\r
                </wsgen>\r
+               <wsgen sei="compbio.ws.server.MSAprobsWS"\r
+                               sourcedestdir="${basedir}/webservices"\r
+                               destdir="${classes}"\r
+                               resourcedestdir="${wsdl.dir}"\r
+                               keep="true"\r
+                               genwsdl="true"\r
+                               extension="false"\r
+                               xendorsed="true"\r
+                               verbose="true">\r
+                               <classpath refid="classes.path" />\r
+                               <classpath refid="project.classpath" />\r
+               </wsgen>\r
+               <wsgen sei="compbio.ws.server.GLprobsWS"\r
+                               sourcedestdir="${basedir}/webservices"\r
+                               destdir="${classes}"\r
+                               resourcedestdir="${wsdl.dir}"\r
+                               keep="true"\r
+                               genwsdl="true"\r
+                               extension="false"\r
+                               xendorsed="true"\r
+                               verbose="true">\r
+                               <classpath refid="classes.path" />\r
+                               <classpath refid="project.classpath" />\r
+               </wsgen>\r
                <wsgen sei="compbio.ws.server.ClustalWS"\r
                                sourcedestdir="${basedir}/webservices"\r
                                destdir="${classes}"\r
@@ -210,6 +238,7 @@
                                        <include name="*.java" />\r
                                </fileset>\r
                        </delete>\r
+\r
                        <wsimport wsdl="${clustal.wsdl}"\r
                                sourcedestdir="${basedir}/webservices/"\r
                                keep="true" extension="false"\r
@@ -217,6 +246,7 @@
                                package="compbio.ws.client.stub" target="2.1"\r
                                quiet="false">\r
                        </wsimport>\r
+\r
                        <wsimport wsdl="${muscle.wsdl}"\r
                                sourcedestdir="${basedir}/webservices/"\r
                                keep="true" extension="false"\r
@@ -224,6 +254,7 @@
                                package="compbio.ws.client.stub" target="2.1"\r
                                quiet="false">\r
                        </wsimport>\r
+\r
                        <wsimport wsdl="${mafft.wsdl}"\r
                                sourcedestdir="${basedir}/webservices/"\r
                                keep="true" extension="false"\r
@@ -231,6 +262,7 @@
                                package="compbio.ws.client.stub" target="2.1"\r
                                quiet="false">\r
                        </wsimport>\r
+\r
                        <wsimport wsdl="${tcoffee.wsdl}"\r
                                sourcedestdir="${basedir}/webservices/"\r
                                keep="true" extension="false"\r
@@ -238,6 +270,7 @@
                                package="compbio.ws.client.stub" target="2.1"\r
                                quiet="false">\r
                        </wsimport>\r
+\r
                        <wsimport wsdl="${iupred.wsdl}"\r
                                sourcedestdir="${basedir}/webservices/"\r
                                keep="true" extension="false"\r
@@ -245,6 +278,7 @@
                                package="compbio.ws.client.stub" target="2.1"\r
                                quiet="false">\r
                        </wsimport>\r
+\r
                        <wsimport wsdl="${registry.wsdl}"\r
                                sourcedestdir="${basedir}/webservices/"\r
                                keep="true" extension="false"\r
@@ -252,6 +286,7 @@
                                package="compbio.ws.client.stub" target="2.1"\r
                                quiet="false">\r
                        </wsimport>\r
+\r
                        <wsimport wsdl="${rnaalifold.wsdl}"\r
                                sourcedestdir="${basedir}/webservices/"\r
                                keep="true" extension="false"\r
@@ -259,7 +294,7 @@
                                package="compbio.ws.client.stub" target="2.1"\r
                                quiet="false">\r
                        </wsimport>\r
-                       \r
+\r
                </target>\r
 \r
        <!-- \r