http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_pubmed.xsd
----------------------------------------------------------------------
diff --git 
a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_pubmed.xsd 
b/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_pubmed.xsd
deleted file mode 100644
index 1435754..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_pubmed.xsd
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.ncbi.nlm.nih.gov/soap/eutils/efetch"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:tns="http://www.ncbi.nlm.nih.gov/soap/eutils/efetch"; 
elementFormDefault="qualified">
-    
-    <!--    version="1.5" -->
-    <!-- http://www.ncbi.nlm.nih.gov/entrez/query/DTD/pubmed_060101.dtd date: 
01/09/2006 -->
-
-       <xs:complexType name="ArticleIdType_pubmed">
-               <xs:simpleContent>
-                       <xs:extension base="xs:string">
-                               <xs:attribute name="IdType" default="pubmed">
-                                       <xs:simpleType>
-                                               <xs:restriction 
base="xs:NMTOKEN">
-                                                       <xs:enumeration 
value="doi"/>
-                                                       <xs:enumeration 
value="pii"/>
-                                                       <xs:enumeration 
value="pmcpid"/>
-                                                       <xs:enumeration 
value="pmpid"/>
-                                                       <xs:enumeration 
value="sici"/>
-                                                       <xs:enumeration 
value="pubmed"/>
-                                                       <xs:enumeration 
value="medline"/>
-                                                       <xs:enumeration 
value="pmcid"/>
-                                               </xs:restriction>
-                                       </xs:simpleType>
-                               </xs:attribute>
-                       </xs:extension>
-               </xs:simpleContent>
-       </xs:complexType>
-       <xs:complexType name="ArticleIdListType">
-               <xs:sequence>
-                       <xs:element name="ArticleId" 
type="tns:ArticleIdType_pubmed" maxOccurs="unbounded"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:element name="CitationSubset" type="xs:string"/>
-       <xs:complexType name="CommentInType">
-               <xs:sequence>
-                       <xs:element ref="tns:RefSource"/>
-                       <xs:element ref="tns:PMID" minOccurs="0"/>
-                       <xs:element ref="tns:Note" minOccurs="0"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:complexType name="CommentOnType">
-               <xs:sequence>
-                       <xs:element ref="tns:RefSource"/>
-                       <xs:element ref="tns:PMID" minOccurs="0"/>
-                       <xs:element ref="tns:Note" minOccurs="0"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:complexType name="CommentsCorrectionsType">
-               <xs:sequence>
-                       <xs:element name="CommentOn" type="tns:CommentOnType" 
minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element name="CommentIn" type="tns:CommentInType" 
minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element name="ErratumIn" type="tns:ErratumInType" 
minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element name="ErratumFor" type="tns:ErratumForType" 
minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element name="RepublishedFrom" 
type="tns:RepublishedFromType" minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element name="RepublishedIn" 
type="tns:RepublishedInType" minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element name="RetractionOf" 
type="tns:RetractionOfType" minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element name="RetractionIn" 
type="tns:RetractionInType" minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element name="UpdateIn" type="tns:UpdateInType" 
minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element name="UpdateOf" type="tns:UpdateOfType" 
minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element name="SummaryForPatientsIn" 
type="tns:SummaryForPatientsInType" minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element name="OriginalReportIn" 
type="tns:OriginalReportInType" minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element name="ReprintOf" type="tns:ReprintOfType" 
minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element name="ReprintIn" type="tns:ReprintInType" 
minOccurs="0" maxOccurs="unbounded"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:complexType name="DeleteCitationType">
-               <xs:sequence>
-                       <xs:element ref="tns:PMID" maxOccurs="unbounded"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:complexType name="ErratumForType">
-               <xs:sequence>
-                       <xs:element ref="tns:RefSource"/>
-                       <xs:element ref="tns:PMID" minOccurs="0"/>
-                       <xs:element ref="tns:Note" minOccurs="0"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:complexType name="ErratumInType">
-               <xs:sequence>
-                       <xs:element ref="tns:RefSource"/>
-                       <xs:element ref="tns:PMID" minOccurs="0"/>
-                       <xs:element ref="tns:Note" minOccurs="0"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:element name="GeneSymbol" type="xs:string"/>
-       <xs:complexType name="GeneSymbolListType">
-               <xs:sequence>
-                       <xs:element ref="tns:GeneSymbol" maxOccurs="unbounded"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:complexType name="HistoryType">
-               <xs:sequence>
-                       <xs:element name="PubMedPubDate" 
type="tns:PubMedPubDateType" maxOccurs="unbounded"/> 
-            <xs:any maxOccurs="unbounded"/>  <!--  ***** -->
-               </xs:sequence>
-       </xs:complexType>
-       <xs:complexType name="MedlineCitationType">
-               <xs:sequence>
-                       <xs:element ref="tns:NlmDcmsID" minOccurs="0"/>
-                       <xs:element ref="tns:PMID"/>
-                       <xs:element name="DateCreated" 
type="tns:DateCreatedType"/>
-                       <xs:element name="DateCompleted" 
type="tns:DateCompletedType" minOccurs="0"/>
-                       <xs:element name="DateRevised" 
type="tns:DateRevisedType" minOccurs="0"/>
-                       <xs:element name="Article" type="tns:ArticleType"/>
-                       <xs:element name="MedlineJournalInfo" 
type="tns:MedlineJournalInfoType"/>
-                       <xs:element name="ChemicalList" 
type="tns:ChemicalListType" minOccurs="0"/>
-                       <xs:element ref="tns:CitationSubset" minOccurs="0" 
maxOccurs="unbounded"/>
-                       <xs:element name="CommentsCorrections" 
type="tns:CommentsCorrectionsType" minOccurs="0"/>
-                       <xs:element name="GeneSymbolList" 
type="tns:GeneSymbolListType" minOccurs="0"/>
-                       <xs:element name="MeshHeadingList" 
type="tns:MeshHeadingListType" minOccurs="0"/>
-                       <xs:element ref="tns:NumberOfReferences" minOccurs="0"/>
-                       <xs:element name="PersonalNameSubjectList" 
type="tns:PersonalNameSubjectListType" minOccurs="0"/>
-                       <xs:element name="OtherID" type="tns:OtherIDType" 
minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element name="OtherAbstract" 
type="tns:OtherAbstractType" minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element name="KeywordList" 
type="tns:KeywordListType" minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element ref="tns:SpaceFlightMission" minOccurs="0" 
maxOccurs="unbounded"/>
-                       <xs:element name="InvestigatorList" 
type="tns:InvestigatorListType" minOccurs="0"/>
-                       <xs:element name="GeneralNote" 
type="tns:GeneralNoteType" minOccurs="0" maxOccurs="unbounded"/>
-               </xs:sequence>
-               <xs:attribute name="Owner" default="NLM">
-                       <xs:simpleType>
-                               <xs:restriction base="xs:NMTOKEN">
-                                       <xs:enumeration value="NLM"/>
-                                       <xs:enumeration value="NASA"/>
-                                       <xs:enumeration value="PIP"/>
-                                       <xs:enumeration value="KIE"/>
-                                       <xs:enumeration value="HSR"/>
-                                       <xs:enumeration value="HMD"/>
-                                       <xs:enumeration value="SIS"/>
-                                       <xs:enumeration value="NOTNLM"/>
-                               </xs:restriction>
-                       </xs:simpleType>
-               </xs:attribute>
-               <xs:attribute name="Status" type="xs:string"/>
-       </xs:complexType>
-       <xs:element name="MedlineCitationSet">
-               <xs:complexType>
-                       <xs:sequence>
-                               <xs:element name="MedlineCitation" 
type="tns:MedlineCitationType" minOccurs="0" maxOccurs="unbounded"/>
-                               <xs:element name="DeleteCitation" 
type="tns:DeleteCitationType" minOccurs="0"/>
-                       </xs:sequence>
-               </xs:complexType>
-       </xs:element>
-       <xs:complexType name="NCBIArticleType">
-               <xs:sequence>
-                       <xs:element ref="tns:PMID"/>
-                       <xs:element name="Article" type="tns:ArticleType"/>
-                       <xs:element name="MedlineJournalInfo" 
type="tns:MedlineJournalInfoType" minOccurs="0"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:element name="NlmDcmsID" type="xs:string"/>
-       <xs:element name="Note" type="xs:string"/>
-       <xs:element name="NumberOfReferences" type="xs:string"/>
-       <xs:complexType name="OriginalReportInType">
-               <xs:sequence>
-                       <xs:element ref="tns:RefSource"/>
-                       <xs:element ref="tns:PMID" minOccurs="0"/>
-                       <xs:element ref="tns:Note" minOccurs="0"/>
-               </xs:sequence>
-       </xs:complexType>
-
-       <xs:complexType name="PubMedPubDateType">
-               <xs:sequence>
-                       <xs:element ref="tns:Year"/>
-                       <xs:element ref="tns:Month"/>
-                       <xs:element ref="tns:Day"/>
-                       <xs:sequence minOccurs="0">
-                               <xs:element ref="tns:Hour"/>
-                               <xs:sequence minOccurs="0">
-                                       <xs:element ref="tns:Minute"/>
-                                       <xs:element ref="tns:Second" 
minOccurs="0"/>
-                               </xs:sequence>
-                       </xs:sequence>
-               </xs:sequence>
-               <xs:attribute name="PubStatus" use="required">
-                       <xs:simpleType>
-                               <xs:restriction base="xs:NMTOKEN">
-                                       <xs:enumeration value="received"/>
-                                       <xs:enumeration value="accepted"/>
-                                       <xs:enumeration value="epublish"/>
-                                       <xs:enumeration value="ppublish"/>
-                                       <xs:enumeration value="revised"/>
-                                       <xs:enumeration value="aheadofprint"/>
-                                       <xs:enumeration value="retracted"/>
-                                       <xs:enumeration value="pmc"/>
-                                       <xs:enumeration value="pmcr"/>
-                                       <xs:enumeration value="pubmed"/>
-                                       <xs:enumeration value="pubmedr"/>
-                                       <xs:enumeration value="premedline"/>
-                                       <xs:enumeration value="medline"/>
-                                       <xs:enumeration value="medliner"/>
-                               </xs:restriction>
-                       </xs:simpleType>
-               </xs:attribute>
-       </xs:complexType>
-
-       <xs:element name="PublicationStatus" type="xs:string"/>
-       <xs:complexType name="PubmedArticleType">
-               <xs:sequence>
-            <xs:element name="NCBIArticle" type="tns:NCBIArticleType"/>
-                       <xs:element name="MedlineCitation" 
type="tns:MedlineCitationType"/>
-                       <xs:element name="PubmedData" type="tns:PubmedDataType" 
minOccurs="0"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:element name="PubmedArticleSet">
-               <xs:complexType>
-                       <xs:sequence maxOccurs="unbounded">
-                               <xs:element name="PubmedArticle" 
type="tns:PubmedArticleType"/>
-                       </xs:sequence>
-               </xs:complexType>
-       </xs:element>
-       <xs:complexType name="PubmedDataType">
-               <xs:sequence>
-                       <xs:any minOccurs="0"/>
-                       <xs:element name="History" type="tns:HistoryType" 
minOccurs="0" maxOccurs="unbounded"/>
-                       <xs:element ref="tns:PublicationStatus"/>
-                       <xs:element name="ArticleIdList" 
type="tns:ArticleIdListType"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:element name="RefSource" type="xs:string"/>
-       <xs:complexType name="ReprintInType">
-               <xs:sequence>
-                       <xs:element ref="tns:RefSource"/>
-                       <xs:element ref="tns:PMID" minOccurs="0"/>
-                       <xs:element ref="tns:Note" minOccurs="0"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:complexType name="ReprintOfType">
-               <xs:sequence>
-                       <xs:element ref="tns:RefSource"/>
-                       <xs:element ref="tns:PMID" minOccurs="0"/>
-                       <xs:element ref="tns:Note" minOccurs="0"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:complexType name="RepublishedFromType">
-               <xs:sequence>
-                       <xs:element ref="tns:RefSource"/>
-                       <xs:element ref="tns:PMID" minOccurs="0"/>
-                       <xs:element ref="tns:Note" minOccurs="0"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:complexType name="RepublishedInType">
-               <xs:sequence>
-                       <xs:element ref="tns:RefSource"/>
-                       <xs:element ref="tns:PMID" minOccurs="0"/>
-                       <xs:element ref="tns:Note" minOccurs="0"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:complexType name="RetractionInType">
-               <xs:sequence>
-                       <xs:element ref="tns:RefSource"/>
-                       <xs:element ref="tns:PMID" minOccurs="0"/>
-                       <xs:element ref="tns:Note" minOccurs="0"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:complexType name="RetractionOfType">
-               <xs:sequence>
-                       <xs:element ref="tns:RefSource"/>
-                       <xs:element ref="tns:PMID" minOccurs="0"/>
-                       <xs:element ref="tns:Note" minOccurs="0"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:complexType name="SummaryForPatientsInType">
-               <xs:sequence>
-                       <xs:element ref="tns:RefSource"/>
-                       <xs:element ref="tns:PMID" minOccurs="0"/>
-                       <xs:element ref="tns:Note" minOccurs="0"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:element name="URL">
-               <xs:complexType>
-                       <xs:simpleContent>
-                               <xs:extension base="xs:string">
-                                       <xs:attribute name="lang">
-                                               <xs:simpleType>
-                                                       <xs:restriction 
base="xs:NMTOKEN">
-                                                               <xs:enumeration 
value="AF"/>
-                                                               <xs:enumeration 
value="AR"/>
-                                                               <xs:enumeration 
value="AZ"/>
-                                                               <xs:enumeration 
value="BG"/>
-                                                               <xs:enumeration 
value="CS"/>
-                                                               <xs:enumeration 
value="DA"/>
-                                                               <xs:enumeration 
value="DE"/>
-                                                               <xs:enumeration 
value="EN"/>
-                                                               <xs:enumeration 
value="EL"/>
-                                                               <xs:enumeration 
value="ES"/>
-                                                               <xs:enumeration 
value="FA"/>
-                                                               <xs:enumeration 
value="FI"/>
-                                                               <xs:enumeration 
value="FR"/>
-                                                               <xs:enumeration 
value="HE"/>
-                                                               <xs:enumeration 
value="HU"/>
-                                                               <xs:enumeration 
value="HY"/>
-                                                               <xs:enumeration 
value="IN"/>
-                                                               <xs:enumeration 
value="IS"/>
-                                                               <xs:enumeration 
value="IT"/>
-                                                               <xs:enumeration 
value="IW"/>
-                                                               <xs:enumeration 
value="JA"/>
-                                                               <xs:enumeration 
value="KA"/>
-                                                               <xs:enumeration 
value="KO"/>
-                                                               <xs:enumeration 
value="LT"/>
-                                                               <xs:enumeration 
value="MK"/>
-                                                               <xs:enumeration 
value="ML"/>
-                                                               <xs:enumeration 
value="NL"/>
-                                                               <xs:enumeration 
value="NO"/>
-                                                               <xs:enumeration 
value="PL"/>
-                                                               <xs:enumeration 
value="PT"/>
-                                                               <xs:enumeration 
value="PS"/>
-                                                               <xs:enumeration 
value="RO"/>
-                                                               <xs:enumeration 
value="RU"/>
-                                                               <xs:enumeration 
value="SL"/>
-                                                               <xs:enumeration 
value="SK"/>
-                                                               <xs:enumeration 
value="SQ"/>
-                                                               <xs:enumeration 
value="SR"/>
-                                                               <xs:enumeration 
value="SV"/>
-                                                               <xs:enumeration 
value="SW"/>
-                                                               <xs:enumeration 
value="TH"/>
-                                                               <xs:enumeration 
value="TR"/>
-                                                               <xs:enumeration 
value="UK"/>
-                                                               <xs:enumeration 
value="VI"/>
-                                                               <xs:enumeration 
value="ZH"/>
-                                                       </xs:restriction>
-                                               </xs:simpleType>
-                                       </xs:attribute>
-                                       <xs:attribute name="Type">
-                                               <xs:simpleType>
-                                                       <xs:restriction 
base="xs:NMTOKEN">
-                                                               <xs:enumeration 
value="FullText"/>
-                                                               <xs:enumeration 
value="Summary"/>
-                                                               <xs:enumeration 
value="fulltext"/>
-                                                               <xs:enumeration 
value="summary"/>
-                                                       </xs:restriction>
-                                               </xs:simpleType>
-                                       </xs:attribute>
-                               </xs:extension>
-                       </xs:simpleContent>
-               </xs:complexType>
-       </xs:element>
-       <xs:complexType name="UpdateInType">
-               <xs:sequence>
-                       <xs:element ref="tns:RefSource"/>
-                       <xs:element ref="tns:PMID" minOccurs="0"/>
-                       <xs:element ref="tns:Note" minOccurs="0"/>
-               </xs:sequence>
-       </xs:complexType>
-       <xs:complexType name="UpdateOfType">
-               <xs:sequence>
-                       <xs:element ref="tns:RefSource"/>
-                       <xs:element ref="tns:PMID" minOccurs="0"/>
-                       <xs:element ref="tns:Note" minOccurs="0"/>
-               </xs:sequence>
-       </xs:complexType>
-
-
-       <xs:complexType name="PubmedArticleSetType">
-               <xs:sequence>
-                       <xs:element name="PubmedArticle" 
type="tns:PubmedArticleType" minOccurs="0" maxOccurs="unbounded"/>
-               </xs:sequence>
-       </xs:complexType>
-
-</xs:schema>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_taxon.xsd
----------------------------------------------------------------------
diff --git 
a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_taxon.xsd 
b/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_taxon.xsd
deleted file mode 100644
index 87ad69b..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_taxon.xsd
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<s:schema 
-    xmlns:tns="http://www.ncbi.nlm.nih.gov/soap/eutils/efetch";
-    xmlns:s="http://www.w3.org/2001/XMLSchema"; 
-    targetNamespace="http://www.ncbi.nlm.nih.gov/soap/eutils/efetch";
-    elementFormDefault="qualified"
-    >
-
-    <!--  version="1.5" -->
-    <!--  http://www.ncbi.nlm.nih.gov/entrez/query/DTD/taxon.dtd  date: 
01/11/2006  -->
-
-       <s:complexType name="AkaTaxIdsType">
-               <s:sequence>
-                       <s:element type="s:string" name="TaxId" minOccurs="0" 
maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-
-       <s:complexType name="CitationType">
-               <s:sequence>
-                       <s:element type="s:string" name="CitId"/>
-                       <s:element type="s:string" name="CitKey"/>
-                       <s:element type="s:string" name="CitUrl" minOccurs="0"/>
-                       <s:element type="s:string" name="CitText" 
minOccurs="0"/>
-                       <s:element type="s:string" name="CitPubmedId" 
minOccurs="0"/>
-                       <s:element type="s:string" name="CitMedlineId" 
minOccurs="0"/>
-               </s:sequence>
-       </s:complexType>
-
-       <s:complexType name="CitationsType">
-               <s:sequence>
-                       <s:element name="Citation" type="tns:CitationType" 
maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-
-       <s:complexType name="GeneticCode_Type">
-               <s:sequence>
-                       <s:element type="s:string" name="GCId"/>
-                       <s:element type="s:string" name="GCName"/>
-               </s:sequence>
-       </s:complexType>
-
-       <s:complexType name="LineageExType">
-               <s:sequence>
-                       <s:element name="Taxon" type="tns:TaxonType" 
minOccurs="0" maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-
-       <s:complexType name="MitoGeneticCodeType">
-               <s:sequence>
-                       <s:element type="s:string" name="MGCId"/>
-                       <s:element type="s:string" name="MGCName"/>
-               </s:sequence>
-       </s:complexType>
-
-       <s:complexType name="ModifierType">
-               <s:sequence>
-                       <s:element type="s:string" name="ModId"/>
-                       <s:element type="s:string" name="ModType"/>
-                       <s:element type="s:string" name="ModName"/>
-                       <s:element type="s:string" name="ModGBhidden"/>
-                       <s:choice minOccurs="0">
-                               <s:element type="s:string" name="RModId"/>
-                               <s:element type="s:string" name="RTaxId"/>
-                       </s:choice>
-               </s:sequence>
-       </s:complexType>
-
-       <s:complexType name="ModifiersType">
-               <s:sequence>
-                       <s:element name="Modifier" type="tns:ModifierType" 
maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-
-       <s:complexType name="NameType">
-               <s:sequence>
-                       <s:element type="s:string" name="ClassCDE"/>
-                       <s:element type="s:string" name="DispName"/>
-                       <s:element type="s:string" name="UniqueName" 
minOccurs="0"/>
-               </s:sequence>
-       </s:complexType>
-
-       <s:complexType name="OtherNamesType">
-               <s:sequence>
-                       <s:element type="s:string" name="GenbankCommonName" 
minOccurs="0"/>
-                       <s:element type="s:string" name="GenbankAcronym" 
minOccurs="0"/>
-                       <s:element type="s:string" name="BlastName" 
minOccurs="0"/>
-                       <s:choice minOccurs="0" maxOccurs="unbounded">
-                               <s:element type="s:string" 
name="EquivalentName"/>
-                               <s:element type="s:string" name="Synonym"/>
-                               <s:element type="s:string" name="Acronym"/>
-                               <s:element type="s:string" name="Misspelling"/>
-                               <s:element type="s:string" name="Anamorph"/>
-                               <s:element type="s:string" name="Includes"/>
-                               <s:element type="s:string" name="CommonName"/>
-                               <s:element type="s:string" name="Inpart"/>
-                               <s:element type="s:string" name="Misnomer"/>
-                               <s:element type="s:string" name="Teleomorph"/>
-                               <s:element type="s:string" 
name="GenbankSynonym"/>
-                               <s:element type="s:string" 
name="GenbankAnamorph"/>
-                       </s:choice>
-                       <s:element name="Name" type="tns:NameType" 
minOccurs="0" maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-
-       <s:complexType name="PropertiesType">
-               <s:sequence>
-                       <s:element name="Property" type="tns:PropertyType" 
maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-
-       <s:complexType name="PropertyType">
-               <s:sequence>
-                       <s:element type="s:string" name="PropName"/>
-                       <s:choice>
-                               <s:element type="s:string" name="PropValueInt"/>
-                               <s:element type="s:string" 
name="PropValueBool"/>
-                               <s:element type="s:string" 
name="PropValueString"/>
-                       </s:choice>
-               </s:sequence>
-       </s:complexType>
-
-       <s:complexType name="TaxonType">
-               <s:sequence>
-                       <s:element type="s:string" name="TaxId"/>
-                       <s:element type="s:string" name="ScientificName"/>
-                       <s:element name="OtherNames" type="tns:OtherNamesType" 
minOccurs="0"/>
-                       <s:element type="s:string" name="ParentTaxId" 
minOccurs="0"/>
-                       <s:element type="s:string" name="Rank" minOccurs="0"/>
-                       <s:element type="s:string" name="Division" 
minOccurs="0"/>
-                       <s:element name="GeneticCode" 
type="tns:GeneticCode_Type" minOccurs="0"/>
-                       <s:element name="MitoGeneticCode" 
type="tns:MitoGeneticCodeType" minOccurs="0"/>
-                       <s:element type="s:string" name="Lineage" 
minOccurs="0"/>
-                       <s:element name="LineageEx" type="tns:LineageExType" 
minOccurs="0"/>
-                       <s:element name="Citations" type="tns:CitationsType" 
minOccurs="0"/>
-                       <s:element name="Modifiers" type="tns:ModifiersType" 
minOccurs="0"/>
-                       <s:element name="Properties" type="tns:PropertiesType" 
minOccurs="0"/>
-                       <s:element type="s:string" name="CreateDate" 
minOccurs="0"/>
-                       <s:element type="s:string" name="UpdateDate" 
minOccurs="0"/>
-                       <s:element type="s:string" name="PubDate" 
minOccurs="0"/>
-                       <s:element name="AkaTaxIds" type="tns:AkaTaxIdsType" 
minOccurs="0"/>
-               </s:sequence>
-       </s:complexType>
-
-       <s:complexType name="TaxaSetType">
-               <s:sequence>
-                       <s:element name="Taxon" type="tns:TaxonType" 
maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-
-</s:schema>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/egquery.xsd
----------------------------------------------------------------------
diff --git 
a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/egquery.xsd 
b/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/egquery.xsd
deleted file mode 100644
index 2fb0a05..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/egquery.xsd
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<s:schema targetNamespace="http://www.ncbi.nlm.nih.gov/soap/eutils/egquery"; 
xmlns:tns="http://www.ncbi.nlm.nih.gov/soap/eutils/egquery"; 
xmlns:s="http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified">
-
-       <!--  version="1.5" -->
-       <!--  http://www.ncbi.nlm.nih.gov/entrez/query/DTD/egquery.dtd   date: 
2004/05/03 16:19:48  -->
-       
-       <s:element name="Result">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="Term" type="s:string"/>
-                               <s:element name="eGQueryResult" 
type="tns:eGQueryResultType"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:complexType name="ResultItemType">
-               <s:sequence>
-                       <s:element name="DbName" type="s:string"/>
-                       <s:element name="MenuName" type="s:string"/>
-                       <s:element name="Count" type="s:string"/>
-                       <s:element name="Status" type="s:string"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="eGQueryResultType">
-               <s:sequence>
-                       <s:element name="ERROR" type="s:string" minOccurs="0"/>
-                       <s:element name="ResultItem" type="tns:ResultItemType" 
maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-       <s:element name="eGqueryRequest">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="term" type="s:string" 
minOccurs="0"/>
-                               <s:element name="tool" type="s:string" 
minOccurs="0"/>
-                               <s:element name="email" type="s:string" 
minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:element name="eGqueryRequestMS">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="term" type="s:string" 
minOccurs="0"/>
-                               <s:element name="tool" type="s:string" 
minOccurs="0"/>
-                               <s:element name="email" type="s:string" 
minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:complexType name="GQueryResultType">
-               <s:sequence>
-                       <s:element name="Term" type="s:string"/>
-                       <s:element name="eGQueryResult" 
type="tns:eGQueryResultType"/>
-               </s:sequence>
-       </s:complexType>
-       <s:element name="ResultMS">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="Result" 
type="tns:GQueryResultType" minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-</s:schema>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/einfo.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/einfo.xsd 
b/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/einfo.xsd
deleted file mode 100644
index 73a4b4f..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/einfo.xsd
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<s:schema targetNamespace="http://www.ncbi.nlm.nih.gov/soap/eutils/einfo"; 
xmlns:s="http://www.w3.org/2001/XMLSchema"; 
xmlns:tns="http://www.ncbi.nlm.nih.gov/soap/eutils/einfo"; 
elementFormDefault="qualified">
-
-       <!--   version="1.5" -->
-       <!--   http://www.ncbi.nlm.nih.gov/entrez/query/DTD/eInfo_020511.dtd  
date: 2004/02/06 16:45:18 -->
-
-       <s:complexType name="DbInfoType">
-               <s:sequence>
-                       <s:element name="DbName" type="s:string"/>
-                       <s:element name="MenuName" type="s:string"/>
-                       <s:element name="Description" type="s:string"/>
-                       <s:element name="Count" type="s:string"/>
-                       <s:element name="LastUpdate" type="s:string"/>
-                       <s:element name="FieldList" type="tns:FieldListType"/>
-                       <s:element name="LinkList" type="tns:LinkListType" 
minOccurs="0"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="DbListType">
-               <s:choice>
-                       <s:element name="DbName" type="s:string" minOccurs="0" 
maxOccurs="unbounded"/>
-               </s:choice>
-       </s:complexType>
-       <s:complexType name="FieldType">
-               <s:sequence>
-                       <s:element name="Name" type="s:string"/>
-                       <s:element name="FullName" type="s:string"/>
-                       <s:element name="Description" type="s:string"/>
-                       <s:element name="TermCount" type="s:string"/>
-                       <s:element name="IsDate" type="s:string"/>
-                       <s:element name="IsNumerical" type="s:string"/>
-                       <s:element name="SingleToken" type="s:string"/>
-                       <s:element name="Hierarchy" type="s:string"/>
-                       <s:element name="IsHidden" type="s:string"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="FieldListType">
-               <s:sequence>
-                       <s:element name="Field" type="tns:FieldType" 
minOccurs="0" maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="LinkType">
-               <s:sequence>
-                       <s:element name="Name" type="s:string"/>
-                       <s:element name="Menu" type="s:string"/>
-                       <s:element name="Description" type="s:string"/>
-                       <s:element name="DbTo" type="s:string"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="LinkListType">
-               <s:sequence>
-                       <s:element name="Link" type="tns:LinkType" 
minOccurs="0" maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-       <s:element name="eInfoResult">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="ERROR" type="s:string" 
minOccurs="0"/>
-                               <s:element name="DbList" type="tns:DbListType" 
minOccurs="0"/>
-                               <s:element name="DbInfo" type="tns:DbInfoType" 
minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:element name="eInfoRequest">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="db" type="s:string" 
minOccurs="0"/>
-                               <s:element name="tool" type="s:string" 
minOccurs="0"/>
-                               <s:element name="email" type="s:string" 
minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:element name="eInfoRequestMS">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="db" type="s:string" 
minOccurs="0"/>
-                               <s:element name="tool" type="s:string" 
minOccurs="0"/>
-                               <s:element name="email" type="s:string" 
minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:complexType name="eInfoResultType">
-               <s:sequence>
-                       <s:element name="ERROR" type="s:string" minOccurs="0"/>
-                       <s:element name="DbList" type="tns:DbListType" 
minOccurs="0"/>
-                       <s:element name="DbInfo" type="tns:DbInfoType" 
minOccurs="0"/>
-               </s:sequence>
-       </s:complexType>
-       <s:element name="eInfoResultMS">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="eInfoResult" 
type="tns:eInfoResultType" minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-</s:schema>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/elink.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/elink.xsd 
b/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/elink.xsd
deleted file mode 100644
index 8b6a43f..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/elink.xsd
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<s:schema targetNamespace="http://www.ncbi.nlm.nih.gov/soap/eutils/elink"; 
xmlns:tns="http://www.ncbi.nlm.nih.gov/soap/eutils/elink"; 
xmlns:s="http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified">
-
-       <!--   version="1.5" -->
-       <!--   http://www.ncbi.nlm.nih.gov/entrez/query/DTD/eLink_050511.dtd  
-->
-
-       <s:element name="Attribute" type="s:string"/>
-       <s:element name="DbFrom" type="s:string"/>
-       <s:element name="DbTo" type="s:string"/>
-       <s:element name="ERROR" type="s:string"/>
-       <s:element name="IconUrl" type="s:string"/>
-       <s:element name="Info" type="s:string"/>
-       <s:element name="LinkName" type="s:string"/>
-       <s:element name="Name" type="s:string"/>
-       <s:element name="NameAbbr" type="s:string"/>
-       <s:element name="Score" type="s:string"/>
-       <s:element name="SubjectType" type="s:string"/>
-       <s:element name="Url" type="s:string"/>
-       <s:element name="MenuTag" type="s:string"/>
-       <s:complexType name="IdType">
-               <s:simpleContent>
-                       <s:extension base="s:string">
-                               <s:attribute name="HasLinkOut">
-                                       <s:simpleType>
-                                               <s:restriction base="s:NMTOKEN">
-                                                       <s:enumeration 
value="Y"/>
-                                                       <s:enumeration 
value="N"/>
-                                               </s:restriction>
-                                       </s:simpleType>
-                               </s:attribute>
-                               <s:attribute name="HasNeighbor">
-                                       <s:simpleType>
-                                               <s:restriction base="s:NMTOKEN">
-                                                       <s:enumeration 
value="Y"/>
-                                                       <s:enumeration 
value="N"/>
-                                               </s:restriction>
-                                       </s:simpleType>
-                               </s:attribute>
-                       </s:extension>
-               </s:simpleContent>
-       </s:complexType>
-       <s:complexType name="IdCheckListType">
-               <s:sequence>
-                       <s:choice minOccurs="0" maxOccurs="unbounded">
-                               <s:element name="Id" type="tns:IdType"/>
-                               <s:element name="IdLinkSet" 
type="tns:IdLinkSetType"/>
-                       </s:choice>
-                       <s:element ref="tns:ERROR" minOccurs="0"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="IdLinkSetType">
-               <s:sequence>
-                       <s:element name="LinkInfo" type="tns:LinkInfoType" 
minOccurs="0" maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="IdListType">
-               <s:sequence>
-                       <s:element name="Id" type="tns:IdType" minOccurs="0" 
maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="IdUrlListType">
-               <s:sequence>
-                       <s:element name="IdUrlSet" type="tns:IdUrlSetType" 
minOccurs="0" maxOccurs="unbounded"/>
-                       <s:element ref="tns:ERROR" minOccurs="0"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="IdUrlSetType">
-               <s:sequence>
-                       <s:element name="Id" type="tns:IdType"/>
-                       <s:choice>
-                               <s:element name="ObjUrl" type="tns:ObjUrlType" 
maxOccurs="unbounded"/>
-                               <s:element ref="tns:Info"/>
-                       </s:choice>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="LinkType">
-               <s:sequence>
-                       <s:element name="Id" type="tns:IdType"/>
-                       <s:element ref="tns:Score" minOccurs="0"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="LinkInfoType">
-               <s:sequence>
-                       <s:element ref="tns:DbTo"/>
-                       <s:element ref="tns:LinkName"/>
-                       <s:element ref="tns:MenuTag"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="LinkSetType">
-               <s:sequence>
-                       <s:element ref="tns:DbFrom"/>
-                       <s:element ref="tns:ERROR" minOccurs="0"/>
-                       <s:element name="IdList" type="tns:IdListType" 
minOccurs="0"/>
-                       <s:element name="LinkSetDb" type="tns:LinkSetDbType" 
minOccurs="0" maxOccurs="unbounded"/>
-                       <s:element name="IdUrlList" type="tns:IdUrlListType" 
minOccurs="0"/>
-                       <s:element name="IdCheckList" 
type="tns:IdCheckListType" minOccurs="0"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="LinkSetDbType">
-               <s:sequence>
-                       <s:element ref="tns:DbTo"/>
-                       <s:element ref="tns:LinkName"/>
-                       <s:choice>
-                               <s:element name="Link" type="tns:LinkType" 
minOccurs="0" maxOccurs="unbounded"/>
-                               <s:element ref="tns:Info"/>
-                       </s:choice>
-                       <s:element ref="tns:ERROR" minOccurs="0"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="ObjUrlType">
-               <s:sequence>
-                       <s:element ref="tns:Url"/>
-                       <s:element ref="tns:IconUrl" minOccurs="0"/>
-                       <s:element ref="tns:LinkName" minOccurs="0"/>
-                       <s:element ref="tns:SubjectType" minOccurs="0" 
maxOccurs="unbounded"/>
-                       <s:element ref="tns:Attribute" minOccurs="0" 
maxOccurs="unbounded"/>
-                       <s:element name="Provider" type="tns:ProviderType"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="ProviderType">
-               <s:sequence>
-                       <s:element ref="tns:Name"/>
-                       <s:element ref="tns:NameAbbr"/>
-                       <s:element name="Id" type="tns:IdType"/>
-                       <s:element ref="tns:Url"/>
-                       <s:element ref="tns:IconUrl" minOccurs="0"/>
-               </s:sequence>
-       </s:complexType>
-       <s:element name="eLinkResult">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element ref="tns:ERROR" minOccurs="0"/>
-                               <s:element name="LinkSet" 
type="tns:LinkSetType" minOccurs="0" maxOccurs="unbounded"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:complexType name="eLinkResultType">
-               <s:sequence>
-                       <s:element ref="tns:ERROR" minOccurs="0"/>
-                       <s:element name="LinkSet" type="tns:LinkSetType" 
minOccurs="0" maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-       <s:element name="eLinkResultMS">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="eLinkResult" 
type="tns:eLinkResultType" minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:element name="eLinkRequest">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="db" type="s:string" 
minOccurs="0"/>
-                               <s:element name="id" type="s:string" 
minOccurs="0" maxOccurs="unbounded"/>
-                               <s:element name="reldate" type="s:string" 
minOccurs="0"/>
-                               <s:element name="mindate" type="s:string" 
minOccurs="0"/>
-                               <s:element name="maxdate" type="s:string" 
minOccurs="0"/>
-                               <s:element name="datetype" type="s:string" 
minOccurs="0"/>
-                               <s:element name="term" type="s:string" 
minOccurs="0"/>
-                               <s:element name="dbfrom" type="s:string" 
minOccurs="0"/>
-                               <s:element name="WebEnv" type="s:string" 
minOccurs="0"/>
-                               <s:element name="query_key" type="s:string" 
minOccurs="0"/>
-                               <s:element name="cmd" type="s:string" 
minOccurs="0"/>
-                               <s:element name="tool" type="s:string" 
minOccurs="0"/>
-                               <s:element name="email" type="s:string" 
minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:element name="eLinkRequestMS">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="db" type="s:string" 
minOccurs="0"/>
-                               <s:element name="id" type="s:string" 
minOccurs="0" maxOccurs="unbounded"/>
-                               <s:element name="reldate" type="s:string" 
minOccurs="0"/>
-                               <s:element name="mindate" type="s:string" 
minOccurs="0"/>
-                               <s:element name="maxdate" type="s:string" 
minOccurs="0"/>
-                               <s:element name="datetype" type="s:string" 
minOccurs="0"/>
-                               <s:element name="term" type="s:string" 
minOccurs="0"/>
-                               <s:element name="dbfrom" type="s:string" 
minOccurs="0"/>
-                               <s:element name="WebEnv" type="s:string" 
minOccurs="0"/>
-                               <s:element name="query_key" type="s:string" 
minOccurs="0"/>
-                               <s:element name="cmd" type="s:string" 
minOccurs="0"/>
-                               <s:element name="tool" type="s:string" 
minOccurs="0"/>
-                               <s:element name="email" type="s:string" 
minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-</s:schema>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/esearch.xsd
----------------------------------------------------------------------
diff --git 
a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/esearch.xsd 
b/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/esearch.xsd
deleted file mode 100644
index 49f6331..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/esearch.xsd
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<s:schema targetNamespace="http://www.ncbi.nlm.nih.gov/soap/eutils/esearch"; 
xmlns:s="http://www.w3.org/2001/XMLSchema"; 
xmlns:tns="http://www.ncbi.nlm.nih.gov/soap/eutils/esearch"; 
elementFormDefault="qualified">
-       
-    <!--  version="1.5" -->
-       <!--  http://www.ncbi.nlm.nih.gov/entrez/query/DTD/eSearch_020511.dtd  
-->
-       
-       <s:element name="Count" type="s:string"/>
-       <s:element name="ERROR" type="s:string"/>
-       <s:element name="Explode" type="s:string"/>
-       <s:element name="Field" type="s:string"/>
-       <s:element name="FieldNotFound" type="s:string"/>
-       <s:element name="From" type="s:string"/>
-       <s:element name="Id" type="s:string"/>
-       <s:element name="OutputMessage" type="s:string"/>
-       <s:element name="PhraseIgnored" type="s:string"/>
-       <s:element name="PhraseNotFound" type="s:string"/>
-       <s:element name="QueryKey" type="s:string"/>
-       <s:element name="QueryTranslation" type="s:string"/>
-       <s:element name="QuotedPhraseNotFound" type="s:string"/>
-       <s:element name="RetMax" type="s:string"/>
-       <s:element name="RetStart" type="s:string"/>
-       <s:element name="Term" type="s:string"/>
-       <s:element name="To" type="s:string"/>
-       <s:element name="WebEnv" type="s:string"/>
-       <s:complexType name="ErrorListType">
-               <s:sequence>
-                       <s:element ref="tns:PhraseNotFound" minOccurs="0" 
maxOccurs="unbounded"/>
-                       <s:element ref="tns:FieldNotFound" minOccurs="0" 
maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="IdListType">
-               <s:sequence>
-                       <s:element ref="tns:Id" minOccurs="0" 
maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="TermSetType">
-               <s:sequence>
-                       <s:element ref="tns:Term"/>
-                       <s:element ref="tns:Field"/>
-                       <s:element ref="tns:Count"/>
-                       <s:element ref="tns:Explode"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="TranslationType">
-               <s:sequence>
-                       <s:element ref="tns:From"/>
-                       <s:element ref="tns:To"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="TranslationSetType">
-               <s:sequence>
-                       <s:element name="Translation" 
type="tns:TranslationType" minOccurs="0" maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-       <s:complexType name="TranslationStackType">
-               <s:choice minOccurs="0" maxOccurs="unbounded">
-                       <s:element name="TermSet" type="tns:TermSetType"/>
-                       <s:element name="OP" type="s:string" />
-               </s:choice>
-       </s:complexType>
-       <s:complexType name="WarningListType">
-               <s:sequence>
-                       <s:element ref="tns:PhraseIgnored" minOccurs="0" 
maxOccurs="unbounded"/>
-                       <s:element ref="tns:QuotedPhraseNotFound" minOccurs="0" 
maxOccurs="unbounded"/>
-                       <s:element ref="tns:OutputMessage" minOccurs="0" 
maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-       <s:element name="eSearchResult">
-               <s:complexType>
-                       <s:sequence>
-                               <s:sequence minOccurs="0">
-                                       <s:element ref="tns:ERROR" 
minOccurs="0"/>
-                                       <s:sequence minOccurs="0">
-                                               <s:element ref="tns:Count" 
minOccurs="0"/>
-                                               <s:sequence minOccurs="0">
-                                                       <s:element 
ref="tns:RetMax" minOccurs="0"/>
-                                                       <s:element 
ref="tns:RetStart" minOccurs="0"/>
-                                                       <s:element 
ref="tns:QueryKey" minOccurs="0"/>
-                                                       <s:element 
ref="tns:WebEnv" minOccurs="0"/>
-                                                       <s:element 
name="IdList" type="tns:IdListType" minOccurs="0"/>
-                                                       <s:element 
name="TranslationSet" type="tns:TranslationSetType" minOccurs="0"/>
-                                                       <s:element 
name="TranslationStack" type="tns:TranslationStackType" minOccurs="0"/>
-                                                       <s:element 
ref="tns:QueryTranslation" minOccurs="0"/>
-                                               </s:sequence>
-                                       </s:sequence>
-                               </s:sequence>
-                               <s:element name="ErrorList" 
type="tns:ErrorListType" minOccurs="0"/>
-                               <s:element name="WarningList" 
type="tns:WarningListType" minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:element name="eSearchRequest">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="db" type="s:string" 
minOccurs="0"/>
-                               <s:element name="term" type="s:string" 
minOccurs="0"/>
-                               <s:element name="WebEnv" type="s:string" 
minOccurs="0"/>
-                               <s:element name="QueryKey" type="s:string" 
minOccurs="0"/>
-                               <s:element name="usehistory" type="s:string" 
minOccurs="0"/>
-                               <s:element name="tool" type="s:string" 
minOccurs="0"/>
-                               <s:element name="email" type="s:string" 
minOccurs="0"/>
-                               <s:element name="field" type="s:string" 
minOccurs="0"/>
-                               <s:element name="reldate" type="s:string" 
minOccurs="0"/>
-                               <s:element name="mindate" type="s:string" 
minOccurs="0"/>
-                               <s:element name="maxdate" type="s:string" 
minOccurs="0"/>
-                               <s:element name="datetype" type="s:string" 
minOccurs="0"/>
-                               <s:element name="RetStart" type="s:string" 
minOccurs="0"/>
-                               <s:element name="RetMax" type="s:string" 
minOccurs="0"/>
-                               <s:element name="rettype" type="s:string" 
minOccurs="0"/>
-                               <s:element name="sort" type="s:string" 
minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:element name="eSearchRequestMS">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="db" type="s:string" 
minOccurs="0"/>
-                               <s:element name="term" type="s:string" 
minOccurs="0"/>
-                               <s:element name="WebEnv" type="s:string" 
minOccurs="0"/>
-                               <s:element name="query_key" type="s:string" 
minOccurs="0"/>
-                               <s:element name="usehistory" type="s:string" 
minOccurs="0"/>
-                               <s:element name="tool" type="s:string" 
minOccurs="0"/>
-                               <s:element name="email" type="s:string" 
minOccurs="0"/>
-                               <s:element name="field" type="s:string" 
minOccurs="0"/>
-                               <s:element name="reldate" type="s:string" 
minOccurs="0"/>
-                               <s:element name="mindate" type="s:string" 
minOccurs="0"/>
-                               <s:element name="maxdate" type="s:string" 
minOccurs="0"/>
-                               <s:element name="datetype" type="s:string" 
minOccurs="0"/>
-                               <s:element name="retstart" type="s:string" 
minOccurs="0"/>
-                               <s:element name="retmax" type="s:string" 
minOccurs="0"/>
-                               <s:element name="rettype" type="s:string" 
minOccurs="0"/>
-                               <s:element name="sort" type="s:string" 
minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:complexType name="eSearchResultType">
-               <s:sequence>
-                       <s:sequence minOccurs="0">
-                               <s:element ref="tns:ERROR" minOccurs="0"/>
-                               <s:sequence minOccurs="0">
-                                       <s:element ref="tns:Count" 
minOccurs="0"/>
-                                       <s:sequence minOccurs="0">
-                                               <s:element ref="tns:RetMax" 
minOccurs="0"/>
-                                               <s:element ref="tns:RetStart" 
minOccurs="0"/>
-                                               <s:element ref="tns:QueryKey" 
minOccurs="0"/>
-                                               <s:element ref="tns:WebEnv" 
minOccurs="0"/>
-                                               <s:element name="IdList" 
type="tns:IdListType" minOccurs="0"/>
-                                               <s:element 
name="TranslationSet" type="tns:TranslationSetType" minOccurs="0"/>
-                                               <s:element 
name="TranslationStack" type="tns:TranslationStackType" minOccurs="0"/>
-                                               <s:element 
ref="tns:QueryTranslation" minOccurs="0"/>
-                                       </s:sequence>
-                               </s:sequence>
-                       </s:sequence>
-                       <s:element name="ErrorList" type="tns:ErrorListType" 
minOccurs="0"/>
-                       <s:element name="WarningList" 
type="tns:WarningListType" minOccurs="0"/>
-               </s:sequence>
-       </s:complexType>
-       <s:element name="eSearchResultMS">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="eSearchResult" 
type="tns:eSearchResultType" minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-</s:schema>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/espell.xsd
----------------------------------------------------------------------
diff --git 
a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/espell.xsd 
b/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/espell.xsd
deleted file mode 100644
index 98e1caa..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/espell.xsd
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<s:schema targetNamespace="http://www.ncbi.nlm.nih.gov/soap/eutils/espell"; 
xmlns:s="http://www.w3.org/2001/XMLSchema"; 
xmlns:tns="http://www.ncbi.nlm.nih.gov/soap/eutils/espell"; 
elementFormDefault="qualified">
-
-       <!--   version="1.5"  -->
-       <!--   http://www.ncbi.nlm.nih.gov/entrez/query/DTD/eSpell.dtd  date: 
2005/03/02 17:46:05  -->
-
-       <s:complexType name="SpelledQueryType">
-               <s:choice minOccurs="0" maxOccurs="unbounded">
-                       <s:element name="Replaced" type="s:string"/>
-                       <s:element name="Original" type="s:string"/>
-               </s:choice>
-       </s:complexType>
-       <s:element name="eSpellResult">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="ERROR" type="s:string"/>
-                               <s:element name="Database" type="s:string"/>
-                               <s:element name="Query" type="s:string"/>
-                               <s:element name="CorrectedQuery" 
type="s:string"/>
-                               <s:element name="SpelledQuery" 
type="tns:SpelledQueryType"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:element name="eSpellRequest">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="db" type="s:string" 
minOccurs="0"/>
-                               <s:element name="term" type="s:string" 
minOccurs="0"/>
-                               <s:element name="tool" type="s:string" 
minOccurs="0"/>
-                               <s:element name="email" type="s:string" 
minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:complexType name="eSpellResultType">
-               <s:sequence>
-                       <s:element name="ERROR" type="s:string"/>
-                       <s:element name="Database" type="s:string"/>
-                       <s:element name="Query" type="s:string"/>
-                       <s:element name="CorrectedQuery" type="s:string"/>
-                       <s:element name="SpelledQuery" 
type="tns:SpelledQueryType"/>
-               </s:sequence>
-       </s:complexType>
-       <s:element name="eSpellResultMS">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="eSpellResult" 
type="tns:eSpellResultType" minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:element name="eSpellRequestMS">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="db" type="s:string" 
minOccurs="0"/>
-                               <s:element name="term" type="s:string" 
minOccurs="0"/>
-                               <s:element name="tool" type="s:string" 
minOccurs="0"/>
-                               <s:element name="email" type="s:string" 
minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-</s:schema>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/esummary.xsd
----------------------------------------------------------------------
diff --git 
a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/esummary.xsd 
b/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/esummary.xsd
deleted file mode 100644
index 19e02cc..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/esummary.xsd
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<s:schema targetNamespace="http://www.ncbi.nlm.nih.gov/soap/eutils/esummary"; 
xmlns:s="http://www.w3.org/2001/XMLSchema"; 
xmlns:tns="http://www.ncbi.nlm.nih.gov/soap/eutils/esummary"; 
elementFormDefault="qualified">
-
-       <!--   version="1.5"  -->
-       <!--   http://www.ncbi.nlm.nih.gov/entrez/query/DTD/eSummary_041029.dtd 
 -->
