Some small changes on web pages

[jabaws.git] / wsbuild.xml

diff --git a/wsbuild.xml b/wsbuild.xml
index bf55aaa..f61ffaf 100644 (file)
--- a/wsbuild.xml
+++ b/wsbuild.xml
@@ -25,7 +25,9 @@
        <property name="aacon.wsdl" location="${wsdl.dir}/AAConWS.wsdl" />\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
+       <property name="registry.wsdl" location="${wsdl.dir}/RegistryWS.wsdl" />\r
        \r
 \r
        <taskdef name="wsgen" onerror="report" classname="com.sun.tools.ws.ant.WsGen">\r
@@ -50,98 +52,117 @@
                        <!-- resourcedestdir - Where to put generated source files -->\r
 \r
                <wsgen sei="compbio.ws.server.AAConWS" \r
-                                       sourcedestdir="${basedir}/webservices" \r
-                                       destdir="${classes}" \r
-                                       resourcedestdir="${wsdl.dir}" \r
-                                       keep="true" genwsdl="true" \r
-                                       extension="false" \r
-                                       xendorsed="true"                        \r
-                                       verbose="true">\r
-                                       <classpath refid="classes.path" />\r
-                                       <classpath refid="project.classpath" />\r
+                               sourcedestdir="${basedir}/webservices" \r
+                               destdir="${classes}" \r
+                               resourcedestdir="${wsdl.dir}" \r
+                               keep="true" genwsdl="true" \r
+                               extension="false" \r
+                               xendorsed="true" \r
+                               verbose="true">\r
+                               <classpath refid="classes.path" />\r
+                               <classpath refid="project.classpath" />\r
                </wsgen>\r
-\r
                <wsgen sei="compbio.ws.server.ClustalWS" \r
-                                       sourcedestdir="${basedir}/webservices" \r
-                                       destdir="${classes}" \r
-                                       resourcedestdir="${wsdl.dir}" \r
-                                       keep="true" genwsdl="true" \r
-                                       extension="false" \r
-                                       xendorsed="true"\r
-                                       verbose="true">\r
-                                       <classpath refid="classes.path" />\r
-                                       <classpath refid="project.classpath" />\r
+                               sourcedestdir="${basedir}/webservices" \r
+                               destdir="${classes}" \r
+                               resourcedestdir="${wsdl.dir}" \r
+                               keep="true" 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.MuscleWS" \r
-                                               sourcedestdir="${basedir}/webservices" \r
-                                               destdir="${classes}" \r
-                                               resourcedestdir="${wsdl.dir}" \r
-                                               keep="true" genwsdl="true" \r
-                                               extension="false"\r
-                                               xendorsed="true"\r
-                                               verbose="true">\r
-                                               <classpath refid="classes.path" />\r
-                                               <classpath refid="project.classpath" />\r
-                       </wsgen>\r
+                               sourcedestdir="${basedir}/webservices" \r
+                               destdir="${classes}" \r
+                               resourcedestdir="${wsdl.dir}" \r
+                               keep="true" 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.MafftWS" \r
-                                               sourcedestdir="${basedir}/webservices" \r
-                                               destdir="${classes}" \r
-                                               resourcedestdir="${wsdl.dir}" \r
-                                               keep="true" genwsdl="true" \r
-                                               extension="false"\r
-                                               xendorsed="true"\r
-                                               verbose="true">\r
-                                               <classpath refid="classes.path" />\r
-                                               <classpath refid="project.classpath" />\r
-                       </wsgen>\r
+                               sourcedestdir="${basedir}/webservices" \r
+                               destdir="${classes}" \r
+                               resourcedestdir="${wsdl.dir}" \r
+                               keep="true" 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.TcoffeeWS" \r
-                                               sourcedestdir="${basedir}/webservices" \r
-                                               destdir="${classes}" \r
-                                               resourcedestdir="${wsdl.dir}" \r
-                                               keep="true" genwsdl="true" \r
-                                               extension="false" \r
-                                               xendorsed="true"                        \r
-                                               verbose="true">\r
-                                               <classpath refid="classes.path" />\r
-                                               <classpath refid="project.classpath" />\r
+                               sourcedestdir="${basedir}/webservices" \r
+                               destdir="${classes}" \r
+                               resourcedestdir="${wsdl.dir}" \r
+                               keep="true" genwsdl="true" \r
+                               extension="false" \r
+                               xendorsed="true" \r
+                               verbose="true">\r
+                               <classpath refid="classes.path" />\r
+                               <classpath refid="project.classpath" />\r
                </wsgen>\r
-               \r
                <wsgen sei="compbio.ws.server.DisemblWS" \r
