X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=webservices%2Fcompbio%2Fws%2Fserver%2FAAConWS.java;h=8dce707d0cbbf8a6fb314fe083bc677b22b52656;hb=4c022b67a736b6f79dbe212d73016607cf298422;hp=d9fd54f2a4f189c9fe5aba3b14715eb895c20dbc;hpb=61af8ce2cea02220228f58b30b4319f500b2f040;p=jabaws.git

diff --git a/webservices/compbio/ws/server/AAConWS.java b/webservices/compbio/ws/server/AAConWS.java
index d9fd54f..8dce707 100644
--- a/webservices/compbio/ws/server/AAConWS.java
+++ b/webservices/compbio/ws/server/AAConWS.java
@@ -1,3 +1,20 @@
+/* Copyright (c) 2011 Peter Troshin
+ *  
+ *  JAva Bioinformatics Analysis Web Services (JABAWS) @version: 2.0     
+ * 
+ *  This library is free software; you can redistribute it and/or modify it under the terms of the
+ *  Apache License version 2 as published by the Apache Software Foundation
+ * 
+ *  This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ *  even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Apache 
+ *  License for more details.
+ * 
+ *  A copy of the license is in apache_license.txt. It is also available here:
+ * @see: http://www.apache.org/licenses/LICENSE-2.0.txt
+ * 
+ * Any republication or derived work distributed in source code form
+ * must include this copyright and license notice.
+ */
 package compbio.ws.server;
 
 import java.io.File;
@@ -8,6 +25,7 @@ import javax.jws.WebService;
 
 import org.apache.log4j.Logger;
 
+import compbio.data.msa.JABAService;
 import compbio.data.msa.SequenceAnnotation;
 import compbio.data.sequence.FastaSequence;
 import compbio.engine.Configurator;
@@ -15,10 +33,13 @@ import compbio.engine.client.ConfiguredExecutable;
 import compbio.metadata.ChunkHolder;
 import compbio.metadata.JobSubmissionException;
 import compbio.metadata.LimitExceededException;
+import compbio.metadata.Option;
+import compbio.metadata.Preset;
 import compbio.metadata.UnsupportedRuntimeException;
+import compbio.metadata.WrongParameterException;
 import compbio.runner.conservation.AACon;
 
-@WebService(endpointInterface = "compbio.data.msa.SequenceAnnotation", targetNamespace = "http://msa.data.compbio/01/12/2010/", serviceName = "AAConWS")
+@WebService(endpointInterface = "compbio.data.msa.SequenceAnnotation", targetNamespace = JABAService.V2_SERVICE_NAMESPACE, serviceName = "AAConWS")
 public class AAConWS extends SequenceAnnotationService<AACon>
 		implements
 			SequenceAnnotation<AACon> {
@@ -52,6 +73,24 @@ public class AAConWS extends SequenceAnnotationService<AACon>
 	}
 
 	@Override
+	public String customAnalize(List<FastaSequence> sequences,
+			List<Option<AACon>> options) throws UnsupportedRuntimeException,
+			LimitExceededException, JobSubmissionException,
+			WrongParameterException {
+		WSUtil.validateAAConInput(sequences);
+		return super.customAnalize(sequences, options);
+	}
+
+	@Override
+	public String presetAnalize(List<FastaSequence> sequences,
+			Preset<AACon> preset) throws UnsupportedRuntimeException,
+			LimitExceededException, JobSubmissionException,
+			WrongParameterException {
+		WSUtil.validateAAConInput(sequences);
+		return super.presetAnalize(sequences, preset);
+	}
+
+	@Override
 	public ChunkHolder pullExecStatistics(String jobId, long position) {
 		WSUtil.validateJobId(jobId);
 		String file = Configurator.getWorkDirectory(jobId) + File.separator