AAConWS is working

[jabaws.git] / webservices / compbio / data / msa / Annotation.java

diff --git a/webservices/compbio/data/msa/Annotation.java b/webservices/compbio/data/msa/Annotation.java
index c73c0bc..fb8436d 100644 (file)
--- a/webservices/compbio/data/msa/Annotation.java
+++ b/webservices/compbio/data/msa/Annotation.java
@@ -1,13 +1,15 @@
 package compbio.data.msa;\r
 \r
 import java.security.InvalidParameterException;\r
+import java.util.HashSet;\r
 import java.util.List;\r
 \r
+import javax.jws.WebMethod;\r
 import javax.jws.WebParam;\r
 import javax.jws.WebService;\r
 \r
 import compbio.data.sequence.FastaSequence;\r
-import compbio.data.sequence.MultiAnnotatedSequence;\r
+import compbio.data.sequence.Score;\r
 import compbio.metadata.JobSubmissionException;\r
 import compbio.metadata.LimitExceededException;\r
 import compbio.metadata.Option;\r
@@ -26,7 +28,7 @@ import compbio.metadata.WrongParameterException;
  * @param <T>\r
  *            executable type / web service type\r
  */\r
-@WebService(targetNamespace = "http://a.data.compbio/01/12/2010/")\r
+@WebService(targetNamespace = "http://msa.data.compbio/01/12/2010/")\r
 public interface Annotation<T> extends JManagement, Metadata<T> {\r
 \r
        /**\r
@@ -60,6 +62,7 @@ public interface Annotation<T> extends JManagement, Metadata<T> {
         *             is throw if the input sequences number or average length\r
         *             exceeds what is defined by the limit\r
         */\r
+       @WebMethod\r
        String analize(\r
                        @WebParam(name = "fastaSequences") List<FastaSequence> sequences)\r
                        throws UnsupportedRuntimeException, LimitExceededException,\r
@@ -103,6 +106,7 @@ public interface Annotation<T> extends JManagement, Metadata<T> {
         *             is throw if the input sequences number or average length\r
         *             exceeds what is defined by the limit\r
         */\r
+       @WebMethod\r
        String customAnalize(\r
                        @WebParam(name = "fastaSequences") List<FastaSequence> sequences,\r
                        @WebParam(name = "options") List<Option<T>> options)\r
@@ -147,6 +151,7 @@ public interface Annotation<T> extends JManagement, Metadata<T> {
         *             is throw if the input sequences number or average length\r
         *             exceeds what is defined by the limit\r
         */\r
+       @WebMethod\r
        String presetAnalize(\r
                        @WebParam(name = "fastaSequences") List<FastaSequence> sequences,\r
                        @WebParam(name = "preset") Preset<T> preset)\r
@@ -170,6 +175,8 @@ public interface Annotation<T> extends JManagement, Metadata<T> {
         *             thrown if jobId is empty or cannot be recognised e.g. in\r
         *             invalid format\r
         */\r
-       MultiAnnotatedSequence<?> getResult(@WebParam(name = "jobId") String jobId)\r
+       @WebMethod\r
+       HashSet<Score> getConservation(@WebParam(name = "jobId") String jobId)\r
                        throws ResultNotAvailableException;\r
+\r
 }\r