X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=wsbuild.xml;h=b1a56b45076481c4697e5ada0492147c38b77498;hb=f1bdd8da517901fe1d7957d388ea579ad1fbaa3b;hp=bd9f15bc7b3147395d09cafd01e33bbd4891549b;hpb=976c5f2f59f0d2192eec3c83c39f81f3a15ef58b;p=jabaws.git

diff --git a/wsbuild.xml b/wsbuild.xml
index bd9f15b..b1a56b4 100644
--- a/wsbuild.xml
+++ b/wsbuild.xml
@@ -18,17 +18,18 @@
 	</path>
 
 	<property name="wsdl.dir" location="${basedir}/webservices/compbio/ws/server/resource" />
+	<property name="jpred.wsdl" location="${wsdl.dir}/JpredWS.wsdl" />
+	<property name="aacon.wsdl" location="${wsdl.dir}/AAConWS.wsdl" />
 	<property name="clustal.wsdl" location="${wsdl.dir}/ClustalWS.wsdl" />
 	<property name="muscle.wsdl" location="${wsdl.dir}/MuscleWS.wsdl" />
 	<property name="tcoffee.wsdl" location="${wsdl.dir}/TcoffeeWS.wsdl" />
 	<property name="mafft.wsdl" location="${wsdl.dir}/MafftWS.wsdl" />
-	<property name="aacon.wsdl" location="${wsdl.dir}/AAConWS.wsdl" />
 	<property name="disembl.wsdl" location="${wsdl.dir}/DisemblWS.wsdl" />
 	<property name="globplot.wsdl" location="${wsdl.dir}/GlobPlotWS.wsdl" />
 	<property name="iupred.wsdl" location="${wsdl.dir}/IUPredWS.wsdl" />
 	<property name="jronn.wsdl" location="${wsdl.dir}/JronnWS.wsdl" />
 	<property name="registry.wsdl" location="${wsdl.dir}/RegistryWS.wsdl" />
-	
+	<property name="rnaalifold.wsdl" location="${wsdl.dir}/RNAalifold.wsdl" />  
 
 	<taskdef name="wsgen" onerror="report" classname="com.sun.tools.ws.ant.WsGen">
 		<classpath refid="project.classpath" />
@@ -36,136 +37,166 @@
 
 	<target name="build-server">
 		<!-- TODO this runs file from Eclipse, but with Ant only this need to depends on clean and build! -->
-			<property name="server.artifacts.dir" location="${basedir}/webservices/compbio/ws/server/jaxws/" />
+		<property name="server.artifacts.dir" location="${basedir}/webservices/compbio/ws/server/jaxws/" />
 
-			<mkdir dir="${server.artifacts.dir}" />
-			<mkdir dir="${wsdl.dir}" />
-			<delete quiet="false" verbose="true" failonerror="false">
-				<fileset dir="${server.artifacts.dir}">
-					<include name="*.java" />
-				</fileset>
-				<fileset dir="${wsdl.dir}">
-				</fileset>
-			</delete>
-			<!-- destdir - Where to put generated classes -->
-			<!-- sourcedestdir -  Where to put generated source files -->
-			<!-- resourcedestdir - Where to put generated source files -->
+		<mkdir dir="${server.artifacts.dir}" />
+		<mkdir dir="${wsdl.dir}" />
+		<delete quiet="false" verbose="true" failonerror="false">
+			<fileset dir="${server.artifacts.dir}">
+				<include name="*.java" />
+			</fileset>
+			<fileset dir="${wsdl.dir}">
+			</fileset>
+		</delete>
 
