Re-formatting the file

diff --git a/wsbuild.xml b/wsbuild.xml
index 9408d8e..b1a56b4 100644 (file)
--- a/wsbuild.xml
+++ b/wsbuild.xml
@@ -37,138 +37,149 @@
 \r
        <target name="build-server">\r
                <!-- TODO this runs file from Eclipse, but with Ant only this need to depends on clean and build! -->\r
-                       <property name="server.artifacts.dir" location="${basedir}/webservices/compbio/ws/server/jaxws/" />\r
+               <property name="server.artifacts.dir" location="${basedir}/webservices/compbio/ws/server/jaxws/" />\r
 \r
-                       <mkdir dir="${server.artifacts.dir}" />\r
-                       <mkdir dir="${wsdl.dir}" />\r
-                       <delete quiet="false" verbose="true" failonerror="false">\r
-                               <fileset dir="${server.artifacts.dir}">\r
-                                       <include name="*.java" />\r
-                               </fileset>\r
-                               <fileset dir="${wsdl.dir}">\r
-                               </fileset>\r
-                       </delete>\r
-                       <!-- destdir - Where to put generated classes -->\r
-                       <!-- sourcedestdir -  Where to put generated source files -->\r
-                       <!-- resourcedestdir - Where to put generated source files -->\r
+               <mkdir dir="${server.artifacts.dir}" />\r
+               <mkdir dir="${wsdl.dir}" />\r
+               <delete quiet="false" verbose="true" failonerror="false">\r
+                       <fileset dir="${server.artifacts.dir}">\r
+                               <include name="*.java" />\r
+                       </fileset>\r
+                       <fileset dir="${wsdl.dir}">\r
+                       </fileset>\r
+               </delete>\r
 \r
-               <wsgen sei="compbio.ws.server.JpredWS" \r
-                               sourcedestdir="${basedir}/webservices" \r
-                               destdir="${classes}" \r
-                               resourcedestdir="${wsdl.dir}" \r
-                               keep="true" genwsdl="true" \r
+               <!-- destdir - Where to put generated classes -->\r
+               <!-- sourcedestdir -  Where to put generated source files -->\r
+               <!-- resourcedestdir - Where to put generated source files -->\r
+               <wsgen sei="compbio.ws.server.JpredWS"\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.AAConWS" \r
-                               sourcedestdir="${basedir}/webservices" \r
-                               destdir="${classes}" \r
-                               resourcedestdir="${wsdl.dir}" \r
-                               keep="true" genwsdl="true" \r
-                               extension="false" \r
-                               xendorsed="true" \r
+               <wsgen sei="compbio.ws.server.AAConWS"\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
-                               resourcedestdir="${wsdl.dir}" \r
-                               keep="true" genwsdl="true" \r
-                               extension="false" \r
+               <wsgen sei="compbio.ws.server.ClustalWS"\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.MuscleWS" \r
-                               sourcedestdir="${basedir}/webservices" \r
-                               destdir="${classes}" \r
-                               resourcedestdir="${wsdl.dir}" \r
-                               keep="true" genwsdl="true" \r
+               <wsgen sei="compbio.ws.server.MuscleWS"\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.MafftWS" \r
-                               sourcedestdir="${basedir}/webservices" \r
-                               destdir="${classes}" \r
-                               resourcedestdir="${wsdl.dir}" \r
-                               keep="true" genwsdl="true" \r
+               <wsgen sei="compbio.ws.server.MafftWS"\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.TcoffeeWS" \r
-                               sourcedestdir="${basedir}/webservices" \r
-                               destdir="${classes}" \r
-                               resourcedestdir="${wsdl.dir}" \r
-                               keep="true" genwsdl="true" \r
-                               extension="false" \r
-                               xendorsed="true" \r
+               <wsgen sei="compbio.ws.server.TcoffeeWS"\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.DisemblWS" \r
-                               sourcedestdir="${basedir}/webservices" \r
-                               destdir="${classes}" \r
-                               resourcedestdir="${wsdl.dir}" \r
-                               keep="true" genwsdl="true" \r
-                               extension="false" \r
-                               xendorsed="true" \r
+               <wsgen sei="compbio.ws.server.DisemblWS"\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.GlobPlotWS" \r
-                               sourcedestdir="${basedir}/webservices" \r
-                               destdir="${classes}" \r
-                               resourcedestdir="${wsdl.dir}" \r
-                               keep="true" genwsdl="true" \r
-                               extension="false" \r
-                               xendorsed="true" \r
+               <wsgen sei="compbio.ws.server.GlobPlotWS"\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.JronnWS" \r
-                               sourcedestdir="${basedir}/webservices" \r
-                               destdir="${classes}" \r
-                               resourcedestdir="${wsdl.dir}" \r
-                               keep="true" genwsdl="true" \r
-                               extension="false" \r
-                               xendorsed="true" \r
+               <wsgen sei="compbio.ws.server.JronnWS"\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.IUPredWS" \r
-                               sourcedestdir="${basedir}/webservices" \r
-                               destdir="${classes}" \r
-                               resourcedestdir="${wsdl.dir}" \r
-                               keep="true" genwsdl="true" \r
-                               extension="false" \r
-                               xendorsed="true" \r
+               <wsgen sei="compbio.ws.server.IUPredWS"\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.RegistryWS" \r
-                               sourcedestdir="${basedir}/webservices" \r
-                               destdir="${classes}" \r
-                               resourcedestdir="${wsdl.dir}" \r
-                               keep="true" genwsdl="true" \r
-                               extension="false" \r
-                               xendorsed="true" \r
+               <wsgen sei="compbio.ws.server.RegistryWS"\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
@@ -184,9 +195,7 @@
                                <classpath refid="classes.path" />\r
                                <classpath refid="project.classpath" />\r
                </wsgen>\r
