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