-		<wsgen sei="compbio.ws.server.AAConWS" 
-					sourcedestdir="${basedir}/webservices" 
-					destdir="${classes}" 
-					resourcedestdir="${wsdl.dir}" 
-					keep="true" genwsdl="true" 
-					extension="false" 
-					xendorsed="true"			
-					verbose="true">
-					<classpath refid="classes.path" />
-					<classpath refid="project.classpath" />
+		<!-- destdir - Where to put generated classes -->
+		<!-- sourcedestdir -  Where to put generated source files -->
+		<!-- resourcedestdir - Where to put generated source files -->
+		<wsgen sei="compbio.ws.server.JpredWS"
+				sourcedestdir="${basedir}/webservices"
+				destdir="${classes}"
+				resourcedestdir="${wsdl.dir}"
+				keep="true"
+				genwsdl="true"
+				extension="false"
+				xendorsed="true"
+				verbose="true">
+				<classpath refid="classes.path" />
+				<classpath refid="project.classpath" />
 		</wsgen>
-
-		<wsgen sei="compbio.ws.server.ClustalWS" 
-					sourcedestdir="${basedir}/webservices" 
-					destdir="${classes}" 
-					resourcedestdir="${wsdl.dir}" 
-					keep="true" genwsdl="true" 
-					extension="false" 
-					xendorsed="true"
-					verbose="true">
-					<classpath refid="classes.path" />
-					<classpath refid="project.classpath" />
+		<wsgen sei="compbio.ws.server.AAConWS"
+				sourcedestdir="${basedir}/webservices"
+				destdir="${classes}"
+				resourcedestdir="${wsdl.dir}"
+				keep="true"
+				genwsdl="true"
+				extension="false"
+				xendorsed="true"
+				verbose="true">
+				<classpath refid="classes.path" />
+				<classpath refid="project.classpath" />
 		</wsgen>
-		<wsgen sei="compbio.ws.server.MuscleWS" 
-						sourcedestdir="${basedir}/webservices" 
-						destdir="${classes}" 
-						resourcedestdir="${wsdl.dir}" 
-						keep="true" genwsdl="true" 
-						extension="false"
-						xendorsed="true"
-						verbose="true">
-						<classpath refid="classes.path" />
-						<classpath refid="project.classpath" />
-			</wsgen>
-		<wsgen sei="compbio.ws.server.MafftWS" 
-						sourcedestdir="${basedir}/webservices" 
-						destdir="${classes}" 
-						resourcedestdir="${wsdl.dir}" 
-						keep="true" genwsdl="true" 
-						extension="false"
-						xendorsed="true"
-						verbose="true">
-						<classpath refid="classes.path" />
-						<classpath refid="project.classpath" />
-			</wsgen>
-		<wsgen sei="compbio.ws.server.TcoffeeWS" 
-						sourcedestdir="${basedir}/webservices" 
-						destdir="${classes}" 
-						resourcedestdir="${wsdl.dir}" 
-						keep="true" genwsdl="true" 
-						extension="false" 
-						xendorsed="true"			
-						verbose="true">
-						<classpath refid="classes.path" />
-						<classpath refid="project.classpath" />
+		<wsgen sei="compbio.ws.server.ClustalWS"
+				sourcedestdir="${basedir}/webservices"
+				destdir="${classes}"
+				resourcedestdir="${wsdl.dir}"
+				keep="true"
+				genwsdl="true"
+				extension="false"
+				xendorsed="true"
+				verbose="true">
+				<classpath refid="classes.path" />
+				<classpath refid="project.classpath" />
 		</wsgen>
-		
-		<wsgen sei="compbio.ws.server.DisemblWS" 
-						sourcedestdir="${basedir}/webservices" 
-						destdir="${classes}" 
-						resourcedestdir="${wsdl.dir}" 
-						keep="true" genwsdl="true" 
-						extension="false" 
-						xendorsed="true"			
-						verbose="true">
-						<classpath refid="classes.path" />
-						<classpath refid="project.classpath" />
+		<wsgen sei="compbio.ws.server.MuscleWS"
+				sourcedestdir="${basedir}/webservices"
+				destdir="${classes}"
+				resourcedestdir="${wsdl.dir}"
+				keep="true"
+				genwsdl="true"
+				extension="false"
+				xendorsed="true"
+				verbose="true">
+				<classpath refid="classes.path" />
+				<classpath refid="project.classpath" />
+		</wsgen>
+		<wsgen sei="compbio.ws.server.MafftWS"
+				sourcedestdir="${basedir}/webservices"
+				destdir="${classes}"
+				resourcedestdir="${wsdl.dir}"
+				keep="true"
+				genwsdl="true"
+				extension="false"
+				xendorsed="true"
+				verbose="true">
+				<classpath refid="classes.path" />
+				<classpath refid="project.classpath" />
 		</wsgen>
