From: Sasha Sherstnev Date: Fri, 31 Jan 2014 16:34:26 +0000 (+0000) Subject: Merge branch 'DAO' X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=986f73f677c2e0cc6bc452d3f2e0cf9b7a4108aa;hp=d1048dc77b419ac536dee9ce6fa3113613172b9c;p=proteocache.git Merge branch 'DAO' Conflicts: datadb/compbio/cassandra/CassandraReaderOld.java --- diff --git a/WEB-INF/lib/webservices-rt.jar b/WEB-INF/lib/webservices-rt.jar new file mode 100644 index 0000000..6741549 Binary files /dev/null and b/WEB-INF/lib/webservices-rt.jar differ diff --git a/WEB-INF/lib/webservices-tools.jar b/WEB-INF/lib/webservices-tools.jar new file mode 100644 index 0000000..e0426b8 Binary files /dev/null and b/WEB-INF/lib/webservices-tools.jar differ diff --git a/WEB-INF/sun-jaxws.xml b/WEB-INF/sun-jaxws.xml new file mode 100644 index 0000000..c6b4285 --- /dev/null +++ b/WEB-INF/sun-jaxws.xml @@ -0,0 +1,6 @@ + + + + diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml index 9f2caa5..0808c19 100644 --- a/WEB-INF/web.xml +++ b/WEB-INF/web.xml @@ -20,7 +20,10 @@ org.springframework.web.context.ContextLoaderListener - + + com.sun.xml.ws.transport.http.servlet.WSServletContextListener + + contextConfigLocation @@ -67,6 +70,18 @@ compbio.listeners.ContextListener + + com.sun.xml.ws.transport.http.servlet.WSServletContextListener + + + JpredWS + com.sun.xml.ws.transport.http.servlet.WSServlet + 1 + + + JpredWS + /JpredWS + diff --git a/server/compbio/ws/jpred/Jpred.java b/server/compbio/ws/jpred/Jpred.java new file mode 100644 index 0000000..cebac29 --- /dev/null +++ b/server/compbio/ws/jpred/Jpred.java @@ -0,0 +1,12 @@ +package compbio.ws.jpred; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebService; + +@WebService(targetNamespace = "http://server.proteocache.ws") +public interface Jpred { + @WebMethod + public String findSequence(@WebParam(name = "sequence") String sequence, @WebParam(name = "program") String program, + @WebParam(name = "version") String version); +} diff --git a/server/compbio/ws/jpred/JpredClient.java b/server/compbio/ws/jpred/JpredClient.java new file mode 100644 index 0000000..08948e8 --- /dev/null +++ b/server/compbio/ws/jpred/JpredClient.java @@ -0,0 +1,23 @@ +package compbio.ws.jpred; + +import javax.xml.ws.Service; +import javax.xml.namespace.QName; + +import java.net.URL; + +/** + * + */ +public class JpredClient { + + public static void main(String[] args) throws Exception { + QName qname = new QName("http://server.proteocache.ws", "ProteoCacheWS"); + + Service service = Service.create(new URL("http://localhost:8080/proteocache-1.0/ProteoCacheWS"), qname); + Jpred sequense = service.getPort(Jpred.class); + String result = sequense.findSequence("EQCGRQAGGKLCPNNLCCSQWGWCGSTDEYCS", "Jpred", "3.0.1"); + + System.out.println("Result : " + result); + } + +} diff --git a/server/compbio/ws/jpred/JpredWS.java b/server/compbio/ws/jpred/JpredWS.java new file mode 100644 index 0000000..16e100f --- /dev/null +++ b/server/compbio/ws/jpred/JpredWS.java @@ -0,0 +1,27 @@ +package compbio.ws.jpred; + +import javax.jws.WebService; + +import org.apache.log4j.Logger; + +import compbio.cassandra.CassandraNativeConnector; +import compbio.cassandra.readers.SequenceReader; + +@WebService(endpointInterface = "compbio.ws.jpred.Jpred", targetNamespace = "http://server.proteocache.ws", serviceName = "ProteoCacheWS", portName = "ProteoCacheWSPort") +public class JpredWS implements Jpred { + private static Logger log = Logger.getLogger(CassandraNativeConnector.class); + + @Override + public String findSequence(String sequence, String program, String version) { + CassandraNativeConnector dbconnector = new CassandraNativeConnector(); + SequenceReader reader = new SequenceReader(); + reader.setSession(dbconnector.getSession()); + log.debug("ProteoCacheWS is connected:\n search for sequence: " + sequence + "\ncalculated wih " + program + " (version; " + + version + ")"); + if (null != reader.readProteins(sequence, "whole")) { + return "The sequence " + sequence + " found. Calculated with " + program + "(" + version + ")"; + } + return "The sequence " + sequence + " not found"; + } + +} diff --git a/server/compbio/ws/jpred/jaxws/FindJobForSequence.java b/server/compbio/ws/jpred/jaxws/FindJobForSequence.java new file mode 100644 index 0000000..6142ff7 --- /dev/null +++ b/server/compbio/ws/jpred/jaxws/FindJobForSequence.java @@ -0,0 +1,80 @@ + +package compbio.ws.jpred.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "findJobForSequence", namespace = "http://server.proteocache.ws") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "findJobForSequence", namespace = "http://server.proteocache.ws", propOrder = { + "sequence", + "program", + "version" +}) +public class FindJobForSequence { + + @XmlElement(name = "sequence", namespace = "") + private String sequence; + @XmlElement(name = "program", namespace = "") + private String program; + @XmlElement(name = "version", namespace = "") + private String version; + + /** + * + * @return + * returns String + */ + public String getSequence() { + return this.sequence; + } + + /** + * + * @param sequence + * the value for the sequence property + */ + public void setSequence(String sequence) { + this.sequence = sequence; + } + + /** + * + * @return + * returns String + */ + public String getProgram() { + return this.program; + } + + /** + * + * @param program + * the value for the program property + */ + public void setProgram(String program) { + this.program = program; + } + + /** + * + * @return + * returns String + */ + public String getVersion() { + return this.version; + } + + /** + * + * @param version + * the value for the version property + */ + public void setVersion(String version) { + this.version = version; + } + +} diff --git a/server/compbio/ws/jpred/jaxws/FindJobForSequenceResponse.java b/server/compbio/ws/jpred/jaxws/FindJobForSequenceResponse.java new file mode 100644 index 0000000..d367d02 --- /dev/null +++ b/server/compbio/ws/jpred/jaxws/FindJobForSequenceResponse.java @@ -0,0 +1,36 @@ + +package compbio.ws.jpred.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "findJobForSequenceResponse", namespace = "http://server.proteocache.ws") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "findJobForSequenceResponse", namespace = "http://server.proteocache.ws") +public class FindJobForSequenceResponse { + + @XmlElement(name = "return", namespace = "") + private String _return; + + /** + * + * @return + * returns String + */ + public String getReturn() { + return this._return; + } + + /** + * + * @param _return + * the value for the _return property + */ + public void setReturn(String _return) { + this._return = _return; + } + +} diff --git a/server/compbio/ws/jpred/jaxws/FindSequence.java b/server/compbio/ws/jpred/jaxws/FindSequence.java new file mode 100644 index 0000000..d1b23d2 --- /dev/null +++ b/server/compbio/ws/jpred/jaxws/FindSequence.java @@ -0,0 +1,78 @@ +package compbio.ws.jpred.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "findSequence", namespace = "http://server.proteocache.ws") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "findSequence", namespace = "http://server.proteocache.ws", propOrder = { "sequence", "program", "version" }) +public class FindSequence { + + @XmlElement(name = "sequence", namespace = "") + private String sequence; + @XmlElement(name = "program", namespace = "") + private String program; + @XmlElement(name = "version", namespace = "") + private String version; + + /** + * + * @return returns String + */ + public String getSequence() { + System.out.println("FindSequence.setSequence: output sequence " + this.sequence); + return this.sequence; + } + + /** + * + * @param sequence + * the value for the sequence property + */ + public void setSequence(String sequence) { + System.out.println("FindSequence.setSequence: input sequence " + sequence); + this.sequence = sequence; + } + + /** + * + * @return returns String + */ + public String getProgram() { + System.out.println("FindSequence.setProgram: output program " + this.program); + return this.program; + } + + /** + * + * @param program + * the value for the program property + */ + public void setProgram(String program) { + System.out.println("FindSequence.setProgram: input program " + program); + this.program = program; + } + + /** + * + * @return returns String + */ + public String getVersion() { + System.out.println("FindSequence.setVersion: output version " + this.version); + return this.version; + } + + /** + * + * @param version + * the value for the version property + */ + public void setVersion(String version) { + System.out.println("FindSequence.setVersion: input version " + version); + this.version = version; + } + +} diff --git a/server/compbio/ws/jpred/jaxws/FindSequenceResponse.java b/server/compbio/ws/jpred/jaxws/FindSequenceResponse.java new file mode 100644 index 0000000..7889071 --- /dev/null +++ b/server/compbio/ws/jpred/jaxws/FindSequenceResponse.java @@ -0,0 +1,36 @@ + +package compbio.ws.jpred.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "findSequenceResponse", namespace = "http://server.proteocache.ws") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "findSequenceResponse", namespace = "http://server.proteocache.ws") +public class FindSequenceResponse { + + @XmlElement(name = "return", namespace = "") + private String _return; + + /** + * + * @return + * returns String + */ + public String getReturn() { + return this._return; + } + + /** + * + * @param _return + * the value for the _return property + */ + public void setReturn(String _return) { + this._return = _return; + } + +} diff --git a/server/compbio/ws/jpred/jaxws/GetArchive.java b/server/compbio/ws/jpred/jaxws/GetArchive.java new file mode 100644 index 0000000..2fab038 --- /dev/null +++ b/server/compbio/ws/jpred/jaxws/GetArchive.java @@ -0,0 +1,36 @@ + +package compbio.ws.jpred.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "getArchive", namespace = "http://server.proteocache.ws") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getArchive", namespace = "http://server.proteocache.ws") +public class GetArchive { + + @XmlElement(name = "job", namespace = "") + private String job; + + /** + * + * @return + * returns String + */ + public String getJob() { + return this.job; + } + + /** + * + * @param job + * the value for the job property + */ + public void setJob(String job) { + this.job = job; + } + +} diff --git a/server/compbio/ws/jpred/jaxws/GetArchiveResponse.java b/server/compbio/ws/jpred/jaxws/GetArchiveResponse.java new file mode 100644 index 0000000..ac6b0db --- /dev/null +++ b/server/compbio/ws/jpred/jaxws/GetArchiveResponse.java @@ -0,0 +1,36 @@ + +package compbio.ws.jpred.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "getArchiveResponse", namespace = "http://server.proteocache.ws") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getArchiveResponse", namespace = "http://server.proteocache.ws") +public class GetArchiveResponse { + + @XmlElement(name = "return", namespace = "") + private String _return; + + /** + * + * @return + * returns String + */ + public String getReturn() { + return this._return; + } + + /** + * + * @param _return + * the value for the _return property + */ + public void setReturn(String _return) { + this._return = _return; + } + +} diff --git a/server/compbio/ws/resources/ProteoCacheWS.wsdl b/server/compbio/ws/resources/ProteoCacheWS.wsdl new file mode 100644 index 0000000..c456e47 --- /dev/null +++ b/server/compbio/ws/resources/ProteoCacheWS.wsdl @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/server/compbio/ws/resources/ProteoCacheWS_schema1.xsd b/server/compbio/ws/resources/ProteoCacheWS_schema1.xsd new file mode 100644 index 0000000..d9ee154 --- /dev/null +++ b/server/compbio/ws/resources/ProteoCacheWS_schema1.xsd @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/resources/JpredWS.wsdl b/webapp/resources/JpredWS.wsdl new file mode 100644 index 0000000..98b4f77 --- /dev/null +++ b/webapp/resources/JpredWS.wsdl @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/resources/JpredWS_schema1.xsd b/webapp/resources/JpredWS_schema1.xsd new file mode 100644 index 0000000..7d32d9c --- /dev/null +++ b/webapp/resources/JpredWS_schema1.xsd @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/view/reports/Job.jsp b/webapp/view/reports/Job.jsp index e042564..4afbb89 100644 --- a/webapp/view/reports/Job.jsp +++ b/webapp/view/reports/Job.jsp @@ -10,7 +10,13 @@
- + + + + + + + diff --git a/wsbuild.xml b/wsbuild.xml new file mode 100644 index 0000000..0f5037d --- /dev/null +++ b/wsbuild.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +