Prepare JABAWS for generation of wsdl for Jpred

diff --git a/WEB-INF/sun-jaxws.xml b/WEB-INF/sun-jaxws.xml
index ccd0e07..e39eaed 100644 (file)
--- a/WEB-INF/sun-jaxws.xml
+++ b/WEB-INF/sun-jaxws.xml
@@ -1,51 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <endpoints xmlns='http://java.sun.com/xml/ns/jax-ws/ri/runtime' version='2.0'>\r
-    <endpoint\r
-        name='RegistryWS'\r
-        implementation='compbio.ws.server.RegistryWS'\r
-        url-pattern='/RegistryWS'/>\r
-    <endpoint\r
-        name='ClustalWS'\r
-        implementation='compbio.ws.server.ClustalWS'\r
-        url-pattern='/ClustalWS'/>\r
-    <endpoint\r
-        name='ClustalOWS'\r
-        implementation='compbio.ws.server.ClustalOWS'\r
-        url-pattern='/ClustalOWS'/>\r
-    <endpoint\r
-        name='MuscleWS'\r
-        implementation='compbio.ws.server.MuscleWS'\r
-        url-pattern='/MuscleWS'/>\r
-    <endpoint\r
-        name='TcoffeeWS'\r
-        implementation='compbio.ws.server.TcoffeeWS'\r
-        url-pattern='/TcoffeeWS'/>\r
-    <endpoint\r
-        name='MafftWS'\r
-        implementation='compbio.ws.server.MafftWS'\r
-        url-pattern='/MafftWS'/>\r
-    <endpoint\r
-        name='ProbconsWS'\r
-        implementation='compbio.ws.server.ProbconsWS'\r
-        url-pattern='/ProbconsWS'/>\r
-    <endpoint\r
-        name='AAConWS'\r
-        implementation='compbio.ws.server.AAConWS'\r
-        url-pattern='/AAConWS'/>\r
-    <endpoint\r
-        name='JronnWS'\r
-        implementation='compbio.ws.server.JronnWS'\r
-        url-pattern='/JronnWS'/>\r
-    <endpoint\r
-        name='DisemblWS'\r
-        implementation='compbio.ws.server.DisemblWS'\r
-        url-pattern='/DisemblWS'/>\r
-    <endpoint\r
-        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
+       <endpoint name='RegistryWS'\r
+               implementation='compbio.ws.server.RegistryWS'\r
+               url-pattern='/RegistryWS'/>\r
+       <endpoint name='ClustalWS'\r
+               implementation='compbio.ws.server.ClustalWS'\r
+               url-pattern='/ClustalWS'/>\r
+       <endpoint name='ClustalOWS'\r
+               implementation='compbio.ws.server.ClustalOWS'\r
+               url-pattern='/ClustalOWS'/>\r
+       <endpoint name='MuscleWS'\r
+               implementation='compbio.ws.server.MuscleWS'\r
+               url-pattern='/MuscleWS'/>\r
+       <endpoint name='TcoffeeWS'\r
+               implementation='compbio.ws.server.TcoffeeWS'\r
+               url-pattern='/TcoffeeWS'/>\r
+       <endpoint name='MafftWS'\r
+               implementation='compbio.ws.server.MafftWS'\r
+               url-pattern='/MafftWS'/>\r
+       <endpoint name='ProbconsWS'\r
+               implementation='compbio.ws.server.ProbconsWS'\r
+               url-pattern='/ProbconsWS'/>\r
+       <endpoint name='AAConWS'\r
+               implementation='compbio.ws.server.AAConWS'\r
+               url-pattern='/AAConWS'/>\r
+       <endpoint name='JronnWS'\r
+               implementation='compbio.ws.server.JronnWS'\r
+               url-pattern='/JronnWS'/>\r
+       <endpoint name='DisemblWS'\r
+               implementation='compbio.ws.server.DisemblWS'\r
+               url-pattern='/DisemblWS'/>\r
+       <endpoint name='GlobPlotWS'\r
+               implementation='compbio.ws.server.GlobPlotWS'\r
+               url-pattern='/GlobPlotWS'/>\r
+       <endpoint name='IUPredWS'\r
+               implementation='compbio.ws.server.IUPredWS'\r
+               url-pattern='/IUPredWS'/>\r
+       <endpoint name='JpredWS'\r
+               implementation='compbio.ws.server.JpredWS'\r
+               url-pattern='/JpredWS'/>\r
 </endpoints>\r

diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml
index 863ae58..bf30cbf 100644 (file)
--- a/WEB-INF/web.xml
+++ b/WEB-INF/web.xml
@@ -162,6 +162,12 @@
                <load-on-startup>1</load-on-startup>\r
        </servlet>\r
 \r
+       <servlet>\r
+               <servlet-name>JpredWS</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
        <!-- JABAWS servlet mappings -->\r
        <servlet-mapping>\r
                <servlet-name>listings</servlet-name>\r
@@ -263,6 +269,10 @@
                <url-pattern>/IUPredWS</url-pattern>\r
        </servlet-mapping>\r
 \r
+       <servlet-mapping>\r
+               <servlet-name>JpredWS</servlet-name>\r
+               <url-pattern>/JpredWS</url-pattern>\r
+       </servlet-mapping>\r
 \r
 \r
        <!-- JABAWS security constraints -->\r

diff --git a/wsbuild.xml b/wsbuild.xml
index f61ffaf..24f079c 100644 (file)
--- a/wsbuild.xml
+++ b/wsbuild.xml
@@ -18,17 +18,17 @@
        </path>\r
 \r
        <property name="wsdl.dir" location="${basedir}/webservices/compbio/ws/server/resource" />\r
+       <property name="jpred.wsdl" location="${wsdl.dir}/JpredWS.wsdl" />\r
+       <property name="aacon.wsdl" location="${wsdl.dir}/AAConWS.wsdl" />\r
        <property name="clustal.wsdl" location="${wsdl.dir}/ClustalWS.wsdl" />\r
        <property name="muscle.wsdl" location="${wsdl.dir}/MuscleWS.wsdl" />\r
        <property name="tcoffee.wsdl" location="${wsdl.dir}/TcoffeeWS.wsdl" />\r
        <property name="mafft.wsdl" location="${wsdl.dir}/MafftWS.wsdl" />\r
-       <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
 \r
        <taskdef name="wsgen" onerror="report" classname="com.sun.tools.ws.ant.WsGen">\r
                <classpath refid="project.classpath" />\r
@@ -51,6 +51,17 @@
                        <!-- sourcedestdir -  Where to put generated source files -->\r
                        <!-- resourcedestdir - Where to put generated source files -->\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
+                               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