-		<wsgen sei="compbio.ws.server.GlobPlotWS" 
-						sourcedestdir="${basedir}/webservices" 
-						destdir="${classes}" 
-						resourcedestdir="${wsdl.dir}" 
-						keep="true" genwsdl="true" 
-						extension="false" 
-						xendorsed="true"			
-						verbose="true">
-						<classpath refid="classes.path" />
-						<classpath refid="project.classpath" />
+		<wsgen sei="compbio.ws.server.TcoffeeWS"
+				sourcedestdir="${basedir}/webservices"
+				destdir="${classes}"
+				resourcedestdir="${wsdl.dir}"
+				keep="true"
+				genwsdl="true"
+				extension="false"
+				xendorsed="true"
+				verbose="true">
+				<classpath refid="classes.path" />
+				<classpath refid="project.classpath" />
 		</wsgen>
-		<wsgen sei="compbio.ws.server.JronnWS" 
-						sourcedestdir="${basedir}/webservices" 
-						destdir="${classes}" 
-						resourcedestdir="${wsdl.dir}" 
-						keep="true" genwsdl="true" 
-						extension="false" 
-						xendorsed="true"			
-						verbose="true">
-						<classpath refid="classes.path" />
-						<classpath refid="project.classpath" />
+		<wsgen sei="compbio.ws.server.DisemblWS"
+				sourcedestdir="${basedir}/webservices"
+				destdir="${classes}"
+				resourcedestdir="${wsdl.dir}"
+				keep="true"
+				genwsdl="true"
+				extension="false"
+				xendorsed="true"
+				verbose="true">
+				<classpath refid="classes.path" />
+				<classpath refid="project.classpath" />
 		</wsgen>
-		<wsgen sei="compbio.ws.server.IUPredWS" 
-								sourcedestdir="${basedir}/webservices" 
-								destdir="${classes}" 
-								resourcedestdir="${wsdl.dir}" 
-								keep="true" genwsdl="true" 
-								extension="false" 
-								xendorsed="true"			
-								verbose="true">
-								<classpath refid="classes.path" />
-								<classpath refid="project.classpath" />
+		<wsgen sei="compbio.ws.server.GlobPlotWS"
+				sourcedestdir="${basedir}/webservices"
+				destdir="${classes}"
+				resourcedestdir="${wsdl.dir}"
+				keep="true"
+				genwsdl="true"
+				extension="false"
+				xendorsed="true"
+				verbose="true">
+				<classpath refid="classes.path" />
+				<classpath refid="project.classpath" />
 		</wsgen>
