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 (file)
--- a/WEB-INF/sun-jaxws.xml
+++ b/WEB-INF/sun-jaxws.xml
@@ -40,4 +40,8 @@
         name='GlobPlotWS'\r
         implementation='compbio.ws.server.GlobPlotWS'\r
         url-pattern='/GlobPlotWS'/>\r
+        <endpoint\r
+        name='IUPredWS'\r
+        implementation='compbio.ws.server.IUPredWS'\r
+        url-pattern='/IUPredWS'/>\r
 </endpoints>\r

diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml
index 2e44c07..4c01fb9 100644 (file)
--- 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>\r
         <load-on-startup>1</load-on-startup>\r
     </servlet>\r
+    \r
+     <servlet>\r
+        <servlet-name>IUPredWS</servlet-name>\r
+        <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>\r
+        <load-on-startup>1</load-on-startup>\r
+    </servlet>\r
    \r
     <servlet-mapping>\r
        <servlet-name>listings</servlet-name>\r
@@ -188,6 +194,11 @@
        <url-pattern>/GlobPlotWS</url-pattern>\r
    </servlet-mapping>\r
    \r
+    <servlet-mapping>\r
+       <servlet-name>IUPredWS</servlet-name>\r
+       <url-pattern>/IUPredWS</url-pattern>\r
+   </servlet-mapping>\r
+   \r
    <security-constraint>\r
     <web-resource-collection>\r
        <web-resource-name>Administrator pages</web-resource-name>\r

diff --git a/webservices/compbio/ws/client/Services.java b/webservices/compbio/ws/client/Services.java
index 3c55c18..1048fb8 100644 (file)
--- a/webservices/compbio/ws/client/Services.java
+++ b/webservices/compbio/ws/client/Services.java
@@ -45,7 +45,7 @@ import compbio.runner.msa.Tcoffee;
  * \r
  */\r
 public enum Services {\r
-       MafftWS, MuscleWS, ClustalWS, TcoffeeWS, ProbconsWS, AAConWS, JronnWS, DisemblWS, GlobPlotWS;\r
+       MafftWS, MuscleWS, ClustalWS, TcoffeeWS, ProbconsWS, AAConWS, JronnWS, DisemblWS, GlobPlotWS, IUPred;\r
 \r
        public static Services getService(String servName) {\r
                servName = servName.trim().toLowerCase();\r

diff --git a/wsbuild.xml b/wsbuild.xml
index 03a238f..a3f90e8 100644 (file)
--- a/wsbuild.xml
+++ b/wsbuild.xml
@@ -25,6 +25,7 @@
        <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
@@ -140,6 +141,17 @@
                                                <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
@@ -195,6 +207,13 @@
                                package="compbio.ws.client.stub" \r
                                quiet="false">\r
                        </wsimport>\r
+                       <wsimport wsdl="${iupred.wsdl}" \r
+                                               sourcedestdir="${basedir}/webservices/" \r
+                                               keep="true" extension="false" \r
+                                               verbose="true" xnocompile="true" \r
+                                               package="compbio.ws.client.stub" \r
+                                               quiet="false">\r
+                       </wsimport>\r
                    <wsimport wsdl="${registry.wsdl}" \r
                                                sourcedestdir="${basedir}/webservices/" \r
                                                keep="true" extension="false" \r