Merge branch 'DAO'

Conflicts:
	datadb/compbio/cassandra/CassandraReaderOld.java

diff --cc server/compbio/ws/jpred/jaxws/FindJobForSequence.java
index 0000000,0000000..6142ff7
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/server/compbio/ws/jpred/jaxws/FindJobForSequence.java
@@@ -1,0 -1,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 --cc server/compbio/ws/jpred/jaxws/FindJobForSequenceResponse.java
index 0000000,0000000..d367d02
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/server/compbio/ws/jpred/jaxws/FindJobForSequenceResponse.java
@@@ -1,0 -1,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 --cc server/compbio/ws/jpred/jaxws/GetArchive.java
index 0000000,0000000..2fab038
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/server/compbio/ws/jpred/jaxws/GetArchive.java
@@@ -1,0 -1,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 --cc server/compbio/ws/jpred/jaxws/GetArchiveResponse.java
index 0000000,0000000..ac6b0db
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/server/compbio/ws/jpred/jaxws/GetArchiveResponse.java
@@@ -1,0 -1,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;
++    }
++
++}