From: pvtroshin <pvtroshin@e3abac25-378b-4346-85de-24260fe3988d>
Date: Thu, 16 Jun 2011 14:40:43 +0000 (+0000)
Subject: Integrating IUPredWS
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6c87b80647c1a0f0543ed8bbfe43483c9fdfa1b8;p=jabaws.git

Integrating IUPredWS

git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4276 e3abac25-378b-4346-85de-24260fe3988d
---

diff --git a/WEB-INF/sun-jaxws.xml b/WEB-INF/sun-jaxws.xml
index f3158ed..47d1ff3 100644
--- a/WEB-INF/sun-jaxws.xml
+++ b/WEB-INF/sun-jaxws.xml
@@ -40,4 +40,8 @@
         name='GlobPlotWS'
         implementation='compbio.ws.server.GlobPlotWS'
         url-pattern='/GlobPlotWS'/>
+        <endpoint
+        name='IUPredWS'
+        implementation='compbio.ws.server.IUPredWS'
+        url-pattern='/IUPredWS'/>
 </endpoints>
diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml
index 2e44c07..4c01fb9 100644
--- a/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
@@ -117,6 +117,12 @@
         <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
+    
+     <servlet>
+        <servlet-name>IUPredWS</servlet-name>
+        <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
    
     <servlet-mapping>
     	<servlet-name>listings</servlet-name>
@@ -188,6 +194,11 @@
     	<url-pattern>/GlobPlotWS</url-pattern>
    </servlet-mapping>
    
+    <servlet-mapping>
+    	<servlet-name>IUPredWS</servlet-name>
+    	<url-pattern>/IUPredWS</url-pattern>
+   </servlet-mapping>
+   
    <security-constraint>
     <web-resource-collection>
     	<web-resource-name>Administrator pages</web-resource-name>
diff --git a/webservices/compbio/ws/client/Services.java b/webservices/compbio/ws/client/Services.java
index 3c55c18..1048fb8 100644
--- a/webservices/compbio/ws/client/Services.java
+++ b/webservices/compbio/ws/client/Services.java
@@ -45,7 +45,7 @@ import compbio.runner.msa.Tcoffee;
  * 
  */
 public enum Services {
-	MafftWS, MuscleWS, ClustalWS, TcoffeeWS, ProbconsWS, AAConWS, JronnWS, DisemblWS, GlobPlotWS;
+	MafftWS, MuscleWS, ClustalWS, TcoffeeWS, ProbconsWS, AAConWS, JronnWS, DisemblWS, GlobPlotWS, IUPred;
 
 	public static Services getService(String servName) {
 		servName = servName.trim().toLowerCase();
diff --git a/wsbuild.xml b/wsbuild.xml
index 03a238f..a3f90e8 100644
--- a/wsbuild.xml
+++ b/wsbuild.xml
@@ -25,6 +25,7 @@
 	<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" />
 	
@@ -140,6 +141,17 @@
 						<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}" 
@@ -195,6 +207,13 @@
 				package="compbio.ws.client.stub" 
 				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">
+			</wsimport>
 		    <wsimport wsdl="${registry.wsdl}" 
 						sourcedestdir="${basedir}/webservices/" 
 						keep="true" extension="false"