-		<wsgen sei="compbio.ws.server.RegistryWS" 
-						sourcedestdir="${basedir}/webservices" 
-						destdir="${classes}" 
-						resourcedestdir="${wsdl.dir}" 
-						keep="true" genwsdl="true" 
-						extension="false" 
-						xendorsed="true"			
-						verbose="true">
-						<classpath refid="classes.path" />
-						<classpath refid="project.classpath" />
+		<wsgen sei="compbio.ws.server.JronnWS"
+				sourcedestdir="${basedir}/webservices"
+				destdir="${classes}"
+				resourcedestdir="${wsdl.dir}"
+				keep="true"
+				genwsdl="true"
+				extension="false"
+				xendorsed="true"
+				verbose="true">
+				<classpath refid="classes.path" />
+				<classpath refid="project.classpath" />
+		</wsgen>
+		<wsgen sei="compbio.ws.server.IUPredWS"
+				sourcedestdir="${basedir}/webservices"
+				destdir="${classes}"
+				resourcedestdir="${wsdl.dir}"
+				keep="true"
+				genwsdl="true"
+				extension="false"
+				xendorsed="true"
+				verbose="true">
+				<classpath refid="classes.path" />
+				<classpath refid="project.classpath" />
+		</wsgen>
+		<wsgen sei="compbio.ws.server.RegistryWS"
+				sourcedestdir="${basedir}/webservices"
+				destdir="${classes}"
+				resourcedestdir="${wsdl.dir}"
+				keep="true"
+				genwsdl="true"
+				extension="false"
+				xendorsed="true"
+				verbose="true">
+				<classpath refid="classes.path" />
+				<classpath refid="project.classpath" />
+		</wsgen>
+		<wsgen sei="compbio.ws.server.RNAalifoldWS"
+				sourcedestdir="${basedir}/webservices"
+				destdir="${classes}"
+				resourcedestdir="${wsdl.dir}"
+				keep="true" genwsdl="true"
+				extension="false"
+				xendorsed="true"
+				verbose="true">
+				<classpath refid="classes.path" />
+				<classpath refid="project.classpath" />
 		</wsgen>
 	</target>
 
-
 	<taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">
 		<classpath refid="project.classpath" />
 	</taskdef>
@@ -179,57 +210,59 @@
 					<include name="*.java" />
 				</fileset>
 			</delete>
-			<wsimport wsdl="${clustal.wsdl}" 
-				sourcedestdir="${basedir}/webservices/" 
-				keep="true" extension="false" 
-				verbose="true" xnocompile="true" xendorsed="true"
-				package="compbio.ws.client.stub" target="2.1"
+			<wsimport wsdl="${clustal.wsdl}"
+				sourcedestdir="${basedir}/webservices/"
+				keep="true" extension="false"
+				verbose="true" xnocompile="true" xendorsed="true"
+				package="compbio.ws.client.stub" target="2.1"
 				quiet="false">
 			</wsimport>
-			<wsimport wsdl="${muscle.wsdl}" 
-				sourcedestdir="${basedir}/webservices/" 
-				keep="true" extension="false" 
-				verbose="true" xnocompile="true" xendorsed="true"
-				package="compbio.ws.client.stub" target="2.1"
+			<wsimport wsdl="${muscle.wsdl}"
+				sourcedestdir="${basedir}/webservices/"
+				keep="true" extension="false"
+				verbose="true" xnocompile="true" xendorsed="true"
+				package="compbio.ws.client.stub" target="2.1"
 				quiet="false">
 			</wsimport>
-			<wsimport wsdl="${mafft.wsdl}" 
-				sourcedestdir="${basedir}/webservices/" 
-				keep="true" extension="false" 
-				verbose="true" xnocompile="true" xendorsed="true"
-				package="compbio.ws.client.stub" target="2.1"
+			<wsimport wsdl="${mafft.wsdl}"
+				sourcedestdir="${basedir}/webservices/"
+				keep="true" extension="false"
+				verbose="true" xnocompile="true" xendorsed="true"
+				package="compbio.ws.client.stub" target="2.1"
 				quiet="false">
 			</wsimport>
-			<wsimport wsdl="${tcoffee.wsdl}" 
-				sourcedestdir="${basedir}/webservices/" 
-				keep="true" extension="false" 
-				verbose="true" xnocompile="true" xendorsed="true"
-				package="compbio.ws.client.stub" target="2.1"
+			<wsimport wsdl="${tcoffee.wsdl}"
+				sourcedestdir="${basedir}/webservices/"
+				keep="true" extension="false"
+				verbose="true" xnocompile="true" xendorsed="true"
+				package="compbio.ws.client.stub" target="2.1"
 				quiet="false">
 			</wsimport>
