X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=wsbuild.xml;h=24f079ccdf1ec729aacc6fa29217fe2d33497573;hb=2a290b851a6337767cbd4bf406d743d50a7981ae;hp=a3f90e8b154f2d90e849cf1f1e9f03c0777059f3;hpb=6c87b80647c1a0f0543ed8bbfe43483c9fdfa1b8;p=jabaws.git

diff --git a/wsbuild.xml b/wsbuild.xml
index a3f90e8..24f079c 100644
--- a/wsbuild.xml
+++ b/wsbuild.xml
@@ -18,17 +18,17 @@
 	</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" />
-	
 
 	<taskdef name="wsgen" onerror="report" classname="com.sun.tools.ws.ant.WsGen">
 		<classpath refid="project.classpath" />
@@ -51,121 +51,129 @@
 			<!-- 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.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" />
+				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" />
+				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>
+				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>
+				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" />
+				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" />
+				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" />
+				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" />
+				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" />
+				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" />
+				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>
@@ -182,54 +190,48 @@
 			<wsimport wsdl="${clustal.wsdl}" 
 				sourcedestdir="${basedir}/webservices/" 
 				keep="true" extension="false" 
-				verbose="true" xnocompile="true" 
-				package="compbio.ws.client.stub" 
+				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" 
-				package="compbio.ws.client.stub" 
+				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" 
-				package="compbio.ws.client.stub" 
+				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" 
-				package="compbio.ws.client.stub" 
+				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" 
-						package="compbio.ws.client.stub" 
-						quiet="false">
+				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" 
-						package="compbio.ws.client.stub" 
-						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>
-			<!--		<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" />
@@ -259,10 +261,7 @@
 					-XhashCode
 					-Xcopyable
 					-Xmergeable
-	
-	
-	
-	
+
 	<target name="build-Clustal-client-from-live-server">
 
 		<wsimport wsdl="http://localhost:7979/ClustalWS?wsdl"