public final int from;\r
public final int to;\r
\r
+ private Range() {\r
+ // JAXB default constructor should not be used\r
+ from = 0;\r
+ to = from;\r
+ }\r
+\r
public Range(int from, int to) {\r
this.from = from;\r
this.to = to;\r
\r
import javax.xml.bind.annotation.XmlAccessType;\r
import javax.xml.bind.annotation.XmlAccessorType;\r
-import javax.xml.bind.annotation.XmlElement;\r
-import javax.xml.bind.annotation.XmlTransient;\r
\r
import compbio.util.annotation.Immutable;\r
\r
@Immutable\r
public class Score {\r
\r
- @XmlTransient\r
static final NumberFormat NUMBER_FORMAT = NumberFormat\r
.getNumberInstance(Locale.UK);\r
static {\r
NUMBER_FORMAT.setGroupingUsed(false);\r
NUMBER_FORMAT.setMaximumFractionDigits(3);\r
}\r
+ // This should be Enum<?> but JAXB cannot serialize it.\r
+ private final String method;\r
\r
- private Enum<?> method;\r
- // private String method;\r
-\r
- @XmlElement\r
private TreeSet<Range> ranges = new TreeSet<Range>();\r
\r
- @XmlElement\r
private ArrayList<Float> scores = new ArrayList<Float>(0);\r
\r
private Score() {\r
// JaXB default constructor\r
+ method = null;\r
}\r
\r
/**\r
* alignment\r
*/\r
public Score(Enum<?> method, ArrayList<Float> scores) {\r
- this.method = method;\r
+ this.method = method.toString();\r
this.scores = new ArrayList<Float>(scores);\r
}\r
\r
* function, usually can be calculated based on scores\r
*/\r
public Score(Enum<?> method, ArrayList<Float> scores, TreeSet<Range> ranges) {\r
- this.method = method;\r
+ this.method = method.toString();\r
this.ranges = ranges;\r
this.scores = scores;\r
}\r
\r
public Score(Enum<?> method, TreeSet<Range> ranges) {\r
- this.method = method;\r
+ this.method = method.toString();\r
this.ranges = ranges;\r
}\r
\r
public Score(Enum<?> method, float[] scores) {\r
- this.method = method;\r
+ this.method = method.toString();\r
this.scores = toList(scores);\r
}\r
\r
* \r
* @return the ConservationMethod\r
*/\r
- public Enum<?> getMethod() {\r
+ public String getMethod() {\r
return method;\r
}\r
\r
\r
import javax.xml.bind.annotation.XmlAccessType;\r
import javax.xml.bind.annotation.XmlAccessorType;\r
+import javax.xml.bind.annotation.XmlTransient;\r
\r
@XmlAccessorType(XmlAccessType.FIELD)\r
public class ScoreManager {\r
\r
+ @XmlTransient\r
public static final String SINGLE_ENTRY_KEY = "Alignment";\r
\r
private List<ScoreHolder> seqScores;\r
}\r
writer.flush();\r
}\r
- \r
\r
@Override\r
public int hashCode() {\r
return true;\r
}\r
\r
-\r
-\r
@XmlAccessorType(XmlAccessType.FIELD)\r
public static class ScoreHolder {\r
\r
public String id;\r
- public Set<Score> scores;\r
+ public HashSet<Score> scores;\r
\r
private ScoreHolder() {\r
// JAXB Default constructor should not be used otherwise\r
\r
ScoreHolder(String id, Set<Score> scores) {\r
this.id = id;\r
- this.scores = scores;\r
+ this.scores = new HashSet<Score>(scores);\r
}\r
\r
public void writeOut(OutputStream outStream) throws IOException {\r
\r
public Score getScoreByMethod(Enum<?> method) {\r
for (Score sc : scores) {\r
- if (method == sc.getMethod()) {\r
+ if (method.toString().equals(sc.getMethod())) {\r
return sc;\r
}\r
}\r
return null;\r
}\r
-\r
public int getNumberOfScores() {\r
return scores.size();\r
}\r
return false;\r
return true;\r
}\r
- \r
- \r
+\r
}\r
}\r
- you do not have interfaces to serialize. JAXB cannot serialize them.\r
- you have a default no args constructor (can be private if you do not need it)\r
- JAXB cannot serialize a Map, use custom data structure instead!\r
+ - Enum cannot be serialized as its abstract class (do not confuse with enum which is fine)\r
+ - Fields serialization leave a little more space for manuevre, so use it. If you do you then \r
+ can accept and return interfaces, e.g. List, Map; abstract classes etc, from your methods. \r
+ \r
If you have the data on the server side, but nothing is coming through to the client, \r
this is a JAXB serialization problem. They tend to be very silent and thus hard to debug. Check your \r
data structure can be serialized! \r
}\r
for (Score score : scores) {\r
\r
- if (score.getMethod() == (Enum<?>) GlobProtResult.Disorder) {\r
+ if (score.getMethod()\r
+ .equals(GlobProtResult.Disorder.toString())) {\r
assertEquals(score.getRanges().size(), 7);\r
assertTrue(score.getScores().isEmpty());\r
}\r
- if (score.getMethod() == (Enum<?>) GlobProtResult.Dydx) {\r
+ if (GlobProtResult.valueOf(score.getMethod()) == GlobProtResult.Dydx) {\r
assertFalse(score.getScores().isEmpty());\r
assertTrue(score.getRanges().isEmpty());\r
}\r
\r
package compbio.data.msa.jaxws;\r
\r
-import java.util.HashMap;\r
-import java.util.HashSet;\r
import javax.xml.bind.annotation.XmlAccessType;\r
import javax.xml.bind.annotation.XmlAccessorType;\r
import javax.xml.bind.annotation.XmlElement;\r
public class GetAnnotationResponse {\r
\r
@XmlElement(name = "return", namespace = "")\r
- private HashMap<String, HashSet<compbio.data.sequence.Score>> _return;\r
+ private compbio.data.sequence.ScoreManager _return;\r
\r
/**\r
* \r
* @return\r
- * returns HashMap<String,HashSet<Score>>\r
+ * returns ScoreManager\r
*/\r
- public HashMap<String, HashSet<compbio.data.sequence.Score>> getReturn() {\r
+ public compbio.data.sequence.ScoreManager getReturn() {\r
return this._return;\r
}\r
\r
* @param _return\r
* the value for the _return property\r
*/\r
- public void setReturn(HashMap<String, HashSet<compbio.data.sequence.Score>> _return) {\r
+ public void setReturn(compbio.data.sequence.ScoreManager _return) {\r
this._return = _return;\r
}\r
\r
\r
/**\r
* This class was generated by the JAX-WS RI.\r
- * JAX-WS RI 2.2.1-hudson-28-\r
- * Generated source version: 2.2.1\r
+ * JAX-WS RI 2.1.6 in JDK 6\r
+ * Generated source version: 2.1.6\r
* \r
*/\r
@XmlRootElement(name = "JobSubmissionException", namespace = "http://msa.data.compbio/01/12/2010/")\r
\r
/**\r
* This class was generated by the JAX-WS RI.\r
- * JAX-WS RI 2.2.1-hudson-28-\r
- * Generated source version: 2.2.1\r
+ * JAX-WS RI 2.1.6 in JDK 6\r
+ * Generated source version: 2.1.6\r
* \r
*/\r
@XmlRootElement(name = "LimitExceededException", namespace = "http://msa.data.compbio/01/12/2010/")\r
\r
/**\r
* This class was generated by the JAX-WS RI.\r
- * JAX-WS RI 2.2.1-hudson-28-\r
- * Generated source version: 2.2.1\r
+ * JAX-WS RI 2.1.6 in JDK 6\r
+ * Generated source version: 2.1.6\r
* \r
*/\r
@XmlRootElement(name = "ResultNotAvailableException", namespace = "http://msa.data.compbio/01/12/2010/")\r
\r
/**\r
* This class was generated by the JAX-WS RI.\r
- * JAX-WS RI 2.2.1-hudson-28-\r
- * Generated source version: 2.2.1\r
+ * JAX-WS RI 2.1.6 in JDK 6\r
+ * Generated source version: 2.1.6\r
* \r
*/\r
@XmlRootElement(name = "UnsupportedRuntimeException", namespace = "http://msa.data.compbio/01/12/2010/")\r
\r
/**\r
* This class was generated by the JAX-WS RI.\r
- * JAX-WS RI 2.2.1-hudson-28-\r
- * Generated source version: 2.2.1\r
+ * JAX-WS RI 2.1.6 in JDK 6\r
+ * Generated source version: 2.1.6\r
* \r
*/\r
@XmlRootElement(name = "WrongParameterException", namespace = "http://msa.data.compbio/01/12/2010/")\r
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. -->
-<definitions targetNamespace="http://msa.data.compbio/01/12/2010/" name="AAConWS" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:tns="http://msa.data.compbio/01/12/2010/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.6 in JDK 6. -->
+<definitions targetNamespace="http://msa.data.compbio/01/12/2010/" name="AAConWS" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://msa.data.compbio/01/12/2010/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<types>
<xsd:schema>
<xsd:import namespace="http://msa.data.compbio/01/12/2010/" schemaLocation="AAConWS_schema1.xsd"/>
</message>
<portType name="SequenceAnnotation">
<operation name="analize">
- <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeRequest" message="tns:analize"/>
- <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeResponse" message="tns:analizeResponse"/>
- <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/UnsupportedRuntimeException"/>
- <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/LimitExceededException"/>
- <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/JobSubmissionException"/>
+ <input message="tns:analize"/>
+ <output message="tns:analizeResponse"/>
+ <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException"/>
+ <fault message="tns:LimitExceededException" name="LimitExceededException"/>
+ <fault message="tns:JobSubmissionException" name="JobSubmissionException"/>
</operation>
<operation name="customAnalize">
- <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeRequest" message="tns:customAnalize"/>
- <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeResponse" message="tns:customAnalizeResponse"/>
- <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalize/Fault/UnsupportedRuntimeException"/>
- <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalize/Fault/LimitExceededException"/>
- <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalize/Fault/JobSubmissionException"/>
- <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalize/Fault/WrongParameterException"/>
+ <input message="tns:customAnalize"/>
+ <output message="tns:customAnalizeResponse"/>
+ <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException"/>
+ <fault message="tns:LimitExceededException" name="LimitExceededException"/>
+ <fault message="tns:JobSubmissionException" name="JobSubmissionException"/>
+ <fault message="tns:WrongParameterException" name="WrongParameterException"/>
</operation>
<operation name="presetAnalize">
- <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalizeRequest" message="tns:presetAnalize"/>
- <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalizeResponse" message="tns:presetAnalizeResponse"/>
- <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/UnsupportedRuntimeException"/>
- <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/LimitExceededException"/>
- <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
- <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
+ <input message="tns:presetAnalize"/>
+ <output message="tns:presetAnalizeResponse"/>
+ <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException"/>
+ <fault message="tns:LimitExceededException" name="LimitExceededException"/>
+ <fault message="tns:JobSubmissionException" name="JobSubmissionException"/>
+ <fault message="tns:WrongParameterException" name="WrongParameterException"/>
</operation>
<operation name="getAnnotation">
- <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
- <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
- <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
+ <input message="tns:getAnnotation"/>
+ <output message="tns:getAnnotationResponse"/>
+ <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException"/>
</operation>
<operation name="pullExecStatistics">
- <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
- <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
+ <input message="tns:pullExecStatistics"/>
+ <output message="tns:pullExecStatisticsResponse"/>
</operation>
<operation name="cancelJob">
- <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
- <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
+ <input message="tns:cancelJob"/>
+ <output message="tns:cancelJobResponse"/>
</operation>
<operation name="getJobStatus">
- <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getJobStatusRequest" message="tns:getJobStatus"/>
- <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getJobStatusResponse" message="tns:getJobStatusResponse"/>
+ <input message="tns:getJobStatus"/>
+ <output message="tns:getJobStatusResponse"/>
</operation>
<operation name="getPresets">
- <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
- <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsResponse" message="tns:getPresetsResponse"/>
+ <input message="tns:getPresets"/>
+ <output message="tns:getPresetsResponse"/>
</operation>
<operation name="getLimit">
- <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitRequest" message="tns:getLimit"/>
- <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitResponse" message="tns:getLimitResponse"/>
+ <input message="tns:getLimit"/>
+ <output message="tns:getLimitResponse"/>
</operation>
<operation name="getLimits">
- <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
- <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
+ <input message="tns:getLimits"/>
+ <output message="tns:getLimitsResponse"/>
</operation>
<operation name="getRunnerOptions">
- <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
- <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+ <input message="tns:getRunnerOptions"/>
+ <output message="tns:getRunnerOptionsResponse"/>
</operation>
</portType>
<binding name="AAConWSPortBinding" type="tns:SequenceAnnotation">
<xs:complexType name="getAnnotationResponse">
<xs:sequence>
- <xs:element name="return" type="tns:hashMap" minOccurs="0"/>
+ <xs:element name="return" type="tns:scoreManager" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="hashMap">
- <xs:complexContent>
- <xs:extension base="tns:abstractMap">
- <xs:sequence/>
- </xs:extension>
- </xs:complexContent>
+ <xs:complexType name="scoreManager">
+ <xs:sequence>
+ <xs:element name="seqScores" type="tns:scoreHolder" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
</xs:complexType>
- <xs:complexType name="abstractMap" abstract="true">
- <xs:sequence/>
+ <xs:complexType name="scoreHolder">
+ <xs:sequence>
+ <xs:element name="id" type="xs:string" minOccurs="0"/>
+ <xs:element name="scores" type="tns:score" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="score">
+ <xs:sequence>
+ <xs:element name="method" type="xs:string" minOccurs="0"/>
+ <xs:element name="ranges" type="tns:range" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="scores" type="xs:float" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="range">
+ <xs:sequence>
+ <xs:element name="from" type="xs:int"/>
+ <xs:element name="to" type="xs:int"/>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="ResultNotAvailableException">
<xs:complexType name="getAnnotationResponse">
<xs:sequence>
- <xs:element name="return" type="tns:hashMap" minOccurs="0"/>
+ <xs:element name="return" type="tns:scoreManager" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="hashMap">
- <xs:complexContent>
- <xs:extension base="tns:abstractMap">
- <xs:sequence/>
- </xs:extension>
- </xs:complexContent>
+ <xs:complexType name="scoreManager">
+ <xs:sequence>
+ <xs:element name="seqScores" type="tns:scoreHolder" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
</xs:complexType>
- <xs:complexType name="abstractMap" abstract="true">
- <xs:sequence/>
+ <xs:complexType name="scoreHolder">
+ <xs:sequence>
+ <xs:element name="id" type="xs:string" minOccurs="0"/>
+ <xs:element name="scores" type="tns:score" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="score">
+ <xs:sequence>
+ <xs:element name="method" type="xs:string" minOccurs="0"/>
+ <xs:element name="ranges" type="tns:range" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="scores" type="xs:float" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="range">
+ <xs:sequence>
+ <xs:element name="from" type="xs:int"/>
+ <xs:element name="to" type="xs:int"/>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="ResultNotAvailableException">
<xs:complexType name="getAnnotationResponse">
<xs:sequence>
- <xs:element name="return" type="tns:hashMap" minOccurs="0"/>
+ <xs:element name="return" type="tns:scoreManager" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="hashMap">
- <xs:complexContent>
- <xs:extension base="tns:abstractMap">
- <xs:sequence/>
- </xs:extension>
- </xs:complexContent>
+ <xs:complexType name="scoreManager">
+ <xs:sequence>
+ <xs:element name="seqScores" type="tns:scoreHolder" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
</xs:complexType>
- <xs:complexType name="abstractMap" abstract="true">
- <xs:sequence/>
+ <xs:complexType name="scoreHolder">
+ <xs:sequence>
+ <xs:element name="id" type="xs:string" minOccurs="0"/>
+ <xs:element name="scores" type="tns:score" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="score">
+ <xs:sequence>
+ <xs:element name="method" type="xs:string" minOccurs="0"/>
+ <xs:element name="ranges" type="tns:range" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="scores" type="xs:float" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="range">
+ <xs:sequence>
+ <xs:element name="from" type="xs:int"/>
+ <xs:element name="to" type="xs:int"/>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="ResultNotAvailableException">
<xs:complexType name="getAnnotationResponse">
<xs:sequence>
- <xs:element name="return" type="tns:hashMap" minOccurs="0"/>
+ <xs:element name="return" type="tns:scoreManager" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="hashMap">
- <xs:complexContent>
- <xs:extension base="tns:abstractMap">
- <xs:sequence/>
- </xs:extension>
- </xs:complexContent>
+ <xs:complexType name="scoreManager">
+ <xs:sequence>
+ <xs:element name="seqScores" type="tns:scoreHolder" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
</xs:complexType>
- <xs:complexType name="abstractMap" abstract="true">
- <xs:sequence/>
+ <xs:complexType name="scoreHolder">
+ <xs:sequence>
+ <xs:element name="id" type="xs:string" minOccurs="0"/>
+ <xs:element name="scores" type="tns:score" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="score">
+ <xs:sequence>
+ <xs:element name="method" type="xs:string" minOccurs="0"/>
+ <xs:element name="ranges" type="tns:range" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="scores" type="xs:float" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="range">
+ <xs:sequence>
+ <xs:element name="from" type="xs:int"/>
+ <xs:element name="to" type="xs:int"/>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="ResultNotAvailableException">
<property name="disembl.wsdl" location="${wsdl.dir}/DisemblWS.wsdl" />\r
<property name="globplot.wsdl" location="${wsdl.dir}/GlobPlotWS.wsdl" />\r
<property name="jronn.wsdl" location="${wsdl.dir}/JronnWS.wsdl" />\r
+ \r
\r
- <taskdef name="wsgen" classname="com.sun.tools.ws.ant.WsGen">\r
+ <taskdef name="wsgen" onerror="report" classname="com.sun.tools.ws.ant.WsGen">\r
<classpath refid="project.classpath" />\r
</taskdef>\r
\r
<!-- destdir - Where to put generated classes -->\r
<!-- sourcedestdir - Where to put generated source files -->\r
<!-- resourcedestdir - Where to put generated source files -->\r
+\r
<wsgen sei="compbio.ws.server.AAConWS" \r
sourcedestdir="${basedir}/webservices" \r
destdir="${classes}" \r
<classpath refid="classes.path" />\r
<classpath refid="project.classpath" />\r
</wsgen>\r
+\r
<wsgen sei="compbio.ws.server.ClustalWS" \r
sourcedestdir="${basedir}/webservices" \r
destdir="${classes}" \r
<classpath refid="classes.path" />\r
<classpath refid="project.classpath" />\r
</wsgen>\r
+ \r
<wsgen sei="compbio.ws.server.DisemblWS" \r
sourcedestdir="${basedir}/webservices" \r
destdir="${classes}" \r
git://source.jalview.org / jabaws.git / commitdiff