-			<wsimport wsdl="${iupred.wsdl}" 
-						sourcedestdir="${basedir}/webservices/" 
-						keep="true" extension="false" 
-						verbose="true" xnocompile="true" xendorsed="true"
-						package="compbio.ws.client.stub" target="2.1"
-						quiet="false">
+			<wsimport wsdl="${iupred.wsdl}"
+				sourcedestdir="${basedir}/webservices/"
+				keep="true" extension="false"
+				verbose="true" xnocompile="true" xendorsed="true"
+				package="compbio.ws.client.stub" target="2.1"
+				quiet="false">
 			</wsimport>
-		    <wsimport wsdl="${registry.wsdl}" 
-						sourcedestdir="${basedir}/webservices/" 
-						keep="true" extension="false" 
-						verbose="true" xnocompile="true" xendorsed="true"
-						package="compbio.ws.client.stub" target="2.1"
-						quiet="false">
+			<wsimport wsdl="${registry.wsdl}"
+				sourcedestdir="${basedir}/webservices/"
+				keep="true" extension="false"
+				verbose="true" xnocompile="true" xendorsed="true"
+				package="compbio.ws.client.stub" target="2.1"
+				quiet="false">
+			</wsimport>
+			<wsimport wsdl="${rnaalifold.wsdl}"
+				sourcedestdir="${basedir}/webservices/"
+				keep="true" extension="false"
+				verbose="true" xnocompile="true" xendorsed="true"
+				package="compbio.ws.client.stub" target="2.1"
+				quiet="false">
 			</wsimport>
-			<!--		<xjcarg value="-cp" />
-						<xjcarg pathref="project.classpath" />
-						<xjcarg value="-Xcommons-lang" /> -->
-				
+			
 		</target>
 
-	
 	<!-- 
-	
 	<target name="Build artifacts from schema" description="Test task to generate JaxB commons annotated data classes DOES NOT REALLY WORK">
 		<taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask">
 			<classpath refid="project.classpath" />
@@ -242,9 +275,9 @@
 			<classpath refid="classes.path" />
 			<classpath>
 					<fileset dir="${basedir}/lib">
-						 //JAXB2 Basics library 
+						 //JAXB2 Basics library
 						<include name="jaxb2-basics-*.jar"/>
-						 // JAXB2 Basics library dependencies 
+						 // JAXB2 Basics library dependencies
 						<include name="jaxb2-basics-runtime-*.jar"/>
 						<include name="jaxb2-basics-tools-*.jar"/>
 						<include name="commons-beanutils-*.jar"/>
@@ -259,31 +292,28 @@
 					-XhashCode
 					-Xcopyable
 					-Xmergeable
-	
-	
-	
-	
+
 	<target name="build-Clustal-client-from-live-server">
 
-		<wsimport wsdl="http://localhost:7979/ClustalWS?wsdl" 
-			sourcedestdir="${basedir}/webservices/" 
-			keep="true" 
-			extension="false" 
-			verbose="true" 
-			xnocompile="true" 
-			package="compbio.ws.client.stub" 
+		<wsimport wsdl="http://localhost:7979/ClustalWS?wsdl"
+			sourcedestdir="${basedir}/webservices/"
+			keep="true"
+			extension="false"
+			verbose="true"
+			xnocompile="true"
+			package="compbio.ws.client.stub"
 			quiet="false">
 		</wsimport>
 	</target>
 
 	<target name="build-Muscle-client-from-live-server">
-		<wsimport wsdl="http://localhost:7979/MuscleWS?wsdl" 
-					sourcedestdir="${basedir}/webservices/" 
-					keep="true" 
-					extension="false" 
-					verbose="true" 
-					xnocompile="true" 
-					package="compbio.ws.client.stub" 
+		<wsimport wsdl="http://localhost:7979/MuscleWS?wsdl"
+					sourcedestdir="${basedir}/webservices/"
+					keep="true"
+					extension="false"
+					verbose="true"
+					xnocompile="true"
+					package="compbio.ws.client.stub"
 					quiet="false">
 		</wsimport>
 	</target>