-                                               sourcedestdir="${basedir}/webservices" \r
-                                               destdir="${classes}" \r
-                                               resourcedestdir="${wsdl.dir}" \r
-                                               keep="true" genwsdl="true" \r
-                                               extension="false" \r
-                                               xendorsed="true"                        \r
-                                               verbose="true">\r
-                                               <classpath refid="classes.path" />\r
-                                               <classpath refid="project.classpath" />\r
+                               sourcedestdir="${basedir}/webservices" \r
+                               destdir="${classes}" \r
+                               resourcedestdir="${wsdl.dir}" \r
+                               keep="true" 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.GlobPlotWS" \r
-                                               sourcedestdir="${basedir}/webservices" \r
-                                               destdir="${classes}" \r
-                                               resourcedestdir="${wsdl.dir}" \r
-                                               keep="true" genwsdl="true" \r
-                                               extension="false" \r
-                                               xendorsed="true"                        \r
-                                               verbose="true">\r
-                                               <classpath refid="classes.path" />\r
-                                               <classpath refid="project.classpath" />\r
+                               sourcedestdir="${basedir}/webservices" \r
+                               destdir="${classes}" \r
+                               resourcedestdir="${wsdl.dir}" \r
+                               keep="true" 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.JronnWS" \r
-                                               sourcedestdir="${basedir}/webservices" \r
-                                               destdir="${classes}" \r
-                                               resourcedestdir="${wsdl.dir}" \r
-                                               keep="true" genwsdl="true" \r
-                                               extension="false" \r
-                                               xendorsed="true"                        \r
-                                               verbose="true">\r
-                                               <classpath refid="classes.path" />\r
-                                               <classpath refid="project.classpath" />\r
+                               sourcedestdir="${basedir}/webservices" \r
+                               destdir="${classes}" \r
+                               resourcedestdir="${wsdl.dir}" \r
+                               keep="true" 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.IUPredWS" \r
+                               sourcedestdir="${basedir}/webservices" \r
+                               destdir="${classes}" \r
+                               resourcedestdir="${wsdl.dir}" \r
+                               keep="true" 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.RegistryWS" \r
+                               sourcedestdir="${basedir}/webservices" \r
+                               destdir="${classes}" \r
+                               resourcedestdir="${wsdl.dir}" \r
+                               keep="true" genwsdl="true" \r
+                               extension="false" \r
+                               xendorsed="true" \r
+                               verbose="true">\r
+                               <classpath refid="classes.path" />\r
+                               <classpath refid="project.classpath" />\r
                </wsgen>\r
        </target>\r
 \r
-\r
        <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">\r
                <classpath refid="project.classpath" />\r
        </taskdef>\r
@@ -158,40 +179,48 @@
                        <wsimport wsdl="${clustal.wsdl}" \r
                                sourcedestdir="${basedir}/webservices/" \r
                                keep="true" extension="false" \r
-                               verbose="true" xnocompile="true" \r
-                               package="compbio.ws.client.stub" \r
+                               verbose="true" xnocompile="true" xendorsed="true"\r
+                               package="compbio.ws.client.stub" target="2.1"\r
                                quiet="false">\r
                        </wsimport>\r
                        <wsimport wsdl="${muscle.wsdl}" \r
                                sourcedestdir="${basedir}/webservices/" \r
                                keep="true" extension="false" \r
-                               verbose="true" xnocompile="true" \r
-                               package="compbio.ws.client.stub" \r
+                               verbose="true" xnocompile="true" xendorsed="true"\r
+                               package="compbio.ws.client.stub" target="2.1"\r
                                quiet="false">\r
                        </wsimport>\r
                        <wsimport wsdl="${mafft.wsdl}" \r
                                sourcedestdir="${basedir}/webservices/" \r
                                keep="true" extension="false" \r
-                               verbose="true" xnocompile="true" \r
-                               package="compbio.ws.client.stub" \r
+                               verbose="true" xnocompile="true" xendorsed="true"\r
+                               package="compbio.ws.client.stub" target="2.1"\r
                                quiet="false">\r
                        </wsimport>\r
                        <wsimport wsdl="${tcoffee.wsdl}" \r
                                sourcedestdir="${basedir}/webservices/" \r
                                keep="true" extension="false" \r
-                               verbose="true" xnocompile="true" \r
-                               package="compbio.ws.client.stub" \r
+                               verbose="true" xnocompile="true" xendorsed="true"\r
+                               package="compbio.ws.client.stub" target="2.1"\r
+                               quiet="false">\r
+                       </wsimport>\r
+                       <wsimport wsdl="${iupred.wsdl}" \r
+                               sourcedestdir="${basedir}/webservices/" \r
+                               keep="true" extension="false" \r
+                               verbose="true" xnocompile="true" xendorsed="true"\r
+                               package="compbio.ws.client.stub" target="2.1"\r
+                               quiet="false">\r
+                       </wsimport>\r
+                       <wsimport wsdl="${registry.wsdl}" \r
+                               sourcedestdir="${basedir}/webservices/" \r
+                               keep="true" extension="false" \r
+                               verbose="true" xnocompile="true" xendorsed="true"\r
+                               package="compbio.ws.client.stub" target="2.1"\r
                                quiet="false">\r
                        </wsimport>\r
-                       <!--            <xjcarg value="-cp" />\r
-                                               <xjcarg pathref="project.classpath" />\r
-                                               <xjcarg value="-Xcommons-lang" /> -->\r
-                               \r
                </target>\r
 \r
-       \r
        <!-- \r
-       \r
        <target name="Build artifacts from schema" description="Test task to generate JaxB commons annotated data classes DOES NOT REALLY WORK">\r
                <taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask">\r
                        <classpath refid="project.classpath" />\r
@@ -221,10 +250,7 @@
                                        -XhashCode\r
                                        -Xcopyable\r
                                        -Xmergeable\r
-       \r
-       \r
-       \r
-       \r
+\r
        <target name="build-Clustal-client-from-live-server">\r
 \r
                <wsimport wsdl="http://localhost:7979/ClustalWS?wsdl" \r