-
-       <s:complexType name="DocSumType">
-               <s:sequence>
-                       <s:element ref="tns:Id"/>
-                       <s:element name="Item" type="tns:ItemType" 
maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-       <s:element name="ERROR" type="s:string"/>
-       <s:element name="Id" type="s:string"/>
-       <s:complexType name="ItemType" mixed="true">
-               <s:choice minOccurs="0" maxOccurs="unbounded">
-                       <s:element name="Item" type="tns:ItemType"/>
-               </s:choice>
-               <s:attribute name="Name" type="s:string" use="required"/>
-               <s:attribute name="Type" use="required">
-                       <s:simpleType>
-                               <s:restriction base="s:NMTOKEN">
-                                       <s:enumeration value="Integer"/>
-                                       <s:enumeration value="Date"/>
-                                       <s:enumeration value="String"/>
-                                       <s:enumeration value="Structure"/>
-                                       <s:enumeration value="List"/>
-                                       <s:enumeration value="Flags"/>
-                                       <s:enumeration value="Qualifier"/>
-                                       <s:enumeration value="Enumerator"/>
-                                       <s:enumeration value="Unknown"/>
-                               </s:restriction>
-                       </s:simpleType>
-               </s:attribute>
-       </s:complexType>
-       <s:element name="eSummaryResult">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element ref="tns:ERROR" minOccurs="0"/>
-                               <s:element name="DocSum" type="tns:DocSumType" 
minOccurs="0" maxOccurs="unbounded"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:element name="eSummaryRequest">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="db" type="s:string" 
minOccurs="0"/>
-                               <s:element name="id" type="s:string" 
minOccurs="0"/>
-                               <s:element name="WebEnv" type="s:string" 
minOccurs="0"/>
-                               <s:element name="query_key" type="s:string" 
minOccurs="0"/>
-                               <s:element name="retstart" type="s:string" 
minOccurs="0"/>
-                               <s:element name="retmax" type="s:string" 
minOccurs="0"/>
-                               <s:element name="tool" type="s:string" 
minOccurs="0"/>
-                               <s:element name="email" type="s:string" 
minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:element name="eSummaryRequestMS">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="db" type="s:string" 
minOccurs="0"/>
-                               <s:element name="id" type="s:string" 
minOccurs="0"/>
-                               <s:element name="WebEnv" type="s:string" 
minOccurs="0"/>
-                               <s:element name="query_key" type="s:string" 
minOccurs="0"/>
-                               <s:element name="retstart" type="s:string" 
minOccurs="0"/>
-                               <s:element name="retmax" type="s:string" 
minOccurs="0"/>
-                               <s:element name="tool" type="s:string" 
minOccurs="0"/>
-                               <s:element name="email" type="s:string" 
minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-       <s:complexType name="eSummaryResultType">
-               <s:sequence>
-                       <s:element ref="tns:ERROR" minOccurs="0"/>
-                       <s:element name="DocSum" type="tns:DocSumType" 
minOccurs="0" maxOccurs="unbounded"/>
-               </s:sequence>
-       </s:complexType>
-       <s:element name="eSummaryResultMS">
-               <s:complexType>
-                       <s:sequence>
-                               <s:element name="eSummaryResult" 
type="tns:eSummaryResultType" minOccurs="0"/>
-                       </s:sequence>
-               </s:complexType>
-       </s:element>
-</s:schema>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/eutils.wsdl
----------------------------------------------------------------------
diff --git 
a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/eutils.wsdl 
b/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/eutils.wsdl
deleted file mode 100644
index 37809d2..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/eutils.wsdl
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0"?>
-<wsdl:definitions 
-    xmlns:s="http://www.w3.org/2001/XMLSchema"; 
-    xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; 
-    xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; 
-    xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"; 
-    xmlns:s0="http://www.ncbi.nlm.nih.gov/soap/eutils/"; 
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; 
-    xmlns="http://schemas.xmlsoap.org/wsdl/"; 
-    targetNamespace="http://www.ncbi.nlm.nih.gov/soap/eutils/";
-    xmlns:nseg="http://www.ncbi.nlm.nih.gov/soap/eutils/egquery"; 
-    xmlns:nsei="http://www.ncbi.nlm.nih.gov/soap/eutils/einfo"; 
-    xmlns:nsel="http://www.ncbi.nlm.nih.gov/soap/eutils/elink"; 
-    xmlns:nsese="http://www.ncbi.nlm.nih.gov/soap/eutils/esearch"; 
-    xmlns:nsesu="http://www.ncbi.nlm.nih.gov/soap/eutils/esummary"; 
-    xmlns:nsef="http://www.ncbi.nlm.nih.gov/soap/eutils/efetch"; 
-    xmlns:nsesp="http://www.ncbi.nlm.nih.gov/soap/eutils/espell"; 
->
-<!--    version="1.5" -->
-
-       <types>
-               <s:schema>
-                       <s:import 
namespace="http://www.ncbi.nlm.nih.gov/soap/eutils/egquery";  
schemaLocation="egquery.xsd"/>
-                       <s:import 
namespace="http://www.ncbi.nlm.nih.gov/soap/eutils/einfo";    
schemaLocation="einfo.xsd"  />
-                       <s:import 
namespace="http://www.ncbi.nlm.nih.gov/soap/eutils/esearch";  
schemaLocation="esearch.xsd"  />
-                       <s:import 
namespace="http://www.ncbi.nlm.nih.gov/soap/eutils/esummary"; 
schemaLocation="esummary.xsd"  />
-                       <s:import 
namespace="http://www.ncbi.nlm.nih.gov/soap/eutils/elink";    
schemaLocation="elink.xsd"  />
-                       <s:import 
namespace="http://www.ncbi.nlm.nih.gov/soap/eutils/efetch";   
schemaLocation="efetch.xsd"  />
-                       <s:import 
namespace="http://www.ncbi.nlm.nih.gov/soap/eutils/espell";   
schemaLocation="espell.xsd"  />
-               </s:schema>
-       </types>
-
-       <message name="eGqueryRequest_m">
-               <part name="parameters" element="nseg:eGqueryRequest" />
-       </message>
-       <message name="eGqueryResponse_m">
-               <wsdl:part name="parameters" element="nseg:Result"/>
-       </message>
-       <message name="eGqueryRequestMS_m">
-               <part name="parameters" element="nseg:eGqueryRequestMS" />
-       </message>
-       <message name="eGqueryResponseMS_m">
-               <wsdl:part name="parameters" element="nseg:ResultMS"/>
-       </message>
-
-    <message name="eInfoRequest_m">
-               <part name="parameters" element="nsei:eInfoRequest" />
-       </message>
-       <message name="eInfoResponse_m">
-               <part name="parameters" element="nsei:eInfoResult" />
-       </message>
-    <message name="eInfoRequestMS_m">
-               <part name="parameters" element="nsei:eInfoRequestMS" />
-       </message>
-       <message name="eInfoResponseMS_m">
-               <part name="parameters" element="nsei:eInfoResultMS" />
-       </message>
-
-    <message name="eSearchRequest_m">
-               <part name="parameters" element="nsese:eSearchRequest" />
-       </message>
-       <message name="eSearchResponse_m">
-               <part name="parameters" element="nsese:eSearchResult" />
-       </message>
-    <message name="eSearchRequestMS_m">
-               <part name="parameters" element="nsese:eSearchRequestMS" />
-       </message>
-       <message name="eSearchResponseMS_m">
-               <part name="parameters" element="nsese:eSearchResultMS" />
-       </message>
-
-    <message name="eSummaryRequest_m">
-               <part name="parameters" element="nsesu:eSummaryRequest" />
-       </message>
-       <message name="eSummaryResponse_m">
-               <part name="parameters" element="nsesu:eSummaryResult" />
-       </message>
-    <message name="eSummaryRequestMS_m">
-               <part name="parameters" element="nsesu:eSummaryRequestMS" />
-       </message>
-       <message name="eSummaryResponseMS_m">
-               <part name="parameters" element="nsesu:eSummaryResultMS" />
-       </message>
-
-    <message name="eLinkRequest_m">
-               <part name="parameters" element="nsel:eLinkRequest" />
-       </message>
-       <message name="eLinkResponse_m">
-               <part name="parameters" element="nsel:eLinkResult" />
-       </message>
-    <message name="eLinkRequestMS_m">
-               <part name="parameters" element="nsel:eLinkRequestMS" />
-       </message>
-       <message name="eLinkResponseMS_m">
-               <part name="parameters" element="nsel:eLinkResultMS" />
-       </message>
-
-       <message name="eFetchRequest_m">
-               <part name="parameters" element="nsef:eFetchRequest"/>
-       </message>
-       <message name="eFetchResponse_m">
-               <part name="parameters" element="nsef:eFetchResult"/>
-       </message>
-
-       <message name="eFetchRequestMS_m">
-               <part name="parameters" element="nsef:eFetchRequestMS"/>
-       </message>
-       <message name="eFetchResponseMS_m">
-               <part name="parameters" element="nsef:eFetchResultMS"/>
-       </message>
-
-       <message name="eSpellRequest_m">
-               <part name="parameters" element="nsesp:eSpellRequest"/>
-       </message>
-       <message name="eSpellResponse_m">
-               <part name="parameters" element="nsesp:eSpellResult"/>
-       </message>
-       <message name="eSpellRequestMS_m">
-               <part name="parameters" element="nsesp:eSpellRequestMS"/>
-       </message>
-       <message name="eSpellResponseMS_m">
-               <part name="parameters" element="nsesp:eSpellResultMS"/>
-       </message>
-
-       <portType name="eUtilsServiceSoap">
-               <operation name="run_eGquery">
-                       <input message="s0:eGqueryRequest_m"/>
-                       <output message="s0:eGqueryResponse_m"/>
-               </operation>
-               <operation name="run_eGquery_MS">
-                       <input message="s0:eGqueryRequestMS_m"/>
-                       <output message="s0:eGqueryResponseMS_m"/>
-               </operation>
-
-               <operation name="run_eInfo">
-                       <input message="s0:eInfoRequest_m"/>
-                       <output message="s0:eInfoResponse_m"/>
-               </operation>
-               <operation name="run_eInfo_MS">
-                       <input message="s0:eInfoRequestMS_m"/>
-                       <output message="s0:eInfoResponseMS_m"/>
-               </operation>
-
-               <operation name="run_eSearch">
-                       <input message="s0:eSearchRequest_m"/>
-                       <output message="s0:eSearchResponse_m"/>
-               </operation>
-               <operation name="run_eSearch_MS">
-                       <input message="s0:eSearchRequestMS_m"/>
-                       <output message="s0:eSearchResponseMS_m"/>
-               </operation>
-
-               <operation name="run_eSummary">
-                       <input message="s0:eSummaryRequest_m"/>
-                       <output message="s0:eSummaryResponse_m"/>
-               </operation>
-               <operation name="run_eSummary_MS">
-                       <input message="s0:eSummaryRequestMS_m"/>
-                       <output message="s0:eSummaryResponseMS_m"/>
-               </operation>
-
-               <operation name="run_eLink">
-                       <input message="s0:eLinkRequest_m"/>
-                       <output message="s0:eLinkResponse_m"/>
-               </operation>
-               <operation name="run_eLink_MS">
-                       <input message="s0:eLinkRequestMS_m"/>
-                       <output message="s0:eLinkResponseMS_m"/>
-               </operation>
-
-               <operation name="run_eFetch">
-                       <input message="s0:eFetchRequest_m"/>
-                       <output message="s0:eFetchResponse_m"/>
-               </operation>
-               <operation name="run_eFetch_MS">
-                       <input message="s0:eFetchRequestMS_m"/>
-                       <output message="s0:eFetchResponseMS_m"/>
-               </operation>
-
-               <operation name="run_eSpell">
-                       <input message="s0:eSpellRequest_m"/>
-                       <output message="s0:eSpellResponse_m"/>
-               </operation>
-               <operation name="run_eSpell_MS">
-                       <input message="s0:eSpellRequestMS_m"/>
-                       <output message="s0:eSpellResponseMS_m"/>
-               </operation>
-       </portType>
-
-       <binding name="eUtilsServiceSoap" type="s0:eUtilsServiceSoap">
-               <soap:binding style="document" 
transport="http://schemas.xmlsoap.org/soap/http"/>
-               <operation name="run_eGquery">
-                       <soap:operation soapAction="egquery" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-               <operation name="run_eGquery_MS">
-                       <soap:operation soapAction="egqueryms" 
style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-
-               <operation name="run_eInfo">
-                       <soap:operation soapAction="einfo" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-               <operation name="run_eInfo_MS">
-                       <soap:operation soapAction="einfoms" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-
-               <operation name="run_eSearch">
-                       <soap:operation soapAction="esearch" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-               <operation name="run_eSearch_MS">
-                       <soap:operation soapAction="esearchms" 
style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-
-               <operation name="run_eSummary">
-                       <soap:operation soapAction="esummary" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-               <operation name="run_eSummary_MS">
-                       <soap:operation soapAction="esummaryms" 
style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-
-               <operation name="run_eLink">
-                       <soap:operation soapAction="elink" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-               <operation name="run_eLink_MS">
-                       <soap:operation soapAction="elinkms" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-
-               <operation name="run_eFetch">
-                       <soap:operation soapAction="efetch" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-               <operation name="run_eFetch_MS">
-                       <soap:operation soapAction="efetchms" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-
-               <operation name="run_eSpell">
-                       <soap:operation soapAction="espell" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-               <operation name="run_eSpell_MS">
-                       <soap:operation soapAction="espellms" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-       </binding>
-
-       <service name="eUtilsService">
-               <port name="eUtilsServiceSoap" binding="s0:eUtilsServiceSoap">
-                       <soap:address 
location="http://www.ncbi.nlm.nih.gov/entrez/eutils/soap/soap_adapter_1_5.cgi"/>
-               </port>
-       </service>
-    
-</wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/eutils_lite.wsdl
----------------------------------------------------------------------
diff --git 
a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/eutils_lite.wsdl 
b/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/eutils_lite.wsdl
deleted file mode 100644
index 0f0f8e0..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/eutils_lite.wsdl
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0"?>
-<wsdl:definitions 
-    xmlns:s="http://www.w3.org/2001/XMLSchema"; 
-    xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; 
-    xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; 
-    xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"; 
-    xmlns:s0="http://www.ncbi.nlm.nih.gov/soap/eutils/"; 
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; 
-    xmlns="http://schemas.xmlsoap.org/wsdl/"; 
-    targetNamespace="http://www.ncbi.nlm.nih.gov/soap/eutils/";
-    xmlns:nseg="http://www.ncbi.nlm.nih.gov/soap/eutils/egquery"; 
-    xmlns:nsei="http://www.ncbi.nlm.nih.gov/soap/eutils/einfo"; 
-    xmlns:nsel="http://www.ncbi.nlm.nih.gov/soap/eutils/elink"; 
-    xmlns:nsese="http://www.ncbi.nlm.nih.gov/soap/eutils/esearch"; 
-    xmlns:nsesu="http://www.ncbi.nlm.nih.gov/soap/eutils/esummary"; 
-    xmlns:nsesp="http://www.ncbi.nlm.nih.gov/soap/eutils/espell"; 
->
-<!--    version="1.5" -->
-
-       <types>
-               <s:schema>
-                       <s:import 
namespace="http://www.ncbi.nlm.nih.gov/soap/eutils/egquery";  
schemaLocation="egquery.xsd"/>
-                       <s:import 
namespace="http://www.ncbi.nlm.nih.gov/soap/eutils/einfo";    
schemaLocation="einfo.xsd"  />
-                       <s:import 
namespace="http://www.ncbi.nlm.nih.gov/soap/eutils/esearch";  
schemaLocation="esearch.xsd"  />
-                       <s:import 
namespace="http://www.ncbi.nlm.nih.gov/soap/eutils/esummary"; 
schemaLocation="esummary.xsd"  />
-                       <s:import 
namespace="http://www.ncbi.nlm.nih.gov/soap/eutils/elink";    
schemaLocation="elink.xsd"  />
-                       <s:import 
namespace="http://www.ncbi.nlm.nih.gov/soap/eutils/espell";   
schemaLocation="espell.xsd"  />
-               </s:schema>
-       </types>
-
-       <message name="eGqueryRequest_m">
-               <part name="parameters" element="nseg:eGqueryRequest" />
-       </message>
-       <message name="eGqueryResponse_m">
-               <wsdl:part name="parameters" element="nseg:Result"/>
-       </message>
-       <message name="eGqueryRequestMS_m">
-               <part name="parameters" element="nseg:eGqueryRequestMS" />
-       </message>
-       <message name="eGqueryResponseMS_m">
-               <wsdl:part name="parameters" element="nseg:ResultMS"/>
-       </message>
-
-    <message name="eInfoRequest_m">
-               <part name="parameters" element="nsei:eInfoRequest" />
-       </message>
-       <message name="eInfoResponse_m">
-               <part name="parameters" element="nsei:eInfoResult" />
-       </message>
-    <message name="eInfoRequestMS_m">
-               <part name="parameters" element="nsei:eInfoRequestMS" />
-       </message>
-       <message name="eInfoResponseMS_m">
-               <part name="parameters" element="nsei:eInfoResultMS" />
-       </message>
-
-    <message name="eSearchRequest_m">
-               <part name="parameters" element="nsese:eSearchRequest" />
-       </message>
-       <message name="eSearchResponse_m">
-               <part name="parameters" element="nsese:eSearchResult" />
-       </message>
-    <message name="eSearchRequestMS_m">
-               <part name="parameters" element="nsese:eSearchRequestMS" />
-       </message>
-       <message name="eSearchResponseMS_m">
-               <part name="parameters" element="nsese:eSearchResultMS" />
-       </message>
-
-    <message name="eSummaryRequest_m">
-               <part name="parameters" element="nsesu:eSummaryRequest" />
-       </message>
-       <message name="eSummaryResponse_m">
-               <part name="parameters" element="nsesu:eSummaryResult" />
-       </message>
-    <message name="eSummaryRequestMS_m">
-               <part name="parameters" element="nsesu:eSummaryRequestMS" />
-       </message>
-       <message name="eSummaryResponseMS_m">
-               <part name="parameters" element="nsesu:eSummaryResultMS" />
-       </message>
-
-    <message name="eLinkRequest_m">
-               <part name="parameters" element="nsel:eLinkRequest" />
-       </message>
-       <message name="eLinkResponse_m">
-               <part name="parameters" element="nsel:eLinkResult" />
-       </message>
-    <message name="eLinkRequestMS_m">
-               <part name="parameters" element="nsel:eLinkRequestMS" />
-       </message>
-       <message name="eLinkResponseMS_m">
-               <part name="parameters" element="nsel:eLinkResultMS" />
-       </message>
-
-       <message name="eSpellRequest_m">
-               <part name="parameters" element="nsesp:eSpellRequest"/>
-       </message>
-       <message name="eSpellResponse_m">
-               <part name="parameters" element="nsesp:eSpellResult"/>
-       </message>
-       <message name="eSpellRequestMS_m">
-               <part name="parameters" element="nsesp:eSpellRequestMS"/>
-       </message>
-       <message name="eSpellResponseMS_m">
-               <part name="parameters" element="nsesp:eSpellResultMS"/>
-       </message>
-
-       <portType name="eUtilsServiceSoap">
-               <operation name="run_eGquery">
-                       <input message="s0:eGqueryRequest_m"/>
-                       <output message="s0:eGqueryResponse_m"/>
-               </operation>
-               <operation name="run_eGquery_MS">
-                       <input message="s0:eGqueryRequestMS_m"/>
-                       <output message="s0:eGqueryResponseMS_m"/>
-               </operation>
-
-               <operation name="run_eInfo">
-                       <input message="s0:eInfoRequest_m"/>
-                       <output message="s0:eInfoResponse_m"/>
-               </operation>
-               <operation name="run_eInfo_MS">
-                       <input message="s0:eInfoRequestMS_m"/>
-                       <output message="s0:eInfoResponseMS_m"/>
-               </operation>
-
-               <operation name="run_eSearch">
-                       <input message="s0:eSearchRequest_m"/>
-                       <output message="s0:eSearchResponse_m"/>
-               </operation>
-               <operation name="run_eSearch_MS">
-                       <input message="s0:eSearchRequestMS_m"/>
-                       <output message="s0:eSearchResponseMS_m"/>
-               </operation>
-
-               <operation name="run_eSummary">
-                       <input message="s0:eSummaryRequest_m"/>
-                       <output message="s0:eSummaryResponse_m"/>
-               </operation>
-               <operation name="run_eSummary_MS">
-                       <input message="s0:eSummaryRequestMS_m"/>
-                       <output message="s0:eSummaryResponseMS_m"/>
-               </operation>
-
-               <operation name="run_eLink">
-                       <input message="s0:eLinkRequest_m"/>
-                       <output message="s0:eLinkResponse_m"/>
-               </operation>
-               <operation name="run_eLink_MS">
-                       <input message="s0:eLinkRequestMS_m"/>
-                       <output message="s0:eLinkResponseMS_m"/>
-               </operation>
-
-               <operation name="run_eSpell">
-                       <input message="s0:eSpellRequest_m"/>
-                       <output message="s0:eSpellResponse_m"/>
-               </operation>
-               <operation name="run_eSpell_MS">
-                       <input message="s0:eSpellRequestMS_m"/>
-                       <output message="s0:eSpellResponseMS_m"/>
-               </operation>
-       </portType>
-
-       <binding name="eUtilsServiceSoap" type="s0:eUtilsServiceSoap">
-               <soap:binding style="document" 
transport="http://schemas.xmlsoap.org/soap/http"/>
-               <operation name="run_eGquery">
-                       <soap:operation soapAction="egquery" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-               <operation name="run_eGquery_MS">
-                       <soap:operation soapAction="egqueryms" 
style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-
-               <operation name="run_eInfo">
-                       <soap:operation soapAction="einfo" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-               <operation name="run_eInfo_MS">
-                       <soap:operation soapAction="einfoms" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-
-               <operation name="run_eSearch">
-                       <soap:operation soapAction="esearch" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-               <operation name="run_eSearch_MS">
-                       <soap:operation soapAction="esearchms" 
style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-
-               <operation name="run_eSummary">
-                       <soap:operation soapAction="esummary" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-               <operation name="run_eSummary_MS">
-                       <soap:operation soapAction="esummaryms" 
style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-
-               <operation name="run_eLink">
-                       <soap:operation soapAction="elink" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-               <operation name="run_eLink_MS">
-                       <soap:operation soapAction="elinkms" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-
-               <operation name="run_eSpell">
-                       <soap:operation soapAction="espell" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-               <operation name="run_eSpell_MS">
-                       <soap:operation soapAction="espellms" style="document"/>
-                       <input>
-                               <soap:body use="literal"  />
-                       </input>
-                       <output>
-                               <soap:body use="literal" />
-                       </output>
-               </operation>
-       </binding>
-
-       <service name="eUtilsService">
-               <port name="eUtilsServiceSoap" binding="s0:eUtilsServiceSoap">
-                       <soap:address 
location="http://www.ncbi.nlm.nih.gov/entrez/eutils/soap/soap_adapter_1_5.cgi"/>
-               </port>
-       </service>
-    
-</wsdl:definitions>

Reply via email to