-               \r
        </target>\r
-               \r
 \r
        <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">\r
                <classpath refid="project.classpath" />\r
@@ -201,51 +210,51 @@
                                        <include name="*.java" />\r
                                </fileset>\r
                        </delete>\r
-                       <wsimport wsdl="${clustal.wsdl}" \r
-                               sourcedestdir="${basedir}/webservices/" \r
-                               keep="true" extension="false" \r
+                       <wsimport wsdl="${clustal.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="${muscle.wsdl}" \r
-                               sourcedestdir="${basedir}/webservices/" \r
-                               keep="true" extension="false" \r
+                       <wsimport wsdl="${muscle.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="${mafft.wsdl}" \r
-                               sourcedestdir="${basedir}/webservices/" \r
-                               keep="true" extension="false" \r
+                       <wsimport wsdl="${mafft.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="${tcoffee.wsdl}" \r
-                               sourcedestdir="${basedir}/webservices/" \r
-                               keep="true" extension="false" \r
+                       <wsimport wsdl="${tcoffee.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="${iupred.wsdl}" \r
-                               sourcedestdir="${basedir}/webservices/" \r
-                               keep="true" extension="false" \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
+                       <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
-                       <wsimport wsdl="${rnaalifold.wsdl}" \r
-                               sourcedestdir="${basedir}/webservices/" \r
-                               keep="true" extension="false" \r
+                       <wsimport wsdl="${rnaalifold.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
@@ -266,9 +275,9 @@
                        <classpath refid="classes.path" />\r
                        <classpath>\r
                                        <fileset dir="${basedir}/lib">\r
-                                                //JAXB2 Basics library \r
+                                                //JAXB2 Basics library\r
                                                <include name="jaxb2-basics-*.jar"/>\r
-                                                // JAXB2 Basics library dependencies \r
+                                                // JAXB2 Basics library dependencies\r
                                                <include name="jaxb2-basics-runtime-*.jar"/>\r
                                                <include name="jaxb2-basics-tools-*.jar"/>\r
                                                <include name="commons-beanutils-*.jar"/>\r
@@ -286,25 +295,25 @@
 \r
        <target name="build-Clustal-client-from-live-server">\r
 \r
-               <wsimport wsdl="http://localhost:7979/ClustalWS?wsdl" \r
-                       sourcedestdir="${basedir}/webservices/" \r
-                       keep="true" \r
-                       extension="false" \r
-                       verbose="true" \r
-                       xnocompile="true" \r
-                       package="compbio.ws.client.stub" \r
+               <wsimport wsdl="http://localhost:7979/ClustalWS?wsdl"\r
+                       sourcedestdir="${basedir}/webservices/"\r
+                       keep="true"\r
+                       extension="false"\r
+                       verbose="true"\r
+                       xnocompile="true"\r
+                       package="compbio.ws.client.stub"\r
                        quiet="false">\r
                </wsimport>\r
        </target>\r
 \r
        <target name="build-Muscle-client-from-live-server">\r
-               <wsimport wsdl="http://localhost:7979/MuscleWS?wsdl" \r
-                                       sourcedestdir="${basedir}/webservices/" \r
-                                       keep="true" \r
-                                       extension="false" \r
-                                       verbose="true" \r
-                                       xnocompile="true" \r
-                                       package="compbio.ws.client.stub" \r
+               <wsimport wsdl="http://localhost:7979/MuscleWS?wsdl"\r
+                                       sourcedestdir="${basedir}/webservices/"\r
+                                       keep="true"\r
+                                       extension="false"\r
+                                       verbose="true"\r
+                                       xnocompile="true"\r
+                                       package="compbio.ws.client.stub"\r
                                        quiet="false">\r
                </wsimport>\r
        </target>\r