You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/05/02 18:33:40 UTC

[01/28] incubator-taverna-common-activities git commit: ASF header

Repository: incubator-taverna-common-activities
Updated Branches:
  refs/heads/cwl-browse 42c8d24ca -> 545856641


ASF header


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/a114b74e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/a114b74e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/a114b74e

Branch: refs/heads/cwl-browse
Commit: a114b74e91107d73ddb0347a3b7c2b955071558c
Parents: 59301f9
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Apr 28 00:53:56 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Apr 28 00:53:56 2016 +0100

----------------------------------------------------------------------
 taverna-beanshell-activity/src/main/resources/schema.json       | 3 +++
 taverna-interaction-activity/src/main/resources/schema.json     | 5 ++++-
 taverna-rest-activity/src/main/resources/schema.json            | 3 +++
 .../src/main/resources/schema.json                              | 3 +++
 taverna-wsdl-activity/src/main/resources/schema.json            | 3 +++
 taverna-xpath-activity/src/main/resources/schema.json           | 3 +++
 6 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/a114b74e/taverna-beanshell-activity/src/main/resources/schema.json
----------------------------------------------------------------------
diff --git a/taverna-beanshell-activity/src/main/resources/schema.json b/taverna-beanshell-activity/src/main/resources/schema.json
index d71b94d..b64684f 100644
--- a/taverna-beanshell-activity/src/main/resources/schema.json
+++ b/taverna-beanshell-activity/src/main/resources/schema.json
@@ -1,4 +1,7 @@
 {
+  "http://purl.org/dc/terms/rights": "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to You under the Apache License, Version 2.0 (the 'License'); you may not use this file except in compliance with the License.  You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License.",
+  "http://purl.org/dc/terms/license": {"@id": "http://www.apache.org/licenses/LICENSE-2.0"},
+
     "$schema": "http://json-schema.org/draft-03/schema#",
     "id": "http://ns.taverna.org.uk/2010/activity/beanshell.schema.json",
     "title": "Beanshell activity configuration",

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/a114b74e/taverna-interaction-activity/src/main/resources/schema.json
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/schema.json b/taverna-interaction-activity/src/main/resources/schema.json
index 542b5b9..56231b0 100644
--- a/taverna-interaction-activity/src/main/resources/schema.json
+++ b/taverna-interaction-activity/src/main/resources/schema.json
@@ -1,4 +1,7 @@
 {
+  "http://purl.org/dc/terms/rights": "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to You under the Apache License, Version 2.0 (the 'License'); you may not use this file except in compliance with the License.  You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License.",
+  "http://purl.org/dc/terms/license": {"@id": "http://www.apache.org/licenses/LICENSE-2.0"},
+
 	"$schema": "http://json-schema.org/draft-03/schema#",
     "id": "http://ns.taverna.org.uk/2010/activity/interaction.schema.json",
     "title": "Interaction activity configuration",
@@ -28,4 +31,4 @@
         	"description": "True if the interaction should not block the workflow run"
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/a114b74e/taverna-rest-activity/src/main/resources/schema.json
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/src/main/resources/schema.json b/taverna-rest-activity/src/main/resources/schema.json
index 376b479..73178dc 100644
--- a/taverna-rest-activity/src/main/resources/schema.json
+++ b/taverna-rest-activity/src/main/resources/schema.json
@@ -1,4 +1,7 @@
 {
+  "http://purl.org/dc/terms/rights": "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to You under the Apache License, Version 2.0 (the 'License'); you may not use this file except in compliance with the License.  You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License.",
+  "http://purl.org/dc/terms/license": {"@id": "http://www.apache.org/licenses/LICENSE-2.0"},
+
     "$schema": "http://json-schema.org/draft-03/schema#",
     "id": "http://ns.taverna.org.uk/2010/activity/rest.schema.json",
     "title": "REST activity configuration",

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/a114b74e/taverna-spreadsheet-import-activity/src/main/resources/schema.json
----------------------------------------------------------------------
diff --git a/taverna-spreadsheet-import-activity/src/main/resources/schema.json b/taverna-spreadsheet-import-activity/src/main/resources/schema.json
index b351137..f2a79c8 100644
--- a/taverna-spreadsheet-import-activity/src/main/resources/schema.json
+++ b/taverna-spreadsheet-import-activity/src/main/resources/schema.json
@@ -1,4 +1,7 @@
 {
+  "http://purl.org/dc/terms/rights": "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to You under the Apache License, Version 2.0 (the 'License'); you may not use this file except in compliance with the License.  You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License.",
+  "http://purl.org/dc/terms/license": {"@id": "http://www.apache.org/licenses/LICENSE-2.0"},
+
     "$schema": "http://json-schema.org/draft-03/schema#",
     "id": "http://ns.taverna.org.uk/2010/activity/spreadsheet-import.schema.json",
     "title": "Spreadsheet import activity configuration",

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/a114b74e/taverna-wsdl-activity/src/main/resources/schema.json
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/resources/schema.json b/taverna-wsdl-activity/src/main/resources/schema.json
index bcafb67..8bb3ed7 100644
--- a/taverna-wsdl-activity/src/main/resources/schema.json
+++ b/taverna-wsdl-activity/src/main/resources/schema.json
@@ -1,4 +1,7 @@
 {
+  "http://purl.org/dc/terms/rights": "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to You under the Apache License, Version 2.0 (the 'License'); you may not use this file except in compliance with the License.  You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License.",
+  "http://purl.org/dc/terms/license": {"@id": "http://www.apache.org/licenses/LICENSE-2.0"},
+
     "$schema": "http://json-schema.org/draft-03/schema#",
     "id": "http://ns.taverna.org.uk/2010/activity/wsdl.schema.json",
     "title": "WSDL activity configuration",

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/a114b74e/taverna-xpath-activity/src/main/resources/schema.json
----------------------------------------------------------------------
diff --git a/taverna-xpath-activity/src/main/resources/schema.json b/taverna-xpath-activity/src/main/resources/schema.json
index 6f057f3..7be33be 100644
--- a/taverna-xpath-activity/src/main/resources/schema.json
+++ b/taverna-xpath-activity/src/main/resources/schema.json
@@ -1,4 +1,7 @@
 {
+  "http://purl.org/dc/terms/rights": "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to You under the Apache License, Version 2.0 (the 'License'); you may not use this file except in compliance with the License.  You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License.",
+  "http://purl.org/dc/terms/license": {"@id": "http://www.apache.org/licenses/LICENSE-2.0"},
+
     "$schema": "http://json-schema.org/draft-03/schema#",
     "id": "http://ns.taverna.org.uk/2010/activity/xpath.schema.json",
     "title": "XPath activity configuration",


[09/28] incubator-taverna-common-activities git commit: Moved third-party test WSDLs to https://github.com/taverna-extras/wsdl-generic-test-cases

Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_bio.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_bio.xsd b/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_bio.xsd
deleted file mode 100644
index 76b3772..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_bio.xsd
+++ /dev/null
@@ -1,18079 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema 
-    xmlns:tns="http://www.ncbi.nlm.nih.gov/soap/eutils/efetch"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.ncbi.nlm.nih.gov/soap/eutils/efetch"
-    elementFormDefault="qualified"
-    >
-    
-    <!-- version="1.5" -->
-
-    <!-- based on http://www.ncbi.nlm.nih.gov/data_specs/ver/20060517/schema/NCBI_all_20060517.xsd -->
-
-	<xs:complexType name="AffilType">
-		<xs:choice>
-			<xs:element ref="tns:Affil_str"/>
-			<xs:element name="Affil_std" type="tns:Affil_stdType"/>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="Affil_stdType">
-		<xs:sequence>
-			<xs:element ref="tns:Affil_std_affil" minOccurs="0"/>
-			<xs:element ref="tns:Affil_std_div" minOccurs="0"/>
-			<xs:element ref="tns:Affil_std_city" minOccurs="0"/>
-			<xs:element ref="tns:Affil_std_sub" minOccurs="0"/>
-			<xs:element ref="tns:Affil_std_country" minOccurs="0"/>
-			<xs:element ref="tns:Affil_std_street" minOccurs="0"/>
-			<xs:element ref="tns:Affil_std_email" minOccurs="0"/>
-			<xs:element ref="tns:Affil_std_fax" minOccurs="0"/>
-			<xs:element ref="tns:Affil_std_phone" minOccurs="0"/>
-			<xs:element ref="tns:Affil_std_postal-code" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Affil_std_affil" type="xs:string"/>
-	<xs:element name="Affil_std_city" type="xs:string"/>
-	<xs:element name="Affil_std_country" type="xs:string"/>
-	<xs:element name="Affil_std_div" type="xs:string"/>
-	<xs:element name="Affil_std_email" type="xs:string"/>
-	<xs:element name="Affil_std_fax" type="xs:string"/>
-	<xs:element name="Affil_std_phone" type="xs:string"/>
-	<xs:element name="Affil_std_postal-code" type="xs:string"/>
-	<xs:element name="Affil_std_street" type="xs:string"/>
-	<xs:element name="Affil_std_sub" type="xs:string"/>
-	<xs:element name="Affil_str" type="xs:string"/>
-	<xs:complexType name="Algorithm-typeType">
-		<xs:sequence>
-			<xs:element name="Algorithm-type_scoring-Scheme" type="tns:Algorithm-type_scoring-SchemeType"/>
-			<xs:element name="Algorithm-type_clustering-Method" type="tns:Algorithm-type_clustering-MethodType"/>
-			<xs:element name="Algorithm-type_score-Matrix" type="tns:Algorithm-type_score-MatrixType" minOccurs="0"/>
-			<xs:element ref="tns:Algorithm-type_gapOpen" minOccurs="0"/>
-			<xs:element ref="tns:Algorithm-type_gapExtend" minOccurs="0"/>
-			<xs:element ref="tns:Algorithm-type_gapScaleFactor" minOccurs="0"/>
-			<xs:element ref="tns:Algorithm-type_nTerminalExt" minOccurs="0"/>
-			<xs:element ref="tns:Algorithm-type_cTerminalExt" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Algorithm-type_cTerminalExt" type="xs:string"/>
-	<xs:complexType name="Algorithm-type_clustering-MethodType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="value">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="unassigned"/>
-							<xs:enumeration value="single-linkage"/>
-							<xs:enumeration value="neighbor-joining"/>
-							<xs:enumeration value="fast-minimum-evolution"/>
-							<xs:enumeration value="other"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="Algorithm-type_gapExtend" type="xs:string"/>
-	<xs:element name="Algorithm-type_gapOpen" type="xs:string"/>
-	<xs:element name="Algorithm-type_gapScaleFactor" type="xs:string"/>
-	<xs:element name="Algorithm-type_nTerminalExt" type="xs:string"/>
-	<xs:complexType name="Algorithm-type_score-MatrixType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="value">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="unassigned"/>
-							<xs:enumeration value="blosum45"/>
-							<xs:enumeration value="blosum62"/>
-							<xs:enumeration value="blosum80"/>
-							<xs:enumeration value="pam30"/>
-							<xs:enumeration value="pam70"/>
-							<xs:enumeration value="pam250"/>
-							<xs:enumeration value="other"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="Algorithm-type_scoring-SchemeType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="value">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="unassigned"/>
-							<xs:enumeration value="percent-id"/>
-							<xs:enumeration value="kimura-corrected"/>
-							<xs:enumeration value="aligned-score"/>
-							<xs:enumeration value="aligned-score-ext"/>
-							<xs:enumeration value="aligned-score-filled"/>
-							<xs:enumeration value="blast-footprint"/>
-							<xs:enumeration value="blast-full"/>
-							<xs:enumeration value="hybrid-aligned-score"/>
-							<xs:enumeration value="other"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="Align-annotType">
-		<xs:sequence>
-			<xs:element name="Align-annot_location" type="tns:Align-annot_locationType"/>
-			<xs:element ref="tns:Align-annot_description" minOccurs="0"/>
-			<xs:element name="Align-annot_evidence" type="tns:Align-annot_evidenceType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Align-annot-setType">
-		<xs:sequence>
-			<xs:element name="Align-annot" type="tns:Align-annotType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Align-annot_description" type="xs:string"/>
-	<xs:complexType name="Align-annot_evidenceType">
-		<xs:sequence>
-			<xs:element name="Feature-evidence" type="tns:Feature-evidenceType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Align-annot_locationType">
-		<xs:sequence>
-			<xs:element name="Seq-loc" type="tns:Seq-locType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Align-defType">
-		<xs:sequence>
-			<xs:element name="Align-def_align-type" type="tns:Align-def_align-typeType"/>
-			<xs:element name="Align-def_ids" type="tns:Align-def_idsType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Align-def_align-typeType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="value">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="ref"/>
-							<xs:enumeration value="alt"/>
-							<xs:enumeration value="blocks"/>
-							<xs:enumeration value="other"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="Align-def_idsType">
-		<xs:sequence>
-			<xs:element name="Seq-id" type="tns:Seq-idType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Align-statsType">
-		<xs:sequence>
-			<xs:element ref="tns:Align-stats_descr" minOccurs="0"/>
-			<xs:element ref="tns:Align-stats_scale-factor" minOccurs="0"/>
-			<xs:element ref="tns:Align-stats_vast-score" minOccurs="0"/>
-			<xs:element ref="tns:Align-stats_vast-mlogp" minOccurs="0"/>
-			<xs:element ref="tns:Align-stats_align-res" minOccurs="0"/>
-			<xs:element ref="tns:Align-stats_rmsd" minOccurs="0"/>
-			<xs:element ref="tns:Align-stats_blast-score" minOccurs="0"/>
-			<xs:element ref="tns:Align-stats_blast-mlogp" minOccurs="0"/>
-			<xs:element ref="tns:Align-stats_other-score" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Align-stats_align-res" type="xs:string"/>
-	<xs:element name="Align-stats_blast-mlogp" type="xs:string"/>
-	<xs:element name="Align-stats_blast-score" type="xs:string"/>
-	<xs:element name="Align-stats_descr" type="xs:string"/>
-	<xs:element name="Align-stats_other-score" type="xs:string"/>
-	<xs:element name="Align-stats_rmsd" type="xs:string"/>
-	<xs:element name="Align-stats_scale-factor" type="xs:string"/>
-	<xs:element name="Align-stats_vast-mlogp" type="xs:string"/>
-	<xs:element name="Align-stats_vast-score" type="xs:string"/>
-	<xs:element name="Alternate-conformation-id" type="xs:string"/>
-	<xs:complexType name="Alternate-conformation-idsType">
-		<xs:sequence>
-			<xs:element ref="tns:Alternate-conformation-id" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Anisotropic-temperature-factorsType">
-		<xs:sequence>
-			<xs:element ref="tns:Anisotropic-temperature-factors_scale-factor"/>
-			<xs:element name="Anisotropic-temperature-factors_b-11" type="tns:Anisotropic-temperature-factors_b-11Type"/>
-			<xs:element name="Anisotropic-temperature-factors_b-12" type="tns:Anisotropic-temperature-factors_b-12Type"/>
-			<xs:element name="Anisotropic-temperature-factors_b-13" type="tns:Anisotropic-temperature-factors_b-13Type"/>
-			<xs:element name="Anisotropic-temperature-factors_b-22" type="tns:Anisotropic-temperature-factors_b-22Type"/>
-			<xs:element name="Anisotropic-temperature-factors_b-23" type="tns:Anisotropic-temperature-factors_b-23Type"/>
-			<xs:element name="Anisotropic-temperature-factors_b-33" type="tns:Anisotropic-temperature-factors_b-33Type"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Anisotropic-temperature-factors_b-11Type">
-		<xs:sequence>
-			<xs:element ref="tns:Anisotropic-temperature-factors_b-11_E" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Anisotropic-temperature-factors_b-11_E" type="xs:string"/>
-	<xs:complexType name="Anisotropic-temperature-factors_b-12Type">
-		<xs:sequence>
-			<xs:element ref="tns:Anisotropic-temperature-factors_b-12_E" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Anisotropic-temperature-factors_b-12_E" type="xs:string"/>
-	<xs:complexType name="Anisotropic-temperature-factors_b-13Type">
-		<xs:sequence>
-			<xs:element ref="tns:Anisotropic-temperature-factors_b-13_E" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Anisotropic-temperature-factors_b-13_E" type="xs:string"/>
-	<xs:complexType name="Anisotropic-temperature-factors_b-22Type">
-		<xs:sequence>
-			<xs:element ref="tns:Anisotropic-temperature-factors_b-22_E" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Anisotropic-temperature-factors_b-22_E" type="xs:string"/>
-	<xs:complexType name="Anisotropic-temperature-factors_b-23Type">
-		<xs:sequence>
-			<xs:element ref="tns:Anisotropic-temperature-factors_b-23_E" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Anisotropic-temperature-factors_b-23_E" type="xs:string"/>
-	<xs:complexType name="Anisotropic-temperature-factors_b-33Type">
-		<xs:sequence>
-			<xs:element ref="tns:Anisotropic-temperature-factors_b-33_E" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Anisotropic-temperature-factors_b-33_E" type="xs:string"/>
-	<xs:element name="Anisotropic-temperature-factors_scale-factor" type="xs:string"/>
-	<xs:complexType name="Annot-descrType">
-		<xs:sequence>
-			<xs:element name="Annotdesc" type="tns:AnnotdescType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Annot-idType">
-		<xs:choice>
-			<xs:element name="Annot-id_local" type="tns:Annot-id_localType"/>
-			<xs:element ref="tns:Annot-id_ncbi"/>
-			<xs:element name="Annot-id_general" type="tns:Annot-id_generalType"/>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="Annot-id_generalType">
-		<xs:sequence>
-			<xs:element name="Dbtag" type="tns:DbtagType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Annot-id_localType">
-		<xs:sequence>
-			<xs:element name="Object-id" type="tns:Object-idType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Annot-id_ncbi" type="xs:string"/>
-	<xs:complexType name="AnnotdescType">
-		<xs:choice>
-			<xs:element ref="tns:Annotdesc_name"/>
-			<xs:element ref="tns:Annotdesc_title"/>
-			<xs:element ref="tns:Annotdesc_comment"/>
-			<xs:element name="Annotdesc_pub" type="tns:Annotdesc_pubType"/>
-			<xs:element name="Annotdesc_user" type="tns:Annotdesc_userType"/>
-			<xs:element name="Annotdesc_create-date" type="tns:Annotdesc_create-dateType"/>
-			<xs:element name="Annotdesc_update-date" type="tns:Annotdesc_update-dateType"/>
-			<xs:element name="Annotdesc_src" type="tns:Annotdesc_srcType"/>
-			<xs:element name="Annotdesc_align" type="tns:Annotdesc_alignType"/>
-			<xs:element name="Annotdesc_region" type="tns:Annotdesc_regionType"/>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="Annotdesc_alignType">
-		<xs:sequence>
-			<xs:element name="Align-def" type="tns:Align-defType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Annotdesc_comment" type="xs:string"/>
-	<xs:complexType name="Annotdesc_create-dateType">
-		<xs:sequence>
-			<xs:element name="Date" type="tns:DateType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Annotdesc_name" type="xs:string"/>
-	<xs:complexType name="Annotdesc_pubType">
-		<xs:sequence>
-			<xs:element name="Pubdesc" type="tns:PubdescType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Annotdesc_regionType">
-		<xs:sequence>
-			<xs:element name="Seq-loc" type="tns:Seq-locType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Annotdesc_srcType">
-		<xs:sequence>
-			<xs:element name="Seq-id" type="tns:Seq-idType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Annotdesc_title" type="xs:string"/>
-	<xs:complexType name="Annotdesc_update-dateType">
-		<xs:sequence>
-			<xs:element name="Date" type="tns:DateType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Annotdesc_userType">
-		<xs:sequence>
-			<xs:element name="User-object" type="tns:User-objectType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ArticleIdType">
-		<xs:choice>
-			<xs:element name="ArticleId_pubmed" type="tns:ArticleId_pubmedType"/>
-			<xs:element name="ArticleId_medline" type="tns:ArticleId_medlineType"/>
-			<xs:element name="ArticleId_doi" type="tns:ArticleId_doiType"/>
-			<xs:element name="ArticleId_pii" type="tns:ArticleId_piiType"/>
-			<xs:element name="ArticleId_pmcid" type="tns:ArticleId_pmcidType"/>
-			<xs:element name="ArticleId_pmcpid" type="tns:ArticleId_pmcpidType"/>
-			<xs:element name="ArticleId_pmpid" type="tns:ArticleId_pmpidType"/>
-			<xs:element name="ArticleId_other" type="tns:ArticleId_otherType"/>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="ArticleIdSetType">
-		<xs:sequence>
-			<xs:element name="ArticleId" type="tns:ArticleIdType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ArticleId_doiType">
-		<xs:sequence>
-			<xs:element ref="tns:DOI"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ArticleId_medlineType">
-		<xs:sequence>
-			<xs:element ref="tns:MedlineUID"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ArticleId_otherType">
-		<xs:sequence>
-			<xs:element name="Dbtag" type="tns:DbtagType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ArticleId_piiType">
-		<xs:sequence>
-			<xs:element ref="tns:PII"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ArticleId_pmcidType">
-		<xs:sequence>
-			<xs:element ref="tns:PmcID"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ArticleId_pmcpidType">
-		<xs:sequence>
-			<xs:element ref="tns:PmcPid"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ArticleId_pmpidType">
-		<xs:sequence>
-			<xs:element ref="tns:PmPid"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ArticleId_pubmedType">
-		<xs:sequence>
-			<xs:element ref="tns:PubMedId"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AssayType">
-		<xs:sequence>
-			<xs:element ref="tns:Assay_handle" minOccurs="0"/>
-			<xs:element ref="tns:Assay_batch" minOccurs="0"/>
-			<xs:element ref="tns:Assay_batchId" minOccurs="0"/>
-			<xs:element name="Assay_batchType" type="tns:Assay_batchTypeType" minOccurs="0"/>
-			<xs:element name="Assay_molType" type="tns:Assay_molTypeType" minOccurs="0"/>
-			<xs:element ref="tns:Assay_sampleSize" minOccurs="0"/>
-			<xs:element ref="tns:Assay_population" minOccurs="0"/>
-			<xs:element ref="tns:Assay_linkoutUrl" minOccurs="0"/>
-			<xs:element name="Assay_method" type="tns:Assay_methodType" minOccurs="0"/>
-			<xs:element name="Assay_taxonomy" type="tns:Assay_taxonomyType"/>
-			<xs:element name="Assay_strains" type="tns:Assay_strainsType" minOccurs="0"/>
-			<xs:element ref="tns:Assay_comment" minOccurs="0"/>
-			<xs:element name="Assay_citation" type="tns:Assay_citationType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Assay_batch" type="xs:string"/>
-	<xs:element name="Assay_batchId" type="xs:string"/>
-	<xs:complexType name="Assay_batchTypeType">
-		<xs:attribute name="value" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="snpassay"/>
-					<xs:enumeration value="validation"/>
-					<xs:enumeration value="doublehit"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="Assay_citationType">
-		<xs:sequence>
-			<xs:element ref="tns:Assay_citation_E" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Assay_citation_E" type="xs:string"/>
-	<xs:element name="Assay_comment" type="xs:string"/>
-	<xs:element name="Assay_handle" type="xs:string"/>
-	<xs:element name="Assay_linkoutUrl" type="xs:string"/>
-	<xs:complexType name="Assay_methodType">
-		<xs:sequence>
-			<xs:element ref="tns:Assay_method_name" minOccurs="0"/>
-			<xs:element ref="tns:Assay_method_id" minOccurs="0"/>
-			<xs:element ref="tns:Assay_method_exception"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Assay_method_exception" type="xs:string"/>
-	<xs:element name="Assay_method_id" type="xs:string"/>
-	<xs:element name="Assay_method_name" type="xs:string"/>
-	<xs:complexType name="Assay_molTypeType">
-		<xs:attribute name="value" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="genomic"/>
-					<xs:enumeration value="cDNA"/>
-					<xs:enumeration value="mito"/>
-					<xs:enumeration value="chloro"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:element name="Assay_population" type="xs:string"/>
-	<xs:element name="Assay_sampleSize" type="xs:string"/>
-	<xs:complexType name="Assay_strainsType">
-		<xs:sequence>
-			<xs:element ref="tns:Assay_strains_E" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Assay_strains_E" type="xs:string"/>
-	<xs:complexType name="Assay_taxonomyType">
-		<xs:sequence>
-			<xs:element ref="tns:Assay_taxonomy_id"/>
-			<xs:element ref="tns:Assay_taxonomy_organism" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Assay_taxonomy_id" type="xs:string"/>
-	<xs:element name="Assay_taxonomy_organism" type="xs:string"/>
-	<xs:complexType name="AssemblyType">
-		<xs:sequence>
-			<xs:element ref="tns:Assembly_dbSnpBuild"/>
-			<xs:element ref="tns:Assembly_genomeBuild"/>
-			<xs:element ref="tns:Assembly_groupLabel" minOccurs="0"/>
-			<xs:element ref="tns:Assembly_assemblySource" minOccurs="0"/>
-			<xs:element name="Assembly_current" type="tns:Assembly_currentType" minOccurs="0"/>
-			<xs:element name="Assembly_component" type="tns:Assembly_componentType" minOccurs="0"/>
-			<xs:element name="Assembly_snpStat" type="tns:Assembly_snpStatType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Assembly_assemblySource" type="xs:string"/>
-	<xs:complexType name="Assembly_componentType">
-		<xs:sequence>
-			<xs:element name="Component" type="tns:ComponentType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Assembly_currentType">
-		<xs:attribute name="value" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="true"/>
-					<xs:enumeration value="false"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:element name="Assembly_dbSnpBuild" type="xs:string"/>
-	<xs:element name="Assembly_genomeBuild" type="xs:string"/>
-	<xs:element name="Assembly_groupLabel" type="xs:string"/>
-	<xs:complexType name="Assembly_snpStatType">
-		<xs:sequence>
-			<xs:element name="Assembly_snpStat_mapWeight" type="tns:Assembly_snpStat_mapWeightType"/>
-			<xs:element ref="tns:Assembly_snpStat_chromCount" minOccurs="0"/>
-			<xs:element ref="tns:Assembly_snpStat_placedContigCount" minOccurs="0"/>
-			<xs:element ref="tns:Assembly_snpStat_unplacedContigCount" minOccurs="0"/>
-			<xs:element ref="tns:Assembly_snpStat_seqlocCount" minOccurs="0"/>
-			<xs:element ref="tns:Assembly_snpStat_hapCount" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Assembly_snpStat_chromCount" type="xs:string"/>
-	<xs:element name="Assembly_snpStat_hapCount" type="xs:string"/>
-	<xs:complexType name="Assembly_snpStat_mapWeightType">
-		<xs:attribute name="value" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="unmapped"/>
-					<xs:enumeration value="unique-in-contig"/>
-					<xs:enumeration value="two-hits-in-contig"/>
-					<xs:enumeration value="less-10-hits"/>
-					<xs:enumeration value="multiple-hits"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:element name="Assembly_snpStat_placedContigCount" type="xs:string"/>
-	<xs:element name="Assembly_snpStat_seqlocCount" type="xs:string"/>
-	<xs:element name="Assembly_snpStat_unplacedContigCount" type="xs:string"/>
-	<xs:complexType name="AtomType">
-		<xs:sequence>
-			<xs:element name="Atom_id" type="tns:Atom_idType"/>
-			<xs:element ref="tns:Atom_name" minOccurs="0"/>
-			<xs:element name="Atom_iupac-code" type="tns:Atom_iupac-codeType" minOccurs="0"/>
-			<xs:element name="Atom_element" type="tns:Atom_elementType"/>
-			<xs:element name="Atom_ionizable-proton" type="tns:Atom_ionizable-protonType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Atom-id" type="xs:string"/>
-	<xs:complexType name="Atom-pntrType">
-		<xs:sequence>
-			<xs:element name="Atom-pntr_molecule-id" type="tns:Atom-pntr_molecule-idType"/>
-			<xs:element name="Atom-pntr_residue-id" type="tns:Atom-pntr_residue-idType"/>
-			<xs:element name="Atom-pntr_atom-id" type="tns:Atom-pntr_atom-idType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Atom-pntr-set">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Atom-pntr" type="tns:Atom-pntrType" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="Atom-pntr_atom-idType">
-		<xs:sequence>
-			<xs:element ref="tns:Atom-id"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Atom-pntr_molecule-idType">
-		<xs:sequence>
-			<xs:element ref="tns:Molecule-id"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Atom-pntr_residue-idType">
-		<xs:sequence>
-			<xs:element ref="tns:Residue-id"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Atom-pntrsType">
-		<xs:sequence>
-			<xs:element ref="tns:Atom-pntrs_number-of-ptrs"/>
-			<xs:element name="Atom-pntrs_molecule-ids" type="tns:Atom-pntrs_molecule-idsType"/>
-			<xs:element name="Atom-pntrs_residue-ids" type="tns:Atom-pntrs_residue-idsType"/>
-			<xs:element name="Atom-pntrs_atom-ids" type="tns:Atom-pntrs_atom-idsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Atom-pntrs_atom-idsType">
-		<xs:sequence>
-			<xs:element ref="tns:Atom-id" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Atom-pntrs_molecule-idsType">
-		<xs:sequence>
-			<xs:element ref="tns:Molecule-id" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Atom-pntrs_number-of-ptrs" type="xs:string"/>
-	<xs:complexType name="Atom-pntrs_residue-idsType">
-		<xs:sequence>
-			<xs:element ref="tns:Residue-id" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Atom_elementType">
-		<xs:attribute name="value" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="h"/>
-					<xs:enumeration value="he"/>
-					<xs:enumeration value="li"/>
-					<xs:enumeration value="be"/>
-					<xs:enumeration value="b"/>
-					<xs:enumeration value="c"/>
-					<xs:enumeration value="n"/>
-					<xs:enumeration value="o"/>
-					<xs:enumeration value="f"/>
-					<xs:enumeration value="ne"/>
-					<xs:enumeration value="na"/>
-					<xs:enumeration value="mg"/>
-					<xs:enumeration value="al"/>
-					<xs:enumeration value="si"/>
-					<xs:enumeration value="p"/>
-					<xs:enumeration value="s"/>
-					<xs:enumeration value="cl"/>
-					<xs:enumeration value="ar"/>
-					<xs:enumeration value="k"/>
-					<xs:enumeration value="ca"/>
-					<xs:enumeration value="sc"/>
-					<xs:enumeration value="ti"/>
-					<xs:enumeration value="v"/>
-					<xs:enumeration value="cr"/>
-					<xs:enumeration value="mn"/>
-					<xs:enumeration value="fe"/>
-					<xs:enumeration value="co"/>
-					<xs:enumeration value="ni"/>
-					<xs:enumeration value="cu"/>
-					<xs:enumeration value="zn"/>
-					<xs:enumeration value="ga"/>
-					<xs:enumeration value="ge"/>
-					<xs:enumeration value="as"/>
-					<xs:enumeration value="se"/>
-					<xs:enumeration value="br"/>
-					<xs:enumeration value="kr"/>
-					<xs:enumeration value="rb"/>
-					<xs:enumeration value="sr"/>
-					<xs:enumeration value="y"/>
-					<xs:enumeration value="zr"/>
-					<xs:enumeration value="nb"/>
-					<xs:enumeration value="mo"/>
-					<xs:enumeration value="tc"/>
-					<xs:enumeration value="ru"/>
-					<xs:enumeration value="rh"/>
-					<xs:enumeration value="pd"/>
-					<xs:enumeration value="ag"/>
-					<xs:enumeration value="cd"/>
-					<xs:enumeration value="in"/>
-					<xs:enumeration value="sn"/>
-					<xs:enumeration value="sb"/>
-					<xs:enumeration value="te"/>
-					<xs:enumeration value="i"/>
-					<xs:enumeration value="xe"/>
-					<xs:enumeration value="cs"/>
-					<xs:enumeration value="ba"/>
-					<xs:enumeration value="la"/>
-					<xs:enumeration value="ce"/>
-					<xs:enumeration value="pr"/>
-					<xs:enumeration value="nd"/>
-					<xs:enumeration value="pm"/>
-					<xs:enumeration value="sm"/>
-					<xs:enumeration value="eu"/>
-					<xs:enumeration value="gd"/>
-					<xs:enumeration value="tb"/>
-					<xs:enumeration value="dy"/>
-					<xs:enumeration value="ho"/>
-					<xs:enumeration value="er"/>
-					<xs:enumeration value="tm"/>
-					<xs:enumeration value="yb"/>
-					<xs:enumeration value="lu"/>
-					<xs:enumeration value="hf"/>
-					<xs:enumeration value="ta"/>
-					<xs:enumeration value="w"/>
-					<xs:enumeration value="re"/>
-					<xs:enumeration value="os"/>
-					<xs:enumeration value="ir"/>
-					<xs:enumeration value="pt"/>
-					<xs:enumeration value="au"/>
-					<xs:enumeration value="hg"/>
-					<xs:enumeration value="tl"/>
-					<xs:enumeration value="pb"/>
-					<xs:enumeration value="bi"/>
-					<xs:enumeration value="po"/>
-					<xs:enumeration value="at"/>
-					<xs:enumeration value="rn"/>
-					<xs:enumeration value="fr"/>
-					<xs:enumeration value="ra"/>
-					<xs:enumeration value="ac"/>
-					<xs:enumeration value="th"/>
-					<xs:enumeration value="pa"/>
-					<xs:enumeration value="u"/>
-					<xs:enumeration value="np"/>
-					<xs:enumeration value="pu"/>
-					<xs:enumeration value="am"/>
-					<xs:enumeration value="cm"/>
-					<xs:enumeration value="bk"/>
-					<xs:enumeration value="cf"/>
-					<xs:enumeration value="es"/>
-					<xs:enumeration value="fm"/>
-					<xs:enumeration value="md"/>
-					<xs:enumeration value="no"/>
-					<xs:enumeration value="lr"/>
-					<xs:enumeration value="other"/>
-					<xs:enumeration value="unknown"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="Atom_idType">
-		<xs:sequence>
-			<xs:element ref="tns:Atom-id"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Atom_ionizable-protonType">
-		<xs:attribute name="value" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="true"/>
-					<xs:enumeration value="false"/>
-					<xs:enumeration value="unknown"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="Atom_iupac-codeType">
-		<xs:sequence>
-			<xs:element ref="tns:Atom_iupac-code_E" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Atom_iupac-code_E" type="xs:string"/>
-	<xs:element name="Atom_name" type="xs:string"/>
-	<xs:complexType name="Atomic-coordinatesType">
-		<xs:sequence>
-			<xs:element ref="tns:Atomic-coordinates_number-of-points"/>
-			<xs:element name="Atomic-coordinates_atoms" type="tns:Atomic-coordinates_atomsType"/>
-			<xs:element name="Atomic-coordinates_sites" type="tns:Atomic-coordinates_sitesType"/>
-			<xs:element name="Atomic-coordinates_temperature-factors" type="tns:Atomic-coordinates_temperature-factorsType" minOccurs="0"/>
-			<xs:element name="Atomic-coordinates_occupancies" type="tns:Atomic-coordinates_occupanciesType" minOccurs="0"/>
-			<xs:element name="Atomic-coordinates_alternate-conf-ids" type="tns:Atomic-coordinates_alternate-conf-idsType" minOccurs="0"/>
-			<xs:element name="Atomic-coordinates_conf-ensembles" type="tns:Atomic-coordinates_conf-ensemblesType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Atomic-coordinates_alternate-conf-idsType">
-		<xs:sequence>
-			<xs:element name="Alternate-conformation-ids" type="tns:Alternate-conformation-idsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Atomic-coordinates_atomsType">
-		<xs:sequence>
-			<xs:element name="Atom-pntrs" type="tns:Atom-pntrsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Atomic-coordinates_conf-ensemblesType">
-		<xs:sequence>
-			<xs:element name="Conformation-ensemble" type="tns:Conformation-ensembleType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Atomic-coordinates_number-of-points" type="xs:string"/>
-	<xs:complexType name="Atomic-coordinates_occupanciesType">
-		<xs:sequence>
-			<xs:element name="Atomic-occupancies" type="tns:Atomic-occupanciesType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Atomic-coordinates_sitesType">
-		<xs:sequence>
-			<xs:element name="Model-space-points" type="tns:Model-space-pointsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Atomic-coordinates_temperature-factorsType">
-		<xs:sequence>
-			<xs:element name="Atomic-temperature-factors" type="tns:Atomic-temperature-factorsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Atomic-occupanciesType">
-		<xs:sequence>
-			<xs:element ref="tns:Atomic-occupancies_scale-factor"/>
-			<xs:element name="Atomic-occupancies_o" type="tns:Atomic-occupancies_oType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Atomic-occupancies_oType">
-		<xs:sequence>
-			<xs:element ref="tns:Atomic-occupancies_o_E" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Atomic-occupancies_o_E" type="xs:string"/>
-	<xs:element name="Atomic-occupancies_scale-factor" type="xs:string"/>
-	<xs:complexType name="Atomic-temperature-factorsType">
-		<xs:choice>
-			<xs:element name="Atomic-temperature-factors_isotropic" type="tns:Atomic-temperature-factors_isotropicType"/>
-			<xs:element name="Atomic-temperature-factors_anisotropic" type="tns:Atomic-temperature-factors_anisotropicType"/>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="Atomic-temperature-factors_anisotropicType">
-		<xs:sequence>
-			<xs:element name="Anisotropic-temperature-factors" type="tns:Anisotropic-temperature-factorsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Atomic-temperature-factors_isotropicType">
-		<xs:sequence>
-			<xs:element name="Isotropic-temperature-factors" type="tns:Isotropic-temperature-factorsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Auth-listType">
-		<xs:sequence>
-			<xs:element name="Auth-list_names" type="tns:Auth-list_namesType"/>
-			<xs:element name="Auth-list_affil" type="tns:Auth-list_affilType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Auth-list_affilType">
-		<xs:sequence>
-			<xs:element name="Affil" type="tns:AffilType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Auth-list_namesType">
-		<xs:choice>
-			<xs:element name="Auth-list_names_std" type="tns:Auth-list_names_stdType"/>
-			<xs:element name="Auth-list_names_ml" type="tns:Auth-list_names_mlType"/>
-			<xs:element name="Auth-list_names_str" type="tns:Auth-list_names_strType"/>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="Auth-list_names_mlType">
-		<xs:sequence>
-			<xs:element ref="tns:Auth-list_names_ml_E" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Auth-list_names_ml_E" type="xs:string"/>
-	<xs:complexType name="Auth-list_names_stdType">
-		<xs:sequence>
-			<xs:element name="Author" type="tns:AuthorType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Auth-list_names_strType">
-		<xs:sequence>
-			<xs:element ref="tns:Auth-list_names_str_E" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Auth-list_names_str_E" type="xs:string"/>
-	<xs:complexType name="AuthorType">
-		<xs:sequence>
-			<xs:element name="Author_name" type="tns:Author_nameType"/>
-			<xs:element name="Author_level" type="tns:Author_levelType" minOccurs="0"/>
-			<xs:element name="Author_role" type="tns:Author_roleType" minOccurs="0"/>
-			<xs:element name="Author_affil" type="tns:Author_affilType" minOccurs="0"/>
-			<xs:element name="Author_is-corr" type="tns:Author_is-corrType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Author_affilType">
-		<xs:sequence>
-			<xs:element name="Affil" type="tns:AffilType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Author_is-corrType">
-		<xs:attribute name="value" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="true"/>
-					<xs:enumeration value="false"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="Author_levelType">
-		<xs:attribute name="value" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="primary"/>
-					<xs:enumeration value="secondary"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="Author_nameType">
-		<xs:sequence>
-			<xs:element name="Person-id" type="tns:Person-idType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Author_roleType">
-		<xs:attribute name="value" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="compiler"/>
-					<xs:enumeration value="editor"/>
-					<xs:enumeration value="patent-assignee"/>
-					<xs:enumeration value="translator"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="BaseURLType">
-		<xs:sequence>
-			<xs:element ref="tns:BaseURL_urlId" minOccurs="0"/>
-			<xs:element ref="tns:BaseURL_resourceName" minOccurs="0"/>
-			<xs:element ref="tns:BaseURL_resourceId" minOccurs="0"/>
-			<xs:element ref="tns:BaseURL_baseURL"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="BaseURL_baseURL" type="xs:string"/>
-	<xs:element name="BaseURL_resourceId" type="xs:string"/>
-	<xs:element name="BaseURL_resourceName" type="xs:string"/>
-	<xs:element name="BaseURL_urlId" type="xs:string"/>
-	<xs:complexType name="BinomialOrgNameType">
-		<xs:sequence>
-			<xs:element ref="tns:BinomialOrgName_genus"/>
-			<xs:element ref="tns:BinomialOrgName_species" minOccurs="0"/>
-			<xs:element ref="tns:BinomialOrgName_subspecies" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="BinomialOrgName_genus" type="xs:string"/>
-	<xs:element name="BinomialOrgName_species" type="xs:string"/>
-	<xs:element name="BinomialOrgName_subspecies" type="xs:string"/>
-	<xs:complexType name="BioSourceType">
-		<xs:sequence>
-			<xs:element name="BioSource_genome" type="tns:BioSource_genomeType" minOccurs="0"/>
-			<xs:element name="BioSource_origin" type="tns:BioSource_originType" minOccurs="0"/>
-			<xs:element name="BioSource_org" type="tns:BioSource_orgType"/>
-			<xs:element name="BioSource_subtype" type="tns:BioSource_subtypeType" minOccurs="0"/>
-			<xs:element ref="tns:BioSource_is-focus" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="BioSource_genomeType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="value">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="unknown"/>
-							<xs:enumeration value="genomic"/>
-							<xs:enumeration value="chloroplast"/>
-							<xs:enumeration value="chromoplast"/>
-							<xs:enumeration value="kinetoplast"/>
-							<xs:enumeration value="mitochondrion"/>
-							<xs:enumeration value="plastid"/>
-							<xs:enumeration value="macronuclear"/>
-							<xs:enumeration value="extrachrom"/>
-							<xs:enumeration value="plasmid"/>
-							<xs:enumeration value="transposon"/>
-							<xs:enumeration value="insertion-seq"/>
-							<xs:enumeration value="cyanelle"/>
-							<xs:enumeration value="proviral"/>
-							<xs:enumeration value="virion"/>
-							<xs:enumeration value="nucleomorph"/>
-							<xs:enumeration value="apicoplast"/>
-							<xs:enumeration value="leucoplast"/>
-							<xs:enumeration value="proplastid"/>
-							<xs:enumeration value="endogenous-virus"/>
-							<xs:enumeration value="hydrogenosome"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="BioSource_is-focus">
-		<xs:complexType/>
-	</xs:element>
-	<xs:complexType name="BioSource_orgType">
-		<xs:sequence>
-			<xs:element name="Org-ref" type="tns:Org-refType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="BioSource_originType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="value">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="unknown"/>
-							<xs:enumeration value="natural"/>
-							<xs:enumeration value="natmut"/>
-							<xs:enumeration value="mut"/>
-							<xs:enumeration value="artificial"/>
-							<xs:enumeration value="synthetic"/>
-							<xs:enumeration value="other"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="BioSource_subtypeType">
-		<xs:sequence>
-			<xs:element name="SubSource" type="tns:SubSourceType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="BioTreeContainer">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:BioTreeContainer_treetype" minOccurs="0"/>
-				<xs:element name="BioTreeContainer_fdict" type="tns:BioTreeContainer_fdictType"/>
-				<xs:element name="BioTreeContainer_nodes" type="tns:BioTreeContainer_nodesType"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="BioTreeContainer_fdictType">
-		<xs:sequence>
-			<xs:element name="FeatureDictSet" type="tns:FeatureDictSetType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="BioTreeContainer_nodesType">
-		<xs:sequence>
-			<xs:element name="NodeSet" type="tns:NodeSetType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="BioTreeContainer_treetype" type="xs:string"/>
-	<xs:complexType name="Biomol-descrType">
-		<xs:choice>
-			<xs:element ref="tns:Biomol-descr_name"/>
-			<xs:element ref="tns:Biomol-descr_pdb-class"/>
-			<xs:element ref="tns:Biomol-descr_pdb-source"/>
-			<xs:element ref="tns:Biomol-descr_pdb-comment"/>
-			<xs:element ref="tns:Biomol-descr_other-comment"/>
-			<xs:element name="Biomol-descr_organism" type="tns:Biomol-descr_organismType"/>
-			<xs:element name="Biomol-descr_attribution" type="tns:Biomol-descr_attributionType"/>
-			<xs:element name="Biomol-descr_assembly-type" type="tns:Biomol-descr_assembly-typeType"/>
-			<xs:element name="Biomol-descr_molecule-type" type="tns:Biomol-descr_molecule-typeType"/>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="Biomol-descr_assembly-typeType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="value">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="physiological-form"/>
-							<xs:enumeration value="crystallographic-cell"/>
-							<xs:enumeration value="other"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="Biomol-descr_attributionType">
-		<xs:sequence>
-			<xs:element name="Pub" type="tns:PubType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biomol-descr_molecule-typeType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="value">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="dna"/>
-							<xs:enumeration value="rna"/>
-							<xs:enumeration value="protein"/>
-							<xs:enumeration value="other-biopolymer"/>
-							<xs:enumeration value="solvent"/>
-							<xs:enumeration value="other-nonpolymer"/>
-							<xs:enumeration value="other"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="Biomol-descr_name" type="xs:string"/>
-	<xs:complexType name="Biomol-descr_organismType">
-		<xs:sequence>
-			<xs:element name="BioSource" type="tns:BioSourceType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Biomol-descr_other-comment" type="xs:string"/>
-	<xs:element name="Biomol-descr_pdb-class" type="xs:string"/>
-	<xs:element name="Biomol-descr_pdb-comment" type="xs:string"/>
-	<xs:element name="Biomol-descr_pdb-source" type="xs:string"/>
-	<xs:complexType name="BioseqType">
-		<xs:sequence>
-			<xs:element name="Bioseq_id" type="tns:Bioseq_idType"/>
-			<xs:element name="Bioseq_descr" type="tns:Bioseq_descrType" minOccurs="0"/>
-			<xs:element name="Bioseq_inst" type="tns:Bioseq_instType"/>
-			<xs:element name="Bioseq_annot" type="tns:Bioseq_annotType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Bioseq-setType">
-		<xs:sequence>
-			<xs:element name="Bioseq-set_id" type="tns:Bioseq-set_idType" minOccurs="0"/>
-			<xs:element name="Bioseq-set_coll" type="tns:Bioseq-set_collType" minOccurs="0"/>
-			<xs:element ref="tns:Bioseq-set_level" minOccurs="0"/>
-			<xs:element name="Bioseq-set_class" type="tns:Bioseq-set_classType" minOccurs="0"/>
-			<xs:element ref="tns:Bioseq-set_release" minOccurs="0"/>
-			<xs:element name="Bioseq-set_date" type="tns:Bioseq-set_dateType" minOccurs="0"/>
-			<xs:element name="Bioseq-set_descr" type="tns:Bioseq-set_descrType" minOccurs="0"/>
-			<xs:element name="Bioseq-set_seq-set" type="tns:Bioseq-set_seq-setType"/>
-			<xs:element name="Bioseq-set_annot" type="tns:Bioseq-set_annotType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Bioseq-set_annotType">
-		<xs:sequence>
-			<xs:element name="Seq-annot" type="tns:Seq-annotType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Bioseq-set_classType">
-		<xs:attribute name="value">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="not-set"/>
-					<xs:enumeration value="nuc-prot"/>
-					<xs:enumeration value="segset"/>
-					<xs:enumeration value="conset"/>
-					<xs:enumeration value="parts"/>
-					<xs:enumeration value="gibb"/>
-					<xs:enumeration value="gi"/>
-					<xs:enumeration value="genbank"/>
-					<xs:enumeration value="pir"/>
-					<xs:enumeration value="pub-set"/>
-					<xs:enumeration value="equiv"/>
-					<xs:enumeration value="swissprot"/>
-					<xs:enumeration value="pdb-entry"/>
-					<xs:enumeration value="mut-set"/>
-					<xs:enumeration value="pop-set"/>
-					<xs:enumeration value="phy-set"/>
-					<xs:enumeration value="eco-set"/>
-					<xs:enumeration value="gen-prod-set"/>
-					<xs:enumeration value="wgs-set"/>
-					<xs:enumeration value="other"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="Bioseq-set_collType">
-		<xs:sequence>
-			<xs:element name="Dbtag" type="tns:DbtagType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Bioseq-set_dateType">
-		<xs:sequence>
-			<xs:element name="Date" type="tns:DateType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Bioseq-set_descrType">
-		<xs:sequence>
-			<xs:element name="Seq-descr" type="tns:Seq-descrType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Bioseq-set_idType">
-		<xs:sequence>
-			<xs:element name="Object-id" type="tns:Object-idType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Bioseq-set_level" type="xs:string"/>
-	<xs:element name="Bioseq-set_release" type="xs:string"/>
-	<xs:complexType name="Bioseq-set_seq-setType">
-		<xs:sequence>
-			<xs:element name="Seq-entry" type="tns:Seq-entryType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Bioseq_annotType">
-		<xs:sequence>
-			<xs:element name="Seq-annot" type="tns:Seq-annotType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Bioseq_descrType">
-		<xs:sequence>
-			<xs:element name="Seq-descr" type="tns:Seq-descrType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Bioseq_idType">
-		<xs:sequence>
-			<xs:element name="Seq-id" type="tns:Seq-idType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Bioseq_instType">
-		<xs:sequence>
-			<xs:element name="Seq-inst" type="tns:Seq-instType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="BiostrucType">
-		<xs:sequence>
-			<xs:element name="Biostruc_id" type="tns:Biostruc_idType"/>
-			<xs:element name="Biostruc_descr" type="tns:Biostruc_descrType" minOccurs="0"/>
-			<xs:element name="Biostruc_chemical-graph" type="tns:Biostruc_chemical-graphType"/>
-			<xs:element name="Biostruc_features" type="tns:Biostruc_featuresType" minOccurs="0"/>
-			<xs:element name="Biostruc_model" type="tns:Biostruc_modelType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-alignType">
-		<xs:sequence>
-			<xs:element name="Biostruc-align_master" type="tns:Biostruc-align_masterType"/>
-			<xs:element name="Biostruc-align_slaves" type="tns:Biostruc-align_slavesType"/>
-			<xs:element name="Biostruc-align_alignments" type="tns:Biostruc-align_alignmentsType"/>
-			<xs:element name="Biostruc-align_sequences" type="tns:Biostruc-align_sequencesType"/>
-			<xs:element name="Biostruc-align_seqalign" type="tns:Biostruc-align_seqalignType"/>
-			<xs:element name="Biostruc-align_style-dictionary" type="tns:Biostruc-align_style-dictionaryType" minOccurs="0"/>
-			<xs:element name="Biostruc-align_user-annotations" type="tns:Biostruc-align_user-annotationsType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-align-seqType">
-		<xs:sequence>
-			<xs:element name="Biostruc-align-seq_sequences" type="tns:Biostruc-align-seq_sequencesType"/>
-			<xs:element name="Biostruc-align-seq_seqalign" type="tns:Biostruc-align-seq_seqalignType"/>
-			<xs:element name="Biostruc-align-seq_style-dictionary" type="tns:Biostruc-align-seq_style-dictionaryType" minOccurs="0"/>
-			<xs:element name="Biostruc-align-seq_user-annotations" type="tns:Biostruc-align-seq_user-annotationsType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-align-seq_seqalignType">
-		<xs:sequence>
-			<xs:element name="Seq-annot" type="tns:Seq-annotType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-align-seq_sequencesType">
-		<xs:sequence>
-			<xs:element name="Seq-entry" type="tns:Seq-entryType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-align-seq_style-dictionaryType">
-		<xs:sequence>
-			<xs:element name="Cn3d-style-dictionary" type="tns:Cn3d-style-dictionaryType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-align-seq_user-annotationsType">
-		<xs:sequence>
-			<xs:element name="Cn3d-user-annotations" type="tns:Cn3d-user-annotationsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-align_alignmentsType">
-		<xs:sequence>
-			<xs:element name="Biostruc-annot-set" type="tns:Biostruc-annot-setType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-align_masterType">
-		<xs:sequence>
-			<xs:element name="Biostruc" type="tns:BiostrucType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-align_seqalignType">
-		<xs:sequence>
-			<xs:element name="Seq-annot" type="tns:Seq-annotType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-align_sequencesType">
-		<xs:sequence>
-			<xs:element name="Seq-entry" type="tns:Seq-entryType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-align_slavesType">
-		<xs:sequence>
-			<xs:element name="Biostruc" type="tns:BiostrucType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-align_style-dictionaryType">
-		<xs:sequence>
-			<xs:element name="Cn3d-style-dictionary" type="tns:Cn3d-style-dictionaryType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-align_user-annotationsType">
-		<xs:sequence>
-			<xs:element name="Cn3d-user-annotations" type="tns:Cn3d-user-annotationsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-annot-setType">
-		<xs:sequence>
-			<xs:element name="Biostruc-annot-set_id" type="tns:Biostruc-annot-set_idType" minOccurs="0"/>
-			<xs:element name="Biostruc-annot-set_descr" type="tns:Biostruc-annot-set_descrType" minOccurs="0"/>
-			<xs:element name="Biostruc-annot-set_features" type="tns:Biostruc-annot-set_featuresType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-annot-set_descrType">
-		<xs:sequence>
-			<xs:element name="Biostruc-descr" type="tns:Biostruc-descrType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-annot-set_featuresType">
-		<xs:sequence>
-			<xs:element name="Biostruc-feature-set" type="tns:Biostruc-feature-setType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-annot-set_idType">
-		<xs:sequence>
-			<xs:element name="Biostruc-id" type="tns:Biostruc-idType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-descrType">
-		<xs:choice>
-			<xs:element ref="tns:Biostruc-descr_name"/>
-			<xs:element ref="tns:Biostruc-descr_pdb-comment"/>
-			<xs:element ref="tns:Biostruc-descr_other-comment"/>
-			<xs:element name="Biostruc-descr_history" type="tns:Biostruc-descr_historyType"/>
-			<xs:element name="Biostruc-descr_attribution" type="tns:Biostruc-descr_attributionType"/>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-descr_attributionType">
-		<xs:sequence>
-			<xs:element name="Pub" type="tns:PubType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-descr_historyType">
-		<xs:sequence>
-			<xs:element name="Biostruc-history" type="tns:Biostruc-historyType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Biostruc-descr_name" type="xs:string"/>
-	<xs:element name="Biostruc-descr_other-comment" type="xs:string"/>
-	<xs:element name="Biostruc-descr_pdb-comment" type="xs:string"/>
-	<xs:complexType name="Biostruc-featureType">
-		<xs:sequence>
-			<xs:element name="Biostruc-feature_id" type="tns:Biostruc-feature_idType" minOccurs="0"/>
-			<xs:element ref="tns:Biostruc-feature_name" minOccurs="0"/>
-			<xs:element name="Biostruc-feature_type" type="tns:Biostruc-feature_typeType" minOccurs="0"/>
-			<xs:element name="Biostruc-feature_property" type="tns:Biostruc-feature_propertyType" minOccurs="0"/>
-			<xs:element name="Biostruc-feature_location" type="tns:Biostruc-feature_locationType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Biostruc-feature-id" type="xs:string"/>
-	<xs:complexType name="Biostruc-feature-setType">
-		<xs:sequence>
-			<xs:element name="Biostruc-feature-set_id" type="tns:Biostruc-feature-set_idType"/>
-			<xs:element name="Biostruc-feature-set_descr" type="tns:Biostruc-feature-set_descrType" minOccurs="0"/>
-			<xs:element name="Biostruc-feature-set_features" type="tns:Biostruc-feature-set_featuresType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature-set-descrType">
-		<xs:choice>
-			<xs:element ref="tns:Biostruc-feature-set-descr_name"/>
-			<xs:element ref="tns:Biostruc-feature-set-descr_pdb-comment"/>
-			<xs:element ref="tns:Biostruc-feature-set-descr_other-comment"/>
-			<xs:element name="Biostruc-feature-set-descr_attribution" type="tns:Biostruc-feature-set-descr_attributionType"/>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature-set-descr_attributionType">
-		<xs:sequence>
-			<xs:element name="Pub" type="tns:PubType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Biostruc-feature-set-descr_name" type="xs:string"/>
-	<xs:element name="Biostruc-feature-set-descr_other-comment" type="xs:string"/>
-	<xs:element name="Biostruc-feature-set-descr_pdb-comment" type="xs:string"/>
-	<xs:element name="Biostruc-feature-set-id" type="xs:string"/>
-	<xs:complexType name="Biostruc-feature-set_descrType">
-		<xs:sequence>
-			<xs:element name="Biostruc-feature-set-descr" type="tns:Biostruc-feature-set-descrType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature-set_featuresType">
-		<xs:sequence>
-			<xs:element name="Biostruc-feature" type="tns:Biostruc-featureType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature-set_idType">
-		<xs:sequence>
-			<xs:element ref="tns:Biostruc-feature-set-id"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature_idType">
-		<xs:sequence>
-			<xs:element ref="tns:Biostruc-feature-id"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature_locationType">
-		<xs:choice>
-			<xs:element name="Biostruc-feature_location_subgraph" type="tns:Biostruc-feature_location_subgraphType"/>
-			<xs:element name="Biostruc-feature_location_region" type="tns:Biostruc-feature_location_regionType"/>
-			<xs:element name="Biostruc-feature_location_alignment" type="tns:Biostruc-feature_location_alignmentType"/>
-			<xs:element name="Biostruc-feature_location_similarity" type="tns:Biostruc-feature_location_similarityType"/>
-			<xs:element name="Biostruc-feature_location_indirect" type="tns:Biostruc-feature_location_indirectType"/>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature_location_alignmentType">
-		<xs:sequence>
-			<xs:element name="Chem-graph-alignment" type="tns:Chem-graph-alignmentType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature_location_indirectType">
-		<xs:sequence>
-			<xs:element name="Other-feature" type="tns:Other-featureType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature_location_regionType">
-		<xs:sequence>
-			<xs:element name="Region-pntrs" type="tns:Region-pntrsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature_location_similarityType">
-		<xs:sequence>
-			<xs:element name="Region-similarity" type="tns:Region-similarityType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature_location_subgraphType">
-		<xs:sequence>
-			<xs:element name="Chem-graph-pntrs" type="tns:Chem-graph-pntrsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Biostruc-feature_name" type="xs:string"/>
-	<xs:complexType name="Biostruc-feature_propertyType">
-		<xs:choice>
-			<xs:element name="Biostruc-feature_property_color" type="tns:Biostruc-feature_property_colorType"/>
-			<xs:element name="Biostruc-feature_property_render" type="tns:Biostruc-feature_property_renderType"/>
-			<xs:element name="Biostruc-feature_property_transform" type="tns:Biostruc-feature_property_transformType"/>
-			<xs:element name="Biostruc-feature_property_camera" type="tns:Biostruc-feature_property_cameraType"/>
-			<xs:element name="Biostruc-feature_property_script" type="tns:Biostruc-feature_property_scriptType"/>
-			<xs:element name="Biostruc-feature_property_user" type="tns:Biostruc-feature_property_userType"/>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature_property_cameraType">
-		<xs:sequence>
-			<xs:element name="Camera" type="tns:CameraType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature_property_colorType">
-		<xs:sequence>
-			<xs:element name="Color-prop" type="tns:Color-propType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature_property_renderType">
-		<xs:sequence>
-			<xs:element name="Render-prop" type="tns:Render-propType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature_property_scriptType">
-		<xs:sequence>
-			<xs:element name="Biostruc-script" type="tns:Biostruc-scriptType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature_property_transformType">
-		<xs:sequence>
-			<xs:element name="Transform" type="tns:TransformType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature_property_userType">
-		<xs:sequence>
-			<xs:element name="User-object" type="tns:User-objectType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-feature_typeType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="value">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="helix"/>
-							<xs:enumeration value="strand"/>
-							<xs:enumeration value="sheet"/>
-							<xs:enumeration value="turn"/>
-							<xs:enumeration value="site"/>
-							<xs:enumeration value="footnote"/>
-							<xs:enumeration value="comment"/>
-							<xs:enumeration value="subgraph"/>
-							<xs:enumeration value="region"/>
-							<xs:enumeration value="core"/>
-							<xs:enumeration value="supercore"/>
-							<xs:enumeration value="color"/>
-							<xs:enumeration value="render"/>
-							<xs:enumeration value="label"/>
-							<xs:enumeration value="transform"/>
-							<xs:enumeration value="camera"/>
-							<xs:enumeration value="script"/>
-							<xs:enumeration value="alignment"/>
-							<xs:enumeration value="similarity"/>
-							<xs:enumeration value="multalign"/>
-							<xs:enumeration value="indirect"/>
-							<xs:enumeration value="cn3dstate"/>
-							<xs:enumeration value="other"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-graphType">
-		<xs:sequence>
-			<xs:element name="Biostruc-graph_descr" type="tns:Biostruc-graph_descrType" minOccurs="0"/>
-			<xs:element name="Biostruc-graph_molecule-graphs" type="tns:Biostruc-graph_molecule-graphsType"/>
-			<xs:element name="Biostruc-graph_inter-molecule-bonds" type="tns:Biostruc-graph_inter-molecule-bondsType" minOccurs="0"/>
-			<xs:element name="Biostruc-graph_residue-graphs" type="tns:Biostruc-graph_residue-graphsType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-graph-pntrType">
-		<xs:sequence>
-			<xs:element name="Biostruc-graph-pntr_biostruc-id" type="tns:Biostruc-graph-pntr_biostruc-idType"/>
-			<xs:element name="Biostruc-graph-pntr_residue-graph-id" type="tns:Biostruc-graph-pntr_residue-graph-idType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-graph-pntr_biostruc-idType">
-		<xs:sequence>
-			<xs:element name="Biostruc-id" type="tns:Biostruc-idType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-graph-pntr_residue-graph-idType">
-		<xs:sequence>
-			<xs:element ref="tns:Residue-graph-id"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-graph_descrType">
-		<xs:sequence>
-			<xs:element name="Biomol-descr" type="tns:Biomol-descrType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-graph_inter-molecule-bondsType">
-		<xs:sequence>
-			<xs:element name="Inter-residue-bond" type="tns:Inter-residue-bondType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-graph_molecule-graphsType">
-		<xs:sequence>
-			<xs:element name="Molecule-graph" type="tns:Molecule-graphType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-graph_residue-graphsType">
-		<xs:sequence>
-			<xs:element name="Residue-graph" type="tns:Residue-graphType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-historyType">
-		<xs:sequence>
-			<xs:element name="Biostruc-history_replaces" type="tns:Biostruc-history_replacesType" minOccurs="0"/>
-			<xs:element name="Biostruc-history_replaced-by" type="tns:Biostruc-history_replaced-byType" minOccurs="0"/>
-			<xs:element name="Biostruc-history_data-source" type="tns:Biostruc-history_data-sourceType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-history_data-sourceType">
-		<xs:sequence>
-			<xs:element name="Biostruc-source" type="tns:Biostruc-sourceType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-history_replaced-byType">
-		<xs:sequence>
-			<xs:element name="Biostruc-replace" type="tns:Biostruc-replaceType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-history_replacesType">
-		<xs:sequence>
-			<xs:element name="Biostruc-replace" type="tns:Biostruc-replaceType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-idType">
-		<xs:choice>
-			<xs:element name="Biostruc-id_mmdb-id" type="tns:Biostruc-id_mmdb-idType"/>
-			<xs:element name="Biostruc-id_other-database" type="tns:Biostruc-id_other-databaseType"/>
-			<xs:element name="Biostruc-id_local-id" type="tns:Biostruc-id_local-idType"/>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-id_local-idType">
-		<xs:sequence>
-			<xs:element name="Object-id" type="tns:Object-idType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-id_mmdb-idType">
-		<xs:sequence>
-			<xs:element ref="tns:Mmdb-id"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-id_other-databaseType">
-		<xs:sequence>
-			<xs:element name="Dbtag" type="tns:DbtagType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-modelType">
-		<xs:sequence>
-			<xs:element name="Biostruc-model_id" type="tns:Biostruc-model_idType"/>
-			<xs:element name="Biostruc-model_type" type="tns:Biostruc-model_typeType"/>
-			<xs:element name="Biostruc-model_descr" type="tns:Biostruc-model_descrType" minOccurs="0"/>
-			<xs:element name="Biostruc-model_model-space" type="tns:Biostruc-model_model-spaceType" minOccurs="0"/>
-			<xs:element name="Biostruc-model_model-coordinates" type="tns:Biostruc-model_model-coordinatesType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-model_descrType">
-		<xs:sequence>
-			<xs:element name="Model-descr" type="tns:Model-descrType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-model_idType">
-		<xs:sequence>
-			<xs:element ref="tns:Model-id"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-model_model-coordinatesType">
-		<xs:sequence>
-			<xs:element name="Model-coordinate-set" type="tns:Model-coordinate-setType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-model_model-spaceType">
-		<xs:sequence>
-			<xs:element name="Model-space" type="tns:Model-spaceType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-model_typeType">
-		<xs:sequence>
-			<xs:element name="Model-type" type="tns:Model-typeType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-replaceType">
-		<xs:sequence>
-			<xs:element name="Biostruc-replace_id" type="tns:Biostruc-replace_idType"/>
-			<xs:element name="Biostruc-replace_date" type="tns:Biostruc-replace_dateType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-replace_dateType">
-		<xs:sequence>
-			<xs:element name="Date" type="tns:DateType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-replace_idType">
-		<xs:sequence>
-			<xs:element name="Biostruc-id" type="tns:Biostruc-idType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Biostruc-residue-graph-set">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Biostruc-residue-graph-set_id" type="tns:Biostruc-residue-graph-set_idType" minOccurs="0"/>
-				<xs:element name="Biostruc-residue-graph-set_descr" type="tns:Biostruc-residue-graph-set_descrType" minOccurs="0"/>
-				<xs:element name="Biostruc-residue-graph-set_residue-graphs" type="tns:Biostruc-residue-graph-set_residue-graphsType"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="Biostruc-residue-graph-set-pntrType">
-		<xs:sequence>
-			<xs:element name="Biostruc-residue-graph-set-pntr_biostruc-residue-graph-set-id" type="tns:Biostruc-residue-graph-set-pntr_biostruc-residue-graph-set-idType"/>
-			<xs:element name="Biostruc-residue-graph-set-pntr_residue-graph-id" type="tns:Biostruc-residue-graph-set-pntr_residue-graph-idType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-residue-graph-set-pntr_biostruc-residue-graph-set-idType">
-		<xs:sequence>
-			<xs:element name="Biostruc-id" type="tns:Biostruc-idType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-residue-graph-set-pntr_residue-graph-idType">
-		<xs:sequence>
-			<xs:element ref="tns:Residue-graph-id"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-residue-graph-set_descrType">
-		<xs:sequence>
-			<xs:element name="Biomol-descr" type="tns:Biomol-descrType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-residue-graph-set_idType">
-		<xs:sequence>
-			<xs:element name="Biostruc-id" type="tns:Biostruc-idType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-residue-graph-set_residue-graphsType">
-		<xs:sequence>
-			<xs:element name="Residue-graph" type="tns:Residue-graphType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-scriptType">
-		<xs:sequence>
-			<xs:element name="Biostruc-script-step" type="tns:Biostruc-script-stepType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-script-stepType">
-		<xs:sequence>
-			<xs:element name="Biostruc-script-step_step-id" type="tns:Biostruc-script-step_step-idType"/>
-			<xs:element ref="tns:Biostruc-script-step_step-name" minOccurs="0"/>
-			<xs:element name="Biostruc-script-step_feature-do" type="tns:Biostruc-script-step_feature-doType" minOccurs="0"/>
-			<xs:element name="Biostruc-script-step_camera-move" type="tns:Biostruc-script-step_camera-moveType" minOccurs="0"/>
-			<xs:element ref="tns:Biostruc-script-step_pause" minOccurs="0"/>
-			<xs:element name="Biostruc-script-step_waitevent" type="tns:Biostruc-script-step_waiteventType"/>
-			<xs:element ref="tns:Biostruc-script-step_extra"/>
-			<xs:element name="Biostruc-script-step_jump" type="tns:Biostruc-script-step_jumpType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-script-step_camera-moveType">
-		<xs:sequence>
-			<xs:element name="Transform" type="tns:TransformType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Biostruc-script-step_extra" type="xs:string"/>
-	<xs:complexType name="Biostruc-script-step_feature-doType">
-		<xs:sequence>
-			<xs:element name="Other-feature" type="tns:Other-featureType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-script-step_jumpType">
-		<xs:sequence>
-			<xs:element ref="tns:Step-id"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Biostruc-script-step_pause" type="xs:string"/>
-	<xs:complexType name="Biostruc-script-step_step-idType">
-		<xs:sequence>
-			<xs:element ref="tns:Step-id"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Biostruc-script-step_step-name" type="xs:string"/>
-	<xs:complexType name="Biostruc-script-step_waiteventType">
-		<xs:attribute name="value" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="true"/>
-					<xs:enumeration value="false"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seqType">
-		<xs:sequence>
-			<xs:element name="Biostruc-seq_structure" type="tns:Biostruc-seq_structureType"/>
-			<xs:element name="Biostruc-seq_sequences" type="tns:Biostruc-seq_sequencesType"/>
-			<xs:element name="Biostruc-seq_style-dictionary" type="tns:Biostruc-seq_style-dictionaryType" minOccurs="0"/>
-			<xs:element name="Biostruc-seq_user-annotations" type="tns:Biostruc-seq_user-annotationsType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seq_sequencesType">
-		<xs:sequence>
-			<xs:element name="Seq-entry" type="tns:Seq-entryType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seq_structureType">
-		<xs:sequence>
-			<xs:element name="Biostruc" type="tns:BiostrucType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seq_style-dictionaryType">
-		<xs:sequence>
-			<xs:element name="Cn3d-style-dictionary" type="tns:Cn3d-style-dictionaryType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seq_user-annotationsType">
-		<xs:sequence>
-			<xs:element name="Cn3d-user-annotations" type="tns:Cn3d-user-annotationsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seqsType">
-		<xs:sequence>
-			<xs:element name="Biostruc-seqs_structure" type="tns:Biostruc-seqs_structureType"/>
-			<xs:element name="Biostruc-seqs_sequences" type="tns:Biostruc-seqs_sequencesType"/>
-			<xs:element name="Biostruc-seqs_seqalign" type="tns:Biostruc-seqs_seqalignType"/>
-			<xs:element name="Biostruc-seqs_style-dictionary" type="tns:Biostruc-seqs_style-dictionaryType" minOccurs="0"/>
-			<xs:element name="Biostruc-seqs_user-annotations" type="tns:Biostruc-seqs_user-annotationsType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seqs-aligns-cddType">
-		<xs:sequence>
-			<xs:element name="Biostruc-seqs-aligns-cdd_seq-align-data" type="tns:Biostruc-seqs-aligns-cdd_seq-align-dataType"/>
-			<xs:element name="Biostruc-seqs-aligns-cdd_structures" type="tns:Biostruc-seqs-aligns-cdd_structuresType" minOccurs="0"/>
-			<xs:element name="Biostruc-seqs-aligns-cdd_structure-type" type="tns:Biostruc-seqs-aligns-cdd_structure-typeType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seqs-aligns-cdd_seq-align-dataType">
-		<xs:choice>
-			<xs:element name="Biostruc-seqs-aligns-cdd_seq-align-data_bundle" type="tns:Biostruc-seqs-aligns-cdd_seq-align-data_bundleType"/>
-			<xs:element name="Biostruc-seqs-aligns-cdd_seq-align-data_cdd" type="tns:Biostruc-seqs-aligns-cdd_seq-align-data_cddType"/>
-		</xs:choice>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seqs-aligns-cdd_seq-align-data_bundleType">
-		<xs:sequence>
-			<xs:element name="Bundle-seqs-aligns" type="tns:Bundle-seqs-alignsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seqs-aligns-cdd_seq-align-data_cddType">
-		<xs:sequence>
-			<xs:element name="Cdd" type="tns:CddType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seqs-aligns-cdd_structure-typeType">
-		<xs:attribute name="value" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="ncbi-backbone"/>
-					<xs:enumeration value="ncbi-all-atom"/>
-					<xs:enumeration value="pdb-model"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seqs-aligns-cdd_structuresType">
-		<xs:sequence>
-			<xs:element name="Biostruc" type="tns:BiostrucType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seqs_seqalignType">
-		<xs:sequence>
-			<xs:element name="Seq-annot" type="tns:Seq-annotType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seqs_sequencesType">
-		<xs:sequence>
-			<xs:element name="Seq-entry" type="tns:Seq-entryType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seqs_structureType">
-		<xs:sequence>
-			<xs:element name="Biostruc" type="tns:BiostrucType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seqs_style-dictionaryType">
-		<xs:sequence>
-			<xs:element name="Cn3d-style-dictionary" type="tns:Cn3d-style-dictionaryType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-seqs_user-annotationsType">
-		<xs:sequence>
-			<xs:element name="Cn3d-user-annotations" type="tns:Cn3d-user-annotationsType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Biostruc-set">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Biostruc-set_id" type="tns:Biostruc-set_idType" minOccurs="0"/>
-				<xs:element name="Biostruc-set_descr" type="tns:Biostruc-set_descrType" minOccurs="0"/>
-				<xs:element name="Biostruc-set_biostrucs" type="tns:Biostruc-set_biostrucsType"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="Biostruc-set_biostrucsType">
-		<xs:sequence>
-			<xs:element name="Biostruc" type="tns:BiostrucType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-set_descrType">
-		<xs:sequence>
-			<xs:element name="Biostruc-descr" type="tns:Biostruc-descrType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-set_idType">
-		<xs:sequence>
-			<xs:element name="Biostruc-id" type="tns:Biostruc-idType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-sourceType">
-		<xs:sequence>
-			<xs:element ref="tns:Biostruc-source_name-of-database"/>
-			<xs:element name="Biostruc-source_version-of-database" type="tns:Biostruc-source_version-of-databaseType" minOccurs="0"/>
-			<xs:element name="Biostruc-source_database-entry-id" type="tns:Biostruc-source_database-entry-idType"/>
-			<xs:element name="Biostruc-source_database-entry-date" type="tns:Biostruc-source_database-entry-dateType"/>
-			<xs:element name="Biostruc-source_database-entry-history" type="tns:Biostruc-source_database-entry-historyType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-source_database-entry-dateType">
-		<xs:sequence>
-			<xs:element name="Date" type="tns:DateType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc-source_database-entry-historyType">
-		<xs:sequence>
-			<xs:element ref="tns:Biostruc-source_database-entry-history_E" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Biostruc-source_database-entry-history_E" type="xs:string"/>
-	<xs:complexType name="Biostruc-source_database-entry-idType">
-		<xs:sequence>
-			<xs:element name="Biostruc-id" type="tns:Biostruc-idType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Biostruc-source_name-of-database" type="xs:string"/>
-	<xs:complexType name="Biostruc-source_version-of-databaseType">
-		<xs:choice>
-			<xs:element name="Biostruc-source_version-of-database_release-date" type="tns:Biostruc-source_version-of-database_release-dateType"/>
-			<xs:element ref="tns:Biostruc-source_version-of-database_release-code"/>
-		</xs:choice>
-	</xs:complexType>
-	<xs:element name="Biostruc-source_version-of-database_release-code" type="xs:string"/>
-	<xs:complexType name="Biostruc-source_version-of-database_release-dateType">
-		<xs:sequence>
-			<xs:element name="Date" type="tns:DateType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc_chemical-graphType">
-		<xs:sequence>
-			<xs:element name="Biostruc-graph" type="tns:Biostruc-graphType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc_descrType">
-		<xs:sequence>
-			<xs:element name="Biostruc-descr" type="tns:Biostruc-descrType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc_featuresType">
-		<xs:sequence>
-			<xs:element name="Biostruc-feature-set" type="tns:Biostruc-feature-setType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc_idType">
-		<xs:sequence>
-			<xs:element name="Biostruc-id" type="tns:Biostruc-idType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Biostruc_modelType">
-		<xs:sequence>
-			<xs:element name="Biostruc-model" type="tns:Biostruc-modelType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Blast-def-lineType">
-		<xs:sequence>
-			<xs:element ref="tns:Blast-def-line_title" minOccurs="0"/>
-			<xs:element name="Blast-def-line_seqid" type="tns:Blast-def-line_seqidType"/>
-			<xs:element ref="tns:Blast-def-line_taxid" minOccurs="0"/>
-			<xs:element name="Blast-def-line_memberships" type="tns:Blast-def-line_membershipsType" minOccurs="0"/>
-			<xs:element name="Blast-def-line_links" type="tns:Blast-def-line_linksType" minOccurs="0"/>
-			<xs:element name="Blast-def-line_other-info" type="tns:Blast-def-line_other-infoType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Blast-def-line-set">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Blast-def-line" type="tns:Blast-def-lineType" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="Blast-def-line_linksType">
-		<xs:sequence>
-			<xs:element ref="tns:Blast-def-line_links_E" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Blast-def-line_links_E" type="xs:string"/>
-	<xs:complexType name="Blast-def-line_membershipsType">
-		<xs:sequence>
-			<xs:element ref="tns:Blast-def-line_memberships_E" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Blast-def-line_memberships_E" type="xs:string"/>
-	<xs:complexType name="Blast-def-line_other-infoType">
-		<xs:sequence>
-			<xs:element ref="tns:Blast-def-line_other-info_E" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Blast-def-line_other-info_E" type="xs:string"/>
-	<xs:complexType name="Blast-def-line_seqidType">
-		<xs:sequence>
-			<xs:element name="Seq-id" type="tns:Seq-idType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Blast-def-line_taxid" type="xs:string"/>
-	<xs:element name="Blast-def-line_title" type="xs:string"/>
-	<xs:complexType name="Blast4-cutoffType">
-		<xs:choice>
-			<xs:element ref="tns:Blast4-cutoff_e-value"/>
-			<xs:element ref="tns:Blast4-cutoff_raw-score"/>
-		</xs:choice>
-	</xs:complexType>
-	<xs:element name="Blast4-cutoff_e-value" type="xs:string"/>
-	<xs:element name="Blast4-cutoff_raw-score" type="xs:string"/>
-	<xs:complexType name="Blast4-databaseType">
-		<xs:sequence>
-			<xs:element ref="tns:Blast4-database_name"/>
-			<xs:element name="Blast4-database_type" type="tns:Blast4-database_typeType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Blast4-database-infoType">
-		<xs:sequence>
-			<xs:element name="Blast4-database-info_database" type="tns:Blast4-database-info_databaseType"/>
-			<xs:element ref="tns:Blast4-database-info_description"/>
-			<xs:element ref="tns:Blast4-database-info_last-updated"/>
-			<xs:element ref="tns:Blast4-database-info_total-length"/>
-			<xs:element ref="tns:Blast4-database-info_num-sequences"/>
-			<xs:element name="Blast4-database-info_seqtech" type="tns:Blast4-database-info_seqtechType"/>
-			<xs:element ref="tns:Blast4-database-info_taxid"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Blast4-database-info_databaseType">
-		<xs:sequence>
-			<xs:element name="Blast4-database" type="tns:Blast4-databaseType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Blast4-database-info_description" type="xs:string"/>
-	<xs:element name="Blast4-database-info_last-updated" type="xs:string"/>
-	<xs:element name="Blast4-database-info_num-sequences" type="xs:string"/>
-	<xs:complexType name="Blast4-database-info_seqtechType">
-		<xs:sequence>
-			<xs:element name="Blast4-seqtech" type="tns:Blast4-seqtechType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Blast4-database-info_taxid" type="xs:string"/>
-	<xs:element name="Blast4-database-info_total-length" type="xs:string"/>
-	<xs:element name="Blast4-database_name" type="xs:string"/>
-	<xs:complexType name="Blast4-database_typeType">
-		<xs:sequence>
-			<xs:element name="Blast4-residue-type" type="tns:Blast4-residue-typeType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Blast4-errorType">
-		<xs:sequence>
-			<xs:element ref="tns:Blast4-error_code"/>
-			<xs:element ref="tns:Blast4-error_message" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Blast4-error-code">
-		<xs:complexType>
-			<xs:simpleContent>
-				<xs:extension base="xs:string">
-					<xs:attribute name="value">
-						<xs:simpleType>
-							<xs:restriction base="xs:NMTOKEN">
-								<xs:enumeration value="conversion-warning"/>
-								<xs:enumeration value="internal-error"/>
-								<xs:enumeration value="not-implemented"/>
-								<xs:enumeration value="not-allowed"/>
-								<xs:enumeration value="bad-request"/>
-								<xs:enumeration value="bad-request-id"/>
-								<xs:enumeration value="search-pending"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:attribute>
-				</xs:extension>
-			</xs:simpleContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="Blast4-error-flags">
-		<xs:complexType>
-			<xs:attribute name="value" use="required">
-				<xs:simpleType>
-					<xs:restriction base="xs:NMTOKEN">
-						<xs:enumeration value="warning"/>
-						<xs:enumeration value="error"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:attribute>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="Blast4-error_code" type="xs:string"/>
-	<xs:element name="Blast4-error_message" type="xs:string"/>
-	<xs:complexType name="Blast4-finish-params-replyType">
-		<xs:sequence>
-			<xs:element name="Blast4-parameters" type="tns:Blast4-parametersType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Blast4-finish-params-requestType">
-		<xs:sequence>
-			<xs:element ref="tns:Blast4-finish-params-request_program"/>
-			<xs:element ref="tns:Blast4-finish-params-request_service"/>
-			<xs:element ref="tns:Blast4-finish-params-request_paramset" minOccurs="0"/>
-			<xs:element name="Blast4-finish-params-request_params" type="tns:Blast4-finish-params-request_paramsType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Blast4-finish-params-request_paramsType">
-		<xs:sequence>
-			<xs:element name="Blast4-parameters" type="tns:Blast4-parametersType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Blast4-finish-params-request_paramset" type="xs:string"/>
-	<xs:element name="Blast4-finish-params-request_program" type="xs:string"/>
-	<xs:element name="Blast4-finish-params-request_service" type="xs:string"/>
-	<xs:complexType name="Blast4-frame-typeType">
-		<xs:attribute name="value" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="notset"/>
-					<xs:enumeration value="plus1"/>
-					<xs:enumeration value="plus2"/>
-					<xs:enumeration value="plus3"/>
-					<xs:enumeration value="minus1"/>
-					<xs:enumeration value="minus2"/>
-					<xs:enumeration value="minus3"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="Blast4-get-databases-replyType">
-		<xs:sequence>
-			<xs:element name="Blast4-database-info" type="tns:Blast4-database-infoType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Blast4-get-matrices-replyType">
-		<xs:sequence>
-			<xs:element name="Blast4-matrix-id" type="tns:Blast4-matrix-idType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Blast4-get-parameters-replyType">
-		<xs:sequence>
-			<xs:element name="Blast4-parameter-info" type="tns:Blast4-parameter-infoType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Blast4-get-paramsets-replyType">
-		<xs:sequence>
-			<xs:element name="Blast4-paramset-info" type="tns:Blast4-paramset-infoType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Blast4-get-programs-replyType">
-		<xs:sequence>
-			<xs:element name="Blast4-program-info" type="tns:Blast4-program-infoType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Blast4-get-queries-replyType">
-		<xs:sequence>
-			<xs:element name="Blast4-get-queries-reply_queries" type="tns:Blast4-get-queries-reply_queriesType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Blast4-get-queries-reply_queriesType">
-		<xs:sequence>
-			<xs:element name="Blast4-queries" type="tns:Blast4-queriesType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="Blast4-get-request-info-replyType">
-		<xs:sequence>
-			<xs:element name="Blast4-get-request-info-reply_database" type="tns:Blast4-get-request-info-reply_databaseType"/>
-			<xs:element ref="tns:Blast4-get-request-info-reply_program"/>
-			<xs:element ref="tns:Blast4-get-request-info-reply_service"/>
-			<xs:element ref="tns:Blast4-get-request-info-reply_created-by"/>
-			<xs:element name="Blast4-get-reque

<TRUNCATED>


[14/28] incubator-taverna-common-activities git commit: Use external test cases

Posted by st...@apache.org.
Use external test cases


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/2ab4bc40
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/2ab4bc40
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/2ab4bc40

Branch: refs/heads/cwl-browse
Commit: 2ab4bc40aac569a1f4ce2b5a4697e7884738cc27
Parents: b29c031
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Apr 28 16:09:16 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Apr 28 16:09:16 2016 +0100

----------------------------------------------------------------------
 taverna-wsdl-generic/pom.xml                    | 90 +++++++++++---------
 .../taverna/wsdl/parser/WSDLParserTest.java     |  8 +-
 .../taverna/wsdl/parser/WSRFParserTest.java     |  7 +-
 .../wsdl/soap/LiteralBodyBuilderTest.java       | 10 +--
 .../wsdl/testutils/LocationConstants.java       |  2 +-
 .../taverna/wsdl/testutils/WSDLTestHelper.java  | 88 +++++++++++++++----
 .../wsdl/xmlsplitter/XMLOutputSplitterTest.java |  4 +-
 7 files changed, 130 insertions(+), 79 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/2ab4bc40/taverna-wsdl-generic/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/pom.xml b/taverna-wsdl-generic/pom.xml
index beff3ce..feb31dd 100644
--- a/taverna-wsdl-generic/pom.xml
+++ b/taverna-wsdl-generic/pom.xml
@@ -73,46 +73,52 @@
 
 	<dependencies>
 
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${log4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jdom</groupId>
-			<artifactId>com.springsource.org.jdom</artifactId>
-			<version>${jdom.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>com.springsource.javax.activation</artifactId>
-			<version>${activation.version}</version>
-		</dependency>
-                <dependency>
-                        <groupId>org.apache.servicemix.bundles</groupId>
-                        <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
-                        <version>${servicemix.javax.wsdl.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.woden</groupId>
-                    <artifactId>woden-core</artifactId>
-                    <version>${woden.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.ws.xmlschema</groupId>
-                    <artifactId>xmlschema-core</artifactId>
-                    <version>${xmlschema.version}</version>
-                </dependency>
-                <dependency>
-                        <groupId>org.apache.ws.security</groupId>
-                        <artifactId>wss4j</artifactId>
-                        <version>${wss4j.version}</version>
-                </dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+	<dependency>
+		<groupId>log4j</groupId>
+		<artifactId>log4j</artifactId>
+		<version>${log4j.version}</version>
+	</dependency>
+	<dependency>
+		<groupId>org.jdom</groupId>
+		<artifactId>com.springsource.org.jdom</artifactId>
+		<version>${jdom.version}</version>
+	</dependency>
+	<dependency>
+		<groupId>javax.activation</groupId>
+		<artifactId>com.springsource.javax.activation</artifactId>
+		<version>${activation.version}</version>
+	</dependency>
+	<dependency>
+		<groupId>org.apache.servicemix.bundles</groupId>
+		<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
+		<version>${servicemix.javax.wsdl.version}</version>
+	</dependency>
+	<dependency>
+		<groupId>org.apache.woden</groupId>
+		<artifactId>woden-core</artifactId>
+		<version>${woden.version}</version>
+	</dependency>
+	<dependency>
+		<groupId>org.apache.ws.xmlschema</groupId>
+		<artifactId>xmlschema-core</artifactId>
+		<version>${xmlschema.version}</version>
+	</dependency>
+	<dependency>
+		<groupId>org.apache.ws.security</groupId>
+		<artifactId>wss4j</artifactId>
+		<version>${wss4j.version}</version>
+	</dependency>
+	<dependency>
+		<groupId>commons-io</groupId>
+		<artifactId>commons-io</artifactId>
+		<version>2.5</version>
+		<scope>test</scope>
+	</dependency>
+	<dependency>
+		<groupId>junit</groupId>
+		<artifactId>junit</artifactId>
+		<version>${junit.version}</version>
+		<scope>test</scope>
+	</dependency>
+</dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/2ab4bc40/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/parser/WSDLParserTest.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/parser/WSDLParserTest.java b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/parser/WSDLParserTest.java
index c2f91ee..2feb8b7 100644
--- a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/parser/WSDLParserTest.java
+++ b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/parser/WSDLParserTest.java
@@ -32,7 +32,7 @@ import org.apache.taverna.wsdl.testutils.WSDLTestHelper;
 
 import org.junit.Test;
 
-public class WSDLParserTest {
+public class WSDLParserTest extends WSDLTestHelper {
 	
 	@Test
 	public void testGetOperations() throws Exception {
@@ -46,9 +46,6 @@ public class WSDLParserTest {
 		assertEquals("wrong style", "document", parser.getStyle());
 	}
 
-	private String wsdlResourcePath(String wsdlName) throws Exception {
-		return WSDLTestHelper.wsdlResourcePath(wsdlName);
-	}
 
 	@Test
 	public void testGetActionURI() throws Exception {
@@ -279,8 +276,7 @@ public class WSDLParserTest {
 
 	@Test
 	public void testGetOperationElementQName2() throws Exception {
-		URL tav744Url = getClass().getResource(
-				"/org/apache/taverna/wsdl/parser/TAV-744/InstrumentService__.wsdl");
+		URL tav744Url = getResource("TAV-744/InstrumentService__.wsdl");
 		WSDLParser parser = new WSDLParser(tav744Url.toExternalForm());
 		QName operationQName = parser.getOperationQname("getList");
 		assertEquals("operation element name is wrong", "GetListRequest",

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/2ab4bc40/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/parser/WSRFParserTest.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/parser/WSRFParserTest.java b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/parser/WSRFParserTest.java
index 382ae11..0dd51d2 100644
--- a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/parser/WSRFParserTest.java
+++ b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/parser/WSRFParserTest.java
@@ -24,17 +24,16 @@ import static org.junit.Assert.assertTrue;
 
 import java.net.URL;
 
+import org.apache.taverna.wsdl.testutils.WSDLTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
 /**
  * Check that WSDLParser can detect WSRF.
  * Tests {@link WSDLParser#checkWSRF()}
- * 
- * @author Stian Soiland-Reyes
  *
  */
-public class WSRFParserTest {
+public class WSRFParserTest extends WSDLTestHelper {
 	
 	private URL counterServiceWSDL;
 	private WSDLParser wsdlParser;
@@ -42,7 +41,7 @@ public class WSRFParserTest {
 	@Before
 	public void findWSDL() {
 		String path = "wsrf/counterService/CounterService_.wsdl";
-		counterServiceWSDL = getClass().getResource(path);	
+		counterServiceWSDL = getResource(path);	
 		assertNotNull("Coult not find test WSDL " + path, counterServiceWSDL);
 	}
 	

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/2ab4bc40/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/soap/LiteralBodyBuilderTest.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/soap/LiteralBodyBuilderTest.java b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/soap/LiteralBodyBuilderTest.java
index b3d16ae..6b1a3ac 100644
--- a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/soap/LiteralBodyBuilderTest.java
+++ b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/soap/LiteralBodyBuilderTest.java
@@ -37,12 +37,8 @@ import org.apache.taverna.wsdl.testutils.WSDLTestHelper;
 import org.junit.Test;
 import org.w3c.dom.Node;
 
-public class LiteralBodyBuilderTest implements LocationConstants{
+public class LiteralBodyBuilderTest extends WSDLTestHelper {
 	
-	private String wsdlResourcePath(String wsdlName) throws Exception {
-		return WSDLTestHelper.wsdlResourcePath(wsdlName);
-	}
-
 	@Test
 	public void testUnqualifiedNamespaces() throws Exception {
 		BodyBuilder builder = createBuilder(wsdlResourcePath("whatizit.wsdl"), "queryPmid");
@@ -142,8 +138,8 @@ public class LiteralBodyBuilderTest implements LocationConstants{
 	
 	@Test 
 	public void testOperationElementNameTAV744() throws Exception {
-		URL tav744Url = getClass().getResource(
-				"/org/apache/taverna/wsdl/parser/TAV-744/InstrumentService__.wsdl");
+		URL tav744Url = getResource(
+				"TAV-744/InstrumentService__.wsdl");
 		
 		BodyBuilder builder = createBuilder(tav744Url.toExternalForm(), "getList");
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/2ab4bc40/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/LocationConstants.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/LocationConstants.java b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/LocationConstants.java
index 4d3f191..852d66e 100644
--- a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/LocationConstants.java
+++ b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/LocationConstants.java
@@ -27,5 +27,5 @@ package org.apache.taverna.wsdl.testutils;
  */
 public interface LocationConstants {
 	
-	public static final String WSDL_RESOURCE_BASE="/testwsdls/";
+	public static final String WSDL_RESOURCE_BASE="testwsdls/";
 }

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/2ab4bc40/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java
index 58c039e..40fd823 100644
--- a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java
+++ b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java
@@ -19,30 +19,84 @@
 
 package org.apache.taverna.wsdl.testutils;
 
-import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import org.apache.taverna.wsdl.parser.WSDLParserTest;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.BeforeClass;
 
 public class WSDLTestHelper implements LocationConstants {
-	
-	public static String wsdlResourcePath(String resourceName) throws Exception {
-		return WSDLParserTest.class.getResource(WSDL_RESOURCE_BASE+resourceName).toExternalForm();
-	}
 
-    public String getResourceContentsString(String resourceName) throws Exception {
-		InputStream stream = WSDLTestHelper.class.getResourceAsStream("/"+resourceName);
-		BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
-		String content="";
-		String line="";
-		while( (line = reader.readLine()) != null) {
-			content+=line;
-		}
 
-		reader.close();
+	
+	// See https://github.com/taverna-extras/wsdl-generic-test-cases
+	//public static String TEST_CASES_URL = "https://github.com/taverna-extras/wsdl-generic-test-cases/archive/2016-04-28.zip";
+	public static String TEST_CASES_URL = "https://github.com/taverna-extras/wsdl-generic-test-cases/releases/download/2016-04-28/wsdl-generic-test-cases-2016-04-28.jar";
+	//public static String TEST_CASES_URL = "file:///tmp/1/wsdl-generic-test-cases-2016-04-28.jar";
 
-		return content;
+	// Folder within JAR - e.g. wsdl-generic-test-cases-2016-04-28/
+	public static String PREFIX = "";
+	
+	private static final String README_MD = "README.md";
+	
+	private static URLClassLoader classLoader;
+	
+	@BeforeClass
+	public static void makeClassLoader() throws MalformedURLException {
+		if (classLoader == null) {
+			URL[] urls = new URL[] { new URL(TEST_CASES_URL) } ;
+			classLoader = URLClassLoader.newInstance(urls);
+		}
+		
+		Assume.assumeNotNull(getResource(README_MD));
+	}
 
+	@Before
+	public void setThreadClassLoader() {
+		Thread.currentThread().setContextClassLoader(classLoader);
+	}
+	
+//	@Test
+//	public void getReadmeUrl() throws Exception {
+//		URL u = getResource(README_MD);
+//		assertNotNull(u);
+//		System.out.println(u);
+//		
+//	}
+//
+//	@Test
+//	public void getReadme() throws Exception {
+//		InputStream s = getResourceAsStream(README_MD);
+//		assertNotNull(s);
+//		IOUtils.copy(s, System.out);
+//	}
+//	
+//	@Test
+//	public void getReadmeString() throws Exception {
+//		String s = getResourceAsString(README_MD);
+//		assertTrue(s.length() > 0);
+//		System.out.println(s);
+//	}
+	
+	
+	public static URL getResource(String path) { 
+		return classLoader.getResource(PREFIX + path);
+	}
+	public static InputStream getResourceAsStream(String path) { 
+		return classLoader.getResourceAsStream(PREFIX + path);
+	}
+	public static String getResourceAsString(String path) throws IOException {
+		return IOUtils.toString(getResource(path), StandardCharsets.UTF_8);
+	}
+	
+	public static String wsdlResourcePath(String resourceName) throws Exception {
+		return getResource(WSDL_RESOURCE_BASE+resourceName).toExternalForm();
 	}
 
     

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/2ab4bc40/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/xmlsplitter/XMLOutputSplitterTest.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/xmlsplitter/XMLOutputSplitterTest.java b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/xmlsplitter/XMLOutputSplitterTest.java
index 9c3c483..24144eb 100644
--- a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/xmlsplitter/XMLOutputSplitterTest.java
+++ b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/xmlsplitter/XMLOutputSplitterTest.java
@@ -40,7 +40,7 @@ public class XMLOutputSplitterTest extends WSDLTestHelper {
         WSDLParser parser = new WSDLParser(WSDLTestHelper.wsdlResourcePath("menagerie-complex-rpc.wsdl"));
 		TypeDescriptor descriptor = parser.getOperationOutputParameters("getComplexWithInternalList").get(0);
         XMLOutputSplitter splitter = new XMLOutputSplitter(descriptor, new String [] {"length","innerArray","innerList"}, new String [] {"text/plain","l('text/plain')","l('text/plain')"}, new String[] {"input"});
-        String inputXML=getResourceContentsString("getComplexWithInternalListResponse.xml");
+        String inputXML=getResourceAsString("getComplexWithInternalListResponse.xml");
         Map<String,String> inputMap = new HashMap<String,String>();
         inputMap.put("input", inputXML);
         Map<String,Object> outputMap = splitter.execute(inputMap);
@@ -70,7 +70,7 @@ public class XMLOutputSplitterTest extends WSDLTestHelper {
         WSDLParser parser = new WSDLParser(WSDLTestHelper.wsdlResourcePath("jws-online.wsdl"));
 		TypeDescriptor descriptor = parser.getOperationOutputParameters("getSteadyStateTable").get(0);
         XMLOutputSplitter splitter = new XMLOutputSplitter(descriptor, new String [] {"model","fluxNames","fluxVals"}, new String [] {"text/plain","l('text/plain')","l('text/plain')"}, new String[] {"input"});
-        String inputXML=getResourceContentsString("jws-splitter-input.xml");
+        String inputXML=getResourceAsString("jws-splitter-input.xml");
 
         Map<String,String> inputMap = new HashMap<String,String>();
         inputMap.put("input", inputXML);


[25/28] incubator-taverna-common-activities git commit: rat-ignore (public domain)

Posted by st...@apache.org.
rat-ignore (public domain)


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/335831a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/335831a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/335831a1

Branch: refs/heads/cwl-browse
Commit: 335831a1285a68f33149ff86a826cf7c58f97fc0
Parents: aff32db
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Apr 28 16:57:49 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Apr 28 19:35:11 2016 +0100

----------------------------------------------------------------------
 pom.xml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/335831a1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ea4a527..a42d071 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,7 @@
 					<excludes combine.children="append">
 						<exclude>**/src/main/resources/META-INF/soap-encoding.xsd</exclude> <!-- W3C Software License (See NOTICE) -->
 						<exclude>**/src/test/resources/test-spreadsheet*</exclude> <!--  Our own test spreadsheets -->
+						<exclude>**/src/main/resources/json2.js</exclude><!-- public domain -->
 					</excludes>
 				</configuration>
 			</plugin>


[28/28] incubator-taverna-common-activities git commit: Merge branch 'master' into cwl-browse

Posted by st...@apache.org.
Merge branch 'master' into cwl-browse


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/54585664
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/54585664
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/54585664

Branch: refs/heads/cwl-browse
Commit: 545856641f2bf1d67ebf97fbf102ade4e7fc9cb7
Parents: 42c8d24 c49ce85
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon May 2 17:33:23 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon May 2 17:33:23 2016 +0100

----------------------------------------------------------------------
 .travis.yml                                     |    15 +
 NOTICE                                          |    31 +
 README.md                                       |    30 +-
 pom.xml                                         |    15 +
 .../src/main/resources/schema.json              |     3 +
 .../activities/externaltool/package.html        |    17 +
 .../src/main/resources/Authorize.vm             |    17 +
 .../src/main/resources/MasterPassword.vm        |    17 +
 .../src/main/resources/TrustedCertificate.vm    |    17 +
 .../src/main/resources/TruststorePassword.vm    |    17 +
 .../src/main/resources/UsernamePassword.vm      |    17 +
 .../resources/abdera/adapter/feed.properties    |    14 +
 .../src/main/resources/ask.vm                   |    17 +
 .../src/main/resources/choose.vm                |    17 +
 .../src/main/resources/index                    |    14 +
 .../src/main/resources/interaction.css          |    16 +
 .../src/main/resources/interaction.vm           |    17 +
 .../src/main/resources/notify.vm                |    17 +
 .../src/main/resources/schema.json              |     5 +-
 .../src/main/resources/select.vm                |    17 +
 .../src/main/resources/tell.vm                  |    17 +
 .../src/main/resources/warn.vm                  |    17 +
 .../src/main/resources/schema.json              |     3 +
 .../rest/ApacheHttpClientUsageTest.java.bak     |   215 -
 .../rest/ExampleActivityTest.java.bak           |   153 -
 .../taverna/activities/spreadsheet/package.html |    17 +
 .../src/main/resources/schema.json              |     3 +
 taverna-wsdl-activity/pom.xml                   |     8 +
 .../apache/taverna/activities/wsdl/package.html |    17 +
 .../src/main/resources/schema.json              |     3 +
 .../src/main/resources/xml-splitter.schema.json |     2 +
 .../activities/wsdl/WSRFActivityTest.java       |    16 +-
 ...XMLSplitterConfigurationBeanBuilderTest.java |    18 +
 .../src/test/resources/log4j.properties         |    15 +
 .../wsrf/counterService/CounterService_.wsdl    |     9 -
 .../wsdl/wsrf/counterService/WS-Addressing.xsd  |   121 -
 .../wsdl/wsrf/counterService/WS-BaseFaults.xsd  |    47 -
 .../wsdl/wsrf/counterService/WS-BaseN.wsdl      |   298 -
 .../wsdl/wsrf/counterService/WS-BaseN.xsd       |    50 -
 .../counterService/WS-ResourceLifetime.wsdl     |   117 -
 .../wsrf/counterService/WS-ResourceLifetime.xsd |    26 -
 .../counterService/WS-ResourceProperties.wsdl   |   240 -
 .../counterService/WS-ResourceProperties.xsd    |    42 -
 .../wsrf/counterService/counter_bindings.wsdl   |   157 -
 .../wsrf/counterService/counter_flattened.wsdl  |   111 -
 .../activities/wsdl/wsrf/counterService/xml.xsd |   105 -
 taverna-wsdl-generic/pom.xml                    |    90 +-
 .../org/apache/taverna/wsdl/parser/package.html |    17 +
 .../org/apache/taverna/wsdl/soap/package.html   |    17 +
 .../src/main/resources/META-INF/NOTICE          |    42 +
 .../taverna/wsdl/parser/WSDLParserTest.java     |     8 +-
 .../taverna/wsdl/parser/WSRFParserTest.java     |     7 +-
 .../wsdl/soap/LiteralBodyBuilderTest.java       |    10 +-
 .../wsdl/testutils/LocationConstants.java       |     2 +-
 .../taverna/wsdl/testutils/WSDLTestHelper.java  |    89 +-
 .../wsdl/xmlsplitter/XMLInputSplitterTest.java  |     8 +-
 .../wsdl/xmlsplitter/XMLOutputSplitterTest.java |     4 +-
 .../getComplexWithInternalListResponse.xml      |    20 -
 .../src/test/resources/jws-splitter-input.xml   |    95 -
 .../src/test/resources/log4j.properties         |    15 +
 .../TAV-744/InstrumentServiceContextTypes.xsd   |    12 -
 .../parser/TAV-744/InstrumentServiceTypes.xsd   |    12 -
 .../wsdl/parser/TAV-744/InstrumentService_.wsdl |   129 -
 .../parser/TAV-744/InstrumentService__.wsdl     |     9 -
 .../TAV-744/InstrumentService_bindings.wsdl     |    97 -
 .../wsdl/parser/TAV-744/ServiceSecurity.wsdl    |    72 -
 .../wsdl/parser/TAV-744/WS-Addressing.xsd       |   121 -
 .../wsdl/parser/TAV-744/WS-BaseFaults.wsdl      |    22 -
 .../wsdl/parser/TAV-744/WS-BaseFaults.xsd       |    47 -
 .../taverna/wsdl/parser/TAV-744/WS-BaseN.wsdl   |   298 -
 .../taverna/wsdl/parser/TAV-744/WS-BaseN.xsd    |    50 -
 .../parser/TAV-744/WS-ResourceLifetime.wsdl     |   117 -
 .../wsdl/parser/TAV-744/WS-ResourceLifetime.xsd |    26 -
 .../parser/TAV-744/WS-ResourceProperties.wsdl   |   240 -
 .../parser/TAV-744/WS-ResourceProperties.xsd    |    42 -
 .../taverna/wsdl/parser/TAV-744/security.xsd    |    78 -
 .../apache/taverna/wsdl/parser/TAV-744/xml.xsd  |   105 -
 .../wsrf/counterService/CounterService_.wsdl    |     9 -
 .../wsrf/counterService/WS-Addressing.xsd       |   121 -
 .../wsrf/counterService/WS-BaseFaults.xsd       |    47 -
 .../parser/wsrf/counterService/WS-BaseN.wsdl    |   298 -
 .../parser/wsrf/counterService/WS-BaseN.xsd     |    50 -
 .../counterService/WS-ResourceLifetime.wsdl     |   117 -
 .../wsrf/counterService/WS-ResourceLifetime.xsd |    26 -
 .../counterService/WS-ResourceProperties.wsdl   |   240 -
 .../counterService/WS-ResourceProperties.xsd    |    42 -
 .../wsrf/counterService/counter_bindings.wsdl   |   157 -
 .../wsrf/counterService/counter_flattened.wsdl  |   111 -
 .../wsdl/parser/wsrf/counterService/xml.xsd     |   105 -
 .../testwsdls/CurrencyExchangeService.wsdl      |    37 -
 .../src/test/resources/testwsdls/GoViz.wsdl     |   202 -
 .../testwsdls/MyService-rpc-literal.wsdl        |   392 -
 .../src/test/resources/testwsdls/SBWReader.wsdl |   602 -
 .../testwsdls/TestServices-rpcencoded.wsdl      |   396 -
 .../testwsdls/TestServices-unwrapped.wsdl       |   434 -
 .../src/test/resources/testwsdls/VSOi.wsdl      |   305 -
 .../src/test/resources/testwsdls/bind.wsdl      |   354 -
 .../test/resources/testwsdls/eutils/efetch.xsd  |   118 -
 .../resources/testwsdls/eutils/efetch_bio.xsd   | 18079 -----------------
 .../resources/testwsdls/eutils/efetch_nlmc.xsd  |  1021 -
 .../resources/testwsdls/eutils/efetch_pmc.xsd   |  5910 ------
 .../testwsdls/eutils/efetch_pubmed.xsd          |   359 -
 .../resources/testwsdls/eutils/efetch_taxon.xsd |   150 -
 .../test/resources/testwsdls/eutils/egquery.xsd |    60 -
 .../test/resources/testwsdls/eutils/einfo.xsd   |    95 -
 .../test/resources/testwsdls/eutils/elink.xsd   |   188 -
 .../test/resources/testwsdls/eutils/esearch.xsd |   165 -
 .../test/resources/testwsdls/eutils/espell.xsd  |    60 -
 .../resources/testwsdls/eutils/esummary.xsd     |    85 -
 .../test/resources/testwsdls/eutils/eutils.wsdl |   333 -
 .../resources/testwsdls/eutils/eutils_lite.wsdl |   289 -
 .../test/resources/testwsdls/jws-online.wsdl    |  1001 -
 .../test/resources/testwsdls/jws_online.wsdl    |  1001 -
 .../src/test/resources/testwsdls/ma.wsdl        |  1901 --
 .../testwsdls/menagerie-complex-rpc.wsdl        |   208 -
 .../src/test/resources/testwsdls/prodoric.wsdl  |   360 -
 .../src/test/resources/testwsdls/whatizit.wsdl  |   233 -
 .../src/main/resources/schema.json              |     3 +
 118 files changed, 678 insertions(+), 39044 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/54585664/pom.xml
----------------------------------------------------------------------


[06/28] incubator-taverna-common-activities git commit: Moved third-party test WSDLs to https://github.com/taverna-extras/wsdl-generic-test-cases

Posted by st...@apache.org.
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>


[17/28] incubator-taverna-common-activities git commit: W3C Software License on soap-encoding.xsd

Posted by st...@apache.org.
W3C Software License on soap-encoding.xsd


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/9b40ef31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/9b40ef31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/9b40ef31

Branch: refs/heads/cwl-browse
Commit: 9b40ef319f58469ffa8699c2c262c78936cbc61c
Parents: ed5b18d
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Apr 28 16:39:35 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Apr 28 16:39:35 2016 +0100

----------------------------------------------------------------------
 NOTICE                                          | 31 +++++++++++++++
 pom.xml                                         | 13 ++++++
 .../src/main/resources/META-INF/NOTICE          | 42 ++++++++++++++++++++
 3 files changed, 86 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/9b40ef31/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index cc00d25..ae0de68 100644
--- a/NOTICE
+++ b/NOTICE
@@ -9,3 +9,34 @@ Portions of this software were originally based on the following:
 These have been licensed to the Apache Software Foundation under a software grant.
 
 ---------------------------------------------------------
+taverna-wsdl-generic/src/main/resources/META-INF/soap-encoding.xsd
+Schema for the SOAP/1.1 encoding
+
+Portions � 2001 DevelopMentor. 
+� 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.  
+ 
+This document is governed by the W3C Software License [1] as described in the FAQ [2].
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD 
+By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
+
+Permission to use, copy, modify, and distribute this software and its documentation, with or without modification,  for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
+
+1.  The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. 
+
+2.  Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright � 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/" 
+
+3.  Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)   
+
+Original W3C files; http://www.w3.org/2001/06/soap-encoding
+Changes made: 
+     - reverted namespace to http://schemas.xmlsoap.org/soap/encoding/
+     - reverted root to only allow 0 and 1 as lexical values
+	 - removed default value from root attribute declaration
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+---------------------------------------------------------
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/9b40ef31/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 41b70e8..b498875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,19 @@
 		<module>taverna-wsdl-generic</module>
 		<module>taverna-xpath-activity</module>
 	</modules>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.rat</groupId>
+				<artifactId>apache-rat-plugin</artifactId>
+				<configuration>
+					<excludes combine.children="append">
+						<exclude>**/src/main/resources/META-INF/soap-encoding.xsd</exclude> <!-- W3C Software License (See NOTICE) -->
+					</excludes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>	
 	<scm>
 		<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities.git</connection>
 		<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities.git</developerConnection>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/9b40ef31/taverna-wsdl-generic/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/main/resources/META-INF/NOTICE b/taverna-wsdl-generic/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..e05a123
--- /dev/null
+++ b/taverna-wsdl-generic/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,42 @@
+Apache Taverna WSDL Generic
+Copyright 2014-2016 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were originally based on the following:
+- Copyright 2007-2014 University of Manchester, UK
+These have been licensed to the Apache Software Foundation under a software grant.
+
+---------------------------------------------------------
+taverna-wsdl-generic/src/main/resources/META-INF/soap-encoding.xsd
+Schema for the SOAP/1.1 encoding
+
+Portions � 2001 DevelopMentor. 
+� 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.  
+ 
+This document is governed by the W3C Software License [1] as described in the FAQ [2].
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD 
+By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
+
+Permission to use, copy, modify, and distribute this software and its documentation, with or without modification,  for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
+
+1.  The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. 
+
+2.  Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright � 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/" 
+
+3.  Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)   
+
+Original W3C files; http://www.w3.org/2001/06/soap-encoding
+Changes made: 
+     - reverted namespace to http://schemas.xmlsoap.org/soap/encoding/
+     - reverted root to only allow 0 and 1 as lexical values
+	 - removed default value from root attribute declaration
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+---------------------------------------------------------
\ No newline at end of file


[18/28] incubator-taverna-common-activities git commit: Use externally loaded WSDL (if available)

Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0fec6f04/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/counter_bindings.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/counter_bindings.wsdl b/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/counter_bindings.wsdl
deleted file mode 100644
index 8acf07f..0000000
--- a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/counter_bindings.wsdl
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="Counter" targetNamespace="http://counter.com/bindings" xmlns:porttype="http://counter.com" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:import namespace="http://counter.com" location="counter_flattened.wsdl"/>
-  <wsdl:binding name="CounterPortTypeSOAPBinding" type="porttype:CounterPortType">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="createCounter">
-      <soap:operation soapAction="http://counter.com/CounterPortType/createCounterRequest"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="add">
-      <soap:operation soapAction="http://counter.com/CounterPortType/addRequest"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="SetTerminationTime">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTime"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="UnableToSetTerminationTimeFault">
-        <soap:fault name="UnableToSetTerminationTimeFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="TerminationTimeChangeRejectedFault">
-        <soap:fault name="TerminationTimeChangeRejectedFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="Destroy">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/Destroy"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="ResourceNotDestroyedFault">
-        <soap:fault name="ResourceNotDestroyedFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="QueryResourceProperties">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourceProperties"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault">
-        <soap:fault name="InvalidResourcePropertyQNameFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="InvalidQueryExpressionFault">
-        <soap:fault name="InvalidQueryExpressionFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="QueryEvaluationErrorFault">
-        <soap:fault name="QueryEvaluationErrorFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="UnknownQueryExpressionDialectFault">
-        <soap:fault name="UnknownQueryExpressionDialectFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="GetMultipleResourceProperties">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourceProperties"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault">
-        <soap:fault name="InvalidResourcePropertyQNameFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="GetResourceProperty">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault">
-        <soap:fault name="InvalidResourcePropertyQNameFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="Subscribe">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/Subscribe"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="TopicNotSupportedFault">
-        <soap:fault name="TopicNotSupportedFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="InvalidTopicExpressionFault">
-        <soap:fault name="InvalidTopicExpressionFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="SubscribeCreationFailedFault">
-        <soap:fault name="SubscribeCreationFailedFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="TopicPathDialectUnknownFault">
-        <soap:fault name="TopicPathDialectUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="GetCurrentMessage">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/GetCurrentMessage"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="TopicNotSupportedFault">
-        <soap:fault name="TopicNotSupportedFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="InvalidTopicExpressionFault">
-        <soap:fault name="InvalidTopicExpressionFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="NoCurrentMessageOnTopicFault">
-        <soap:fault name="NoCurrentMessageOnTopicFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:binding>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0fec6f04/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/counter_flattened.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/counter_flattened.wsdl b/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/counter_flattened.wsdl
deleted file mode 100644
index cd5de52..0000000
--- a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/counter_flattened.wsdl
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="Counter" targetNamespace="http://counter.com" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:tns="http://counter.com" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" location="WS-ResourceLifetime.wsdl"/>
-  <wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" location="WS-ResourceProperties.wsdl"/>
-  <wsdl:import namespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" location="WS-BaseN.wsdl"/>
-  <wsdl:types>
-    <xsd:schema elementFormDefault="qualified" targetNamespace="http://counter.com" xmlns:rpns0="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" xmlns:rpns1="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd">
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" schemaLocation="WS-ResourceLifetime.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" schemaLocation="WS-BaseN.xsd"/>
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-      <xsd:element name="createCounter">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:element name="createCounterResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element ref="wsa:EndpointReference"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="add" type="xsd:int"/>
-      <xsd:element name="addResponse" type="xsd:int"/>
-      <xsd:element name="Value" type="xsd:int"/>
-      <xsd:element name="CounterRP">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="tns:Value"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="1" ref="rpns0:Topic"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="1" ref="rpns0:TopicExpressionDialects"/>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="rpns1:TerminationTime"/>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="rpns1:CurrentTime"/>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="rpns0:FixedTopicSet"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="AddInputMessage">
-    <wsdl:part name="parameters" element="tns:add"/>
-  </wsdl:message>
-  <wsdl:message name="AddOutputMessage">
-    <wsdl:part name="parameters" element="tns:addResponse"/>
-  </wsdl:message>
-  <wsdl:message name="CreateCounterResponse">
-    <wsdl:part name="response" element="tns:createCounterResponse"/>
-  </wsdl:message>
-  <wsdl:message name="CreateCounterRequest">
-    <wsdl:part name="request" element="tns:createCounter"/>
-  </wsdl:message>
-  <wsdl:portType name="CounterPortType" wsrp:ResourceProperties="tns:CounterRP">
-    <wsdl:operation name="createCounter">
-      <wsdl:input message="tns:CreateCounterRequest"/>
-      <wsdl:output message="tns:CreateCounterResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="add">
-      <wsdl:input message="tns:AddInputMessage"/>
-      <wsdl:output message="tns:AddOutputMessage"/>
-    </wsdl:operation>
-    <wsdl:operation name="SetTerminationTime">
-      <wsdl:input message="wsrlw:SetTerminationTimeRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTime"/>
-      <wsdl:output message="wsrlw:SetTerminationTimeResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTimeResponse"/>
-      <wsdl:fault name="UnableToSetTerminationTimeFault" message="wsrlw:UnableToSetTerminationTimeFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrlw:ResourceUnknownFault"/>
-      <wsdl:fault name="TerminationTimeChangeRejectedFault" message="wsrlw:TerminationTimeChangeRejectedFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="Destroy">
-      <wsdl:input message="wsrlw:DestroyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/Destroy"/>
-      <wsdl:output message="wsrlw:DestroyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/DestroyResponse"/>
-      <wsdl:fault name="ResourceNotDestroyedFault" message="wsrlw:ResourceNotDestroyedFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrlw:ResourceUnknownFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="QueryResourceProperties">
-      <wsdl:input name="QueryResourcePropertiesRequest" message="wsrpw:QueryResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourceProperties"/>
-      <wsdl:output name="QueryResourcePropertiesResponse" message="wsrpw:QueryResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourcePropertiesResponse"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="InvalidQueryExpressionFault" message="wsrpw:InvalidQueryExpressionFault"/>
-      <wsdl:fault name="QueryEvaluationErrorFault" message="wsrpw:QueryEvaluationErrorFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="UnknownQueryExpressionDialectFault" message="wsrpw:UnknownQueryExpressionDialectFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="GetMultipleResourceProperties">
-      <wsdl:input name="GetMultipleResourcePropertiesRequest" message="wsrpw:GetMultipleResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourceProperties"/>
-      <wsdl:output name="GetMultipleResourcePropertiesResponse" message="wsrpw:GetMultipleResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourcePropertiesResponse"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="GetResourceProperty">
-      <wsdl:input name="GetResourcePropertyRequest" message="wsrpw:GetResourcePropertyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:output name="GetResourcePropertyResponse" message="wsrpw:GetResourcePropertyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourcePropertyResponse"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="Subscribe">
-      <wsdl:input message="wsntw:SubscribeRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/Subscribe"/>
-      <wsdl:output message="wsntw:SubscribeResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/SubscribeResponse"/>
-      <wsdl:fault name="TopicNotSupportedFault" message="wsntw:TopicNotSupportedFault"/>
-      <wsdl:fault name="InvalidTopicExpressionFault" message="wsntw:InvalidTopicExpressionFault"/>
-      <wsdl:fault name="SubscribeCreationFailedFault" message="wsntw:SubscribeCreationFailedFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-      <wsdl:fault name="TopicPathDialectUnknownFault" message="wsntw:TopicPathDialectUnknownFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="GetCurrentMessage">
-      <wsdl:input message="wsntw:GetCurrentMessageRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/GetCurrentMessage"/>
-      <wsdl:output message="wsntw:GetCurrentMessageResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/GetCurrentMessageResponse"/>
-      <wsdl:fault name="TopicNotSupportedFault" message="wsntw:TopicNotSupportedFault"/>
-      <wsdl:fault name="InvalidTopicExpressionFault" message="wsntw:InvalidTopicExpressionFault"/>
-      <wsdl:fault name="NoCurrentMessageOnTopicFault" message="wsntw:NoCurrentMessageOnTopicFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0fec6f04/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/xml.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/xml.xsd b/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/xml.xsd
deleted file mode 100644
index 730b4c9..0000000
--- a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/xml.xsd
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xml:lang="en" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:annotation>
-    <xs:documentation>See http://www.w3.org/XML/1998/namespace.html and
-   http://www.w3.org/TR/REC-xml for information about this namespace.
-
-    This schema document describes the XML namespace, in a form
-    suitable for import by other schema documents.  
-
-    Note that local names in this namespace are intended to be defined
-    only by the World Wide Web Consortium or its subgroups.  The
-    following names are currently defined in this namespace and should
-    not be used with conflicting semantics by any Working Group,
-    specification, or document instance:
-
-    base (as an attribute name): denotes an attribute whose value
-         provides a URI to be used as the base for interpreting any
-         relative URIs in the scope of the element on which it
-         appears; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML Base specification.
-
-    lang (as an attribute name): denotes an attribute whose value
-         is a language code for the natural language of the content of
-         any element; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML specification.
-  
-    space (as an attribute name): denotes an attribute whose
-         value is a keyword indicating what whitespace processing
-         discipline is intended for the content of the element; its
-         value is inherited.  This name is reserved by virtue of its
-         definition in the XML specification.
-
-    Father (in any context at all): denotes Jon Bosak, the chair of 
-         the original XML Working Group.  This name is reserved by 
-         the following decision of the W3C XML Plenary and 
-         XML Coordination groups:
-
-             In appreciation for his vision, leadership and dedication
-             the W3C XML Plenary on this 10th day of February, 2000
-             reserves for Jon Bosak in perpetuity the XML name
-             xml:Father</xs:documentation>
-  </xs:annotation>
-  <xs:annotation>
-    <xs:documentation>This schema defines attributes and an attribute group
-        suitable for use by
-        schemas wishing to allow xml:base, xml:lang or xml:space attributes
-        on elements they define.
-
-        To enable this, such a schema must import this schema
-        for the XML namespace, e.g. as follows:
-        &lt;schema . . .>
-         . . .
-         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
-
-        Subsequently, qualified reference to any of the attributes
-        or the group defined below will have the desired effect, e.g.
-
-        &lt;type . . .>
-         . . .
-         &lt;attributeGroup ref="xml:specialAttrs"/>
- 
-         will define a type which will schema-validate an instance
-         element with any of those attributes</xs:documentation>
-  </xs:annotation>
-  <xs:annotation>
-    <xs:documentation>In keeping with the XML Schema WG's standard versioning
-   policy, this schema document will persist at
-   http://www.w3.org/2001/03/xml.xsd.
-   At the date of issue it can also be found at
-   http://www.w3.org/2001/xml.xsd.
-   The schema document at that URI may however change in the future,
-   in order to remain compatible with the latest version of XML Schema
-   itself.  In other words, if the XML Schema namespace changes, the version
-   of this document at
-   http://www.w3.org/2001/xml.xsd will change
-   accordingly; the version at
-   http://www.w3.org/2001/03/xml.xsd will not change.</xs:documentation>
-  </xs:annotation>
-  <xs:attribute name="lang" type="xs:language">
-    <xs:annotation>
-      <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
-         codes as the enumerated possible values . . .</xs:documentation>
-    </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="space" default="preserve">
-    <xs:simpleType>
-      <xs:restriction base="xs:NCName">
-        <xs:enumeration value="default"/>
-        <xs:enumeration value="preserve"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:attribute>
-  <xs:attribute name="base" type="xs:anyURI">
-    <xs:annotation>
-      <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
-                     information about this attribute.</xs:documentation>
-    </xs:annotation>
-  </xs:attribute>
-  <xs:attributeGroup name="specialAttrs">
-    <xs:attribute ref="xml:base"/>
-    <xs:attribute ref="xml:lang"/>
-    <xs:attribute ref="xml:space"/>
-  </xs:attributeGroup>
-</xs:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0fec6f04/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java
index ee4b461..985c47c 100644
--- a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java
+++ b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java
@@ -33,8 +33,6 @@ import org.junit.BeforeClass;
 
 public class WSDLTestHelper implements LocationConstants {
 
-
-	
 	// See https://github.com/taverna-extras/wsdl-generic-test-cases
 	//public static String TEST_CASES_URL = "https://github.com/taverna-extras/wsdl-generic-test-cases/archive/2016-04-28.zip";
 	public static String TEST_CASES_URL = "https://github.com/taverna-extras/wsdl-generic-test-cases/releases/download/2016-04-28/wsdl-generic-test-cases-2016-04-28.jar";


[12/28] incubator-taverna-common-activities git commit: Moved third-party test WSDLs to https://github.com/taverna-extras/wsdl-generic-test-cases

Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-ResourceLifetime.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-ResourceLifetime.wsdl b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-ResourceLifetime.wsdl
deleted file mode 100644
index 3d81ce5..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-ResourceLifetime.wsdl
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><wsdl:definitions name="WS-ResourceLifetime" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsrl="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addr
 essing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema">
-      <xsd:include schemaLocation="WS-ResourceLifetime.xsd"/>
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" schemaLocation="WS-BaseFaults.xsd"/>
-      <!--==== Resource Properties for ScheduledResourceTermination ====-->
-      <xsd:element name="ScheduledResourceTerminationRP">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="wsrl:CurrentTime"/>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="wsrl:TerminationTime"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--====== Message Types for ImmediateResourceTermination  =======-->
-      <xsd:element name="Destroy">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:element name="DestroyResponse">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:complexType name="ResourceUnknownFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResourceUnknownFault" type="wsrl:ResourceUnknownFaultType"/>
-      <xsd:complexType name="ResourceNotDestroyedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResourceNotDestroyedFault" type="wsrl:ResourceNotDestroyedFaultType"/>
-      <!--====== Message Types for ScheduledResourceTermination  =======-->
-      <xsd:element name="SetTerminationTime">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="RequestedTerminationTime" nillable="true" type="xsd:dateTime"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="SetTerminationTimeResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="NewTerminationTime" nillable="true" type="xsd:dateTime"/>
-            <xsd:element name="CurrentTime" type="xsd:dateTime"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:complexType name="UnableToSetTerminationTimeFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="UnableToSetTerminationTimeFault" type="wsrl:UnableToSetTerminationTimeFaultType"/>
-      <xsd:complexType name="TerminationTimeChangeRejectedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="TerminationTimeChangeRejectedFault" type="wsrl:TerminationTimeChangeRejectedFaultType"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="DestroyResponse">
-    <wsdl:part element="wsrl:DestroyResponse" name="DestroyResponse"/>
-  </wsdl:message>
-  <wsdl:message name="SetTerminationTimeRequest">
-    <wsdl:part element="wsrl:SetTerminationTime" name="SetTerminationTimeRequest"/>
-  </wsdl:message>
-  <wsdl:message name="ResourceUnknownFault">
-    <wsdl:part element="wsrl:ResourceUnknownFault" name="ResourceUnknownFault"/>
-  </wsdl:message>
-  <wsdl:message name="DestroyRequest">
-    <wsdl:part element="wsrl:Destroy" name="DestroyRequest"/>
-  </wsdl:message>
-  <wsdl:message name="UnableToSetTerminationTimeFault">
-    <wsdl:part element="wsrl:UnableToSetTerminationTimeFault" name="UnableToSetTerminationTimeFault"/>
-  </wsdl:message>
-  <wsdl:message name="SetTerminationTimeResponse">
-    <wsdl:part element="wsrl:SetTerminationTimeResponse" name="SetTerminationTimeResponse"/>
-  </wsdl:message>
-  <wsdl:message name="ResourceNotDestroyedFault">
-    <wsdl:part element="wsrl:ResourceNotDestroyedFault" name="ResourceNotDestroyedFault"/>
-  </wsdl:message>
-  <wsdl:message name="TerminationTimeChangeRejectedFault">
-    <wsdl:part element="wsrl:TerminationTimeChangeRejectedFault" name="TerminationTimeChangeRejectedFault"/>
-  </wsdl:message>
-  <wsdl:portType name="ScheduledResourceTermination" wsrp:ResourceProperties="wsrl:ScheduledResourceTerminationRP">
-    <wsdl:operation name="SetTerminationTime">
-      <wsdl:input message="wsrlw:SetTerminationTimeRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTime"/>
-      <wsdl:output message="wsrlw:SetTerminationTimeResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTimeResponse"/>
-      <wsdl:fault message="wsrlw:UnableToSetTerminationTimeFault" name="UnableToSetTerminationTimeFault"/>
-      <wsdl:fault message="wsrlw:ResourceUnknownFault" name="ResourceUnknownFault"/>
-      <wsdl:fault message="wsrlw:TerminationTimeChangeRejectedFault" name="TerminationTimeChangeRejectedFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="ImmediateResourceTermination">
-    <wsdl:operation name="Destroy">
-      <wsdl:input message="wsrlw:DestroyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/Destroy"/>
-      <wsdl:output message="wsrlw:DestroyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/DestroyResponse"/>
-      <wsdl:fault message="wsrlw:ResourceNotDestroyedFault" name="ResourceNotDestroyedFault"/>
-      <wsdl:fault message="wsrlw:ResourceUnknownFault" name="ResourceUnknownFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-ResourceLifetime.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-ResourceLifetime.xsd b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-ResourceLifetime.xsd
deleted file mode 100644
index a6dbef7..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-ResourceLifetime.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsrl="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd">
-  <!--=============== Resource Property Related  ===================-->
-  <!--==== Resource Properties for ScheduledResourceTermination ====-->
-  <xsd:element name="CurrentTime" type="xsd:dateTime"/>
-  <xsd:element name="TerminationTime" nillable="true" type="xsd:dateTime"/>
-  <!--============= Notification Message Related  ==================-->
-  <xsd:element name="TerminationNotification">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="TerminationTime" type="xsd:dateTime" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="TerminationReason" type="xsd:anyType" minOccurs="0" maxOccurs="1"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-ResourceProperties.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-ResourceProperties.wsdl b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-ResourceProperties.wsdl
deleted file mode 100644
index 267066a..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-ResourceProperties.wsdl
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><wsdl:definitions name="WS-ResourceProperties" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl">
-  <!--===================== Types Definitions ======================-->
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified">
-      <xsd:include schemaLocation="WS-ResourceProperties.xsd"/>
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" schemaLocation="WS-BaseFaults.xsd"/>
-      <!--========== Message Types for GetResourceProperty  ============-->
-      <xsd:element name="GetResourceProperty" type="xsd:QName"/>
-      <xsd:element name="GetResourcePropertyResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any minOccurs="0" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:complexType name="ResourceUnknownFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResourceUnknownFault" type="wsrp:ResourceUnknownFaultType"/>
-      <xsd:complexType name="InvalidResourcePropertyQNameFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="InvalidResourcePropertyQNameFault" type="wsrp:InvalidResourcePropertyQNameFaultType"/>
-      <!--====== Message Types for GetMultipleResourceProperties =======-->
-      <xsd:element name="GetMultipleResourceProperties">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="ResourceProperty" type="xsd:QName" minOccurs="1" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="GetMultipleResourcePropertiesResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any minOccurs="0" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--========= Message Types for SetResourceProperties ===========-->
-      <xsd:complexType name="InsertType">
-        <xsd:sequence>
-          <xsd:any processContents="lax" minOccurs="1" maxOccurs="unbounded"/>
-        </xsd:sequence>
-      </xsd:complexType>
-      <xsd:element name="Insert" type="wsrp:InsertType"/>
-      <xsd:complexType name="UpdateType">
-        <xsd:sequence>
-          <xsd:any processContents="lax" minOccurs="1" maxOccurs="unbounded"/>
-        </xsd:sequence>
-      </xsd:complexType>
-      <xsd:element name="Update" type="wsrp:UpdateType"/>
-      <xsd:complexType name="DeleteType">
-        <xsd:attribute name="ResourceProperty" type="xsd:QName" use="required"/>
-      </xsd:complexType>
-      <xsd:element name="Delete" type="wsrp:DeleteType"/>
-      <xsd:element name="SetResourceProperties">
-        <xsd:complexType>
-          <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element ref="wsrp:Insert"/>
-            <xsd:element ref="wsrp:Update"/>
-            <xsd:element ref="wsrp:Delete"/>
-          </xsd:choice>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="SetResourcePropertiesResponse">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:complexType name="InvalidSetResourcePropertiesRequestContentFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="InvalidSetResourcePropertiesRequestContentFault" type="wsrp:InvalidSetResourcePropertiesRequestContentFaultType"/>
-      <xsd:complexType name="UnableToModifyResourcePropertyFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="UnableToModifyResourcePropertyFault" type="wsrp:UnableToModifyResourcePropertyFaultType"/>
-      <xsd:complexType name="SetResourcePropertyRequestFailedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="SetResourcePropertyRequestFailedFault" type="wsrp:SetResourcePropertyRequestFailedFaultType"/>
-      <!--========= Message Types for QueryResourceProperties ==========-->
-      <xsd:element name="QueryResourceProperties">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element ref="wsrp:QueryExpression" minOccurs="1" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="QueryResourcePropertiesResponse">
-        <xsd:complexType mixed="true">
-          <xsd:sequence>
-            <xsd:any processContents="lax" minOccurs="1" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:complexType name="UnknownQueryExpressionDialectFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="UnknownQueryExpressionDialectFault" type="wsrp:UnknownQueryExpressionDialectFaultType"/>
-      <xsd:complexType name="InvalidQueryExpressionFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="InvalidQueryExpressionFault" type="wsrp:InvalidQueryExpressionFaultType"/>
-      <xsd:complexType name="QueryEvaluationErrorFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="QueryEvaluationErrorFault" type="wsrp:QueryEvaluationErrorFaultType"/>
-    </xsd:schema>
-  </wsdl:types>
-  <!--===================== GetResourceProperty ==================== 
-  GetResourceProperty(QName)
-  returns: any-->
-  <wsdl:message name="GetResourcePropertyRequest">
-    <wsdl:part name="GetResourcePropertyRequest" element="wsrp:GetResourceProperty"/>
-  </wsdl:message>
-  <wsdl:message name="GetResourcePropertyResponse">
-    <wsdl:part name="GetResourcePropertyResponse" element="wsrp:GetResourcePropertyResponse"/>
-  </wsdl:message>
-  <wsdl:message name="ResourceUnknownFault">
-    <part name="ResourceUnknownFault" element="wsrp:ResourceUnknownFault"/>
-  </wsdl:message>
-  <wsdl:message name="InvalidResourcePropertyQNameFault">
-    <part name="InvalidResourcePropertyQNameFault" element="wsrp:InvalidResourcePropertyQNameFault"/>
-  </wsdl:message>
-  <!--==============GetMultipleResourceProperties ================== 
-  GetMultipleResourceProperties(list of QName)
-  returns: sequence of any-->
-  <wsdl:message name="GetMultipleResourcePropertiesRequest">
-    <wsdl:part name="GetMultipleResourcePropertiesRequest" element="wsrp:GetMultipleResourceProperties"/>
-  </wsdl:message>
-  <wsdl:message name="GetMultipleResourcePropertiesResponse">
-    <wsdl:part name="GetMultipleResourcePropertiesResponse" element="wsrp:GetMultipleResourcePropertiesResponse"/>
-  </wsdl:message>
-  <!--================= SetResourceProperties ====================== 
-  SetResourceProperties(
-  { insert (any)* |
-    update (any)* |
-    delete@QName } + 
-  )
-  returns: empty-->
-  <wsdl:message name="SetResourcePropertiesRequest">
-    <wsdl:part name="SetResourcePropertiesRequest" element="wsrp:SetResourceProperties"/>
-  </wsdl:message>
-  <wsdl:message name="SetResourcePropertiesResponse">
-    <wsdl:part name="SetResourcePropertiesResponse" element="wsrp:SetResourcePropertiesResponse"/>
-  </wsdl:message>
-  <wsdl:message name="InvalidSetResourcePropertiesRequestContentFault">
-    <part name="InvalidSetResourcePropertiesRequestContentFault" element="wsrp:InvalidSetResourcePropertiesRequestContentFault"/>
-  </wsdl:message>
-  <wsdl:message name="UnableToModifyResourcePropertyFault">
-    <part name="UnableToModifyResourcePropertyFault" element="wsrp:UnableToModifyResourcePropertyFault"/>
-  </wsdl:message>
-  <wsdl:message name="SetResourcePropertyRequestFailedFault">
-    <part name="SetResourcePropertyRequestFailedFault" element="wsrp:SetResourcePropertyRequestFailedFault"/>
-  </wsdl:message>
-  <!--================ QueryResourceProperties ===================== 
-  QueryResourceProperties(QueryExpression)
-  returns: any-->
-  <wsdl:message name="QueryResourcePropertiesRequest">
-    <wsdl:part name="QueryResourcePropertiesRequest" element="wsrp:QueryResourceProperties"/>
-  </wsdl:message>
-  <wsdl:message name="QueryResourcePropertiesResponse">
-    <wsdl:part name="QueryResourcePropertiesResponse" element="wsrp:QueryResourcePropertiesResponse"/>
-  </wsdl:message>
-  <wsdl:message name="UnknownQueryExpressionDialectFault">
-    <part name="UnknownQueryExpressionDialectFault" element="wsrp:UnknownQueryExpressionDialectFault"/>
-  </wsdl:message>
-  <wsdl:message name="InvalidQueryExpressionFault">
-    <part name="InvalidQueryExpressionFault" element="wsrp:InvalidQueryExpressionFault"/>
-  </wsdl:message>
-  <wsdl:message name="QueryEvaluationErrorFault">
-    <part name="QueryEvaluationErrorFault" element="wsrp:QueryEvaluationErrorFault"/>
-  </wsdl:message>
-  <!--=================== PortType Definitions =====================-->
-  <wsdl:portType name="GetResourceProperty">
-    <wsdl:operation name="GetResourceProperty">
-      <wsdl:input name="GetResourcePropertyRequest" message="wsrpw:GetResourcePropertyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:output name="GetResourcePropertyResponse" message="wsrpw:GetResourcePropertyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourcePropertyResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="GetMultipleResourceProperties">
-    <wsdl:operation name="GetMultipleResourceProperties">
-      <wsdl:input name="GetMultipleResourcePropertiesRequest" message="wsrpw:GetMultipleResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourceProperties"/>
-      <wsdl:output name="GetMultipleResourcePropertiesResponse" message="wsrpw:GetMultipleResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourcePropertiesResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="SetResourceProperties">
-    <wsdl:operation name="SetResourceProperties">
-      <wsdl:input name="SetResourcePropertiesRequest" message="wsrpw:SetResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/SetResourceProperties"/>
-      <wsdl:output name="SetResourcePropertiesResponse" message="wsrpw:SetResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/SetResourcePropertiesResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidSetResourcePropertiesRequestContentFault" message="wsrpw:InvalidSetResourcePropertiesRequestContentFault"/>
-      <wsdl:fault name="UnableToModifyResourcePropertyFault" message="wsrpw:UnableToModifyResourcePropertyFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="SetResourcePropertyRequestFailedFault" message="wsrpw:SetResourcePropertyRequestFailedFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="QueryResourceProperties">
-    <wsdl:operation name="QueryResourceProperties">
-      <wsdl:input name="QueryResourcePropertiesRequest" message="wsrpw:QueryResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourceProperties"/>
-      <wsdl:output name="QueryResourcePropertiesResponse" message="wsrpw:QueryResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourcePropertiesResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="UnknownQueryExpressionDialectFault" message="wsrpw:UnknownQueryExpressionDialectFault"/>
-      <wsdl:fault name="InvalidQueryExpressionFault" message="wsrpw:InvalidQueryExpressionFault"/>
-      <wsdl:fault name="QueryEvaluationErrorFault" message="wsrpw:QueryEvaluationErrorFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-ResourceProperties.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-ResourceProperties.xsd b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-ResourceProperties.xsd
deleted file mode 100644
index 1527149..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-ResourceProperties.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <!--======= Global Attribute Declaration for WSDL 1.1 portType====-->
-  <xsd:attribute name="ResourceProperties" type="xsd:QName"/>
-  <!--= Notification Message for ResourceProperties value change ===-->
-  <xsd:complexType name="ResourcePropertyValueChangeNotificationType">
-    <xsd:sequence>
-      <xsd:element name="OldValue" nillable="true" minOccurs="0" maxOccurs="1">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any minOccurs="1" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="NewValue" nillable="true" minOccurs="1" maxOccurs="1">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any minOccurs="1" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:element name="ResourcePropertyValueChangeNotification" type="wsrp:ResourcePropertyValueChangeNotificationType"/>
-  <xsd:complexType name="QueryExpressionType" mixed="true">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="1" processContents="lax"/>
-    </xsd:sequence>
-    <xsd:attribute name="Dialect" type="xsd:anyURI"/>
-  </xsd:complexType>
-  <xsd:element name="QueryExpression" type="wsrp:QueryExpressionType"/>
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/security.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/security.xsd b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/security.xsd
deleted file mode 100644
index 3c7d8e8..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/security.xsd
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="gme://caGrid.caBIG/1.0/gov.nih.nci.cagrid.metadata.security" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:sec="gme://caGrid.caBIG/1.0/gov.nih.nci.cagrid.metadata.security">
-  <xs:element name="ServiceSecurityMetadata" type="sec:ServiceSecurityMetadata"/>
-  <xs:complexType name="ServiceSecurityMetadata">
-    <xs:sequence>
-      <xs:element name="defaultCommunicationMechanism" type="sec:CommunicationMechanism"/>
-      <xs:element name="operations">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element ref="sec:Operation" minOccurs="0" maxOccurs="unbounded"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:element name="CommunicationMechanism" type="sec:CommunicationMechanism"/>
-  <xs:complexType name="CommunicationMechanism">
-    <xs:all>
-      <xs:element ref="sec:GSITransport" minOccurs="0"/>
-      <xs:element ref="sec:GSISecureMessage" minOccurs="0"/>
-      <xs:element ref="sec:GSISecureConversation" minOccurs="0"/>
-      <xs:element ref="sec:None" minOccurs="0"/>
-    </xs:all>
-    <xs:attribute name="anonymousPermitted" use="required" type="xs:boolean"/>
-  </xs:complexType>
-  <xs:element name="Operation" type="sec:Operation"/>
-  <xs:complexType name="Operation">
-    <xs:sequence>
-      <xs:element ref="sec:CommunicationMechanism"/>
-    </xs:sequence>
-    <xs:attribute name="name" use="required" type="xs:string"/>
-  </xs:complexType>
-  <xs:element name="CommunicationStyle" type="sec:CommunicationStyle"/>
-  <xs:complexType name="CommunicationStyle">
-    <xs:sequence/>
-    <xs:attribute name="protectionLevel" use="required" type="sec:protectionLevelType">
-      <xs:annotation>
-        <xs:documentation>Describes data protection level (integrity, privacy, either,
-				none)</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:element name="GSISecureMessage" type="sec:GSISecureMessage"/>
-  <xs:complexType name="GSISecureMessage">
-    <xs:complexContent>
-      <xs:extension base="sec:CommunicationStyle">
-        <xs:sequence/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="GSISecureConversation" type="sec:GSISecureConversation"/>
-  <xs:complexType name="GSISecureConversation">
-    <xs:complexContent>
-      <xs:extension base="sec:CommunicationStyle">
-        <xs:sequence/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:simpleType name="protectionLevelType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="integrity"/>
-      <xs:enumeration value="privacy"/>
-      <xs:enumeration value="either"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:element name="GSITransport" type="sec:GSITransport"/>
-  <xs:complexType name="GSITransport">
-    <xs:complexContent>
-      <xs:extension base="sec:CommunicationStyle">
-        <xs:sequence/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="None" type="sec:None"/>
-  <xs:complexType name="None">
-    <xs:sequence/>
-  </xs:complexType>
-</xs:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/xml.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/xml.xsd b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/xml.xsd
deleted file mode 100644
index 730b4c9..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/xml.xsd
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xml:lang="en" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:annotation>
-    <xs:documentation>See http://www.w3.org/XML/1998/namespace.html and
-   http://www.w3.org/TR/REC-xml for information about this namespace.
-
-    This schema document describes the XML namespace, in a form
-    suitable for import by other schema documents.  
-
-    Note that local names in this namespace are intended to be defined
-    only by the World Wide Web Consortium or its subgroups.  The
-    following names are currently defined in this namespace and should
-    not be used with conflicting semantics by any Working Group,
-    specification, or document instance:
-
-    base (as an attribute name): denotes an attribute whose value
-         provides a URI to be used as the base for interpreting any
-         relative URIs in the scope of the element on which it
-         appears; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML Base specification.
-
-    lang (as an attribute name): denotes an attribute whose value
-         is a language code for the natural language of the content of
-         any element; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML specification.
-  
-    space (as an attribute name): denotes an attribute whose
-         value is a keyword indicating what whitespace processing
-         discipline is intended for the content of the element; its
-         value is inherited.  This name is reserved by virtue of its
-         definition in the XML specification.
-
-    Father (in any context at all): denotes Jon Bosak, the chair of 
-         the original XML Working Group.  This name is reserved by 
-         the following decision of the W3C XML Plenary and 
-         XML Coordination groups:
-
-             In appreciation for his vision, leadership and dedication
-             the W3C XML Plenary on this 10th day of February, 2000
-             reserves for Jon Bosak in perpetuity the XML name
-             xml:Father</xs:documentation>
-  </xs:annotation>
-  <xs:annotation>
-    <xs:documentation>This schema defines attributes and an attribute group
-        suitable for use by
-        schemas wishing to allow xml:base, xml:lang or xml:space attributes
-        on elements they define.
-
-        To enable this, such a schema must import this schema
-        for the XML namespace, e.g. as follows:
-        &lt;schema . . .>
-         . . .
-         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
-
-        Subsequently, qualified reference to any of the attributes
-        or the group defined below will have the desired effect, e.g.
-
-        &lt;type . . .>
-         . . .
-         &lt;attributeGroup ref="xml:specialAttrs"/>
- 
-         will define a type which will schema-validate an instance
-         element with any of those attributes</xs:documentation>
-  </xs:annotation>
-  <xs:annotation>
-    <xs:documentation>In keeping with the XML Schema WG's standard versioning
-   policy, this schema document will persist at
-   http://www.w3.org/2001/03/xml.xsd.
-   At the date of issue it can also be found at
-   http://www.w3.org/2001/xml.xsd.
-   The schema document at that URI may however change in the future,
-   in order to remain compatible with the latest version of XML Schema
-   itself.  In other words, if the XML Schema namespace changes, the version
-   of this document at
-   http://www.w3.org/2001/xml.xsd will change
-   accordingly; the version at
-   http://www.w3.org/2001/03/xml.xsd will not change.</xs:documentation>
-  </xs:annotation>
-  <xs:attribute name="lang" type="xs:language">
-    <xs:annotation>
-      <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
-         codes as the enumerated possible values . . .</xs:documentation>
-    </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="space" default="preserve">
-    <xs:simpleType>
-      <xs:restriction base="xs:NCName">
-        <xs:enumeration value="default"/>
-        <xs:enumeration value="preserve"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:attribute>
-  <xs:attribute name="base" type="xs:anyURI">
-    <xs:annotation>
-      <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
-                     information about this attribute.</xs:documentation>
-    </xs:annotation>
-  </xs:attribute>
-  <xs:attributeGroup name="specialAttrs">
-    <xs:attribute ref="xml:base"/>
-    <xs:attribute ref="xml:lang"/>
-    <xs:attribute ref="xml:space"/>
-  </xs:attributeGroup>
-</xs:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/CounterService_.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/CounterService_.wsdl b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/CounterService_.wsdl
deleted file mode 100644
index 7e628e0..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/CounterService_.wsdl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="Counter" targetNamespace="http://counter.com/service" xmlns:binding="http://counter.com/bindings" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:import location="counter_bindings.wsdl" namespace="http://counter.com/bindings"/>
-  <wsdl:service name="CounterService">
-    <wsdl:port binding="binding:CounterPortTypeSOAPBinding" name="CounterPortTypePort">
-      <soap:address location="http://localhost:8080/wsrf/services/CounterService"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-Addressing.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-Addressing.xsd b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-Addressing.xsd
deleted file mode 100644
index 008c65e..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-Addressing.xsd
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Legal Disclaimer
-
-The presentation, distribution or other dissemination of the information 
-contained in this document is not a license, either expressly or impliedly, 
-to any intellectual property owned or controlled by BEA or IBM or Microsoft
-and\or any other third party.  BEA and IBM and Microsoft and\or any other
-third party may have patents, patent applications, trademarks, copyrights, 
-or other intellectual property rights covering subject matter in this 
-document.  The furnishing of this document does not give you any license 
-to BEA's and IBM's and Microsoft's or any other third party's patents, 
-trademarks, copyrights, or other intellectual property.
-
-This document and the information contained herein is provided on an "AS IS"
-basis and to the maximum extent permitted by applicable law, BEA and IBM 
-and Microsoft provide the document AS IS AND WITH ALL FAULTS, and hereby 
-disclaims all other warranties and conditions, either express, implied or 
-statutory, including, but not limited to, any (if any) implied warranties, 
-duties or conditions of merchantability, of fitness for a particular 
-purpose, of accuracy or completeness of responses, of results, of 
-workmanlike effort, of lack of viruses, and of lack of negligence, all with
-regard to the document. ALSO, THERE IS NO WARRANTY OR CONDITION OF 
-TITLE, QUIET ENJOYMENT, QUIET POSSESSION, CORRESPONDENCE TO DESCRIPTION OR 
-NON-INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS WITH REGARD TO THE 
-DOCUMENT.
-
-IN NO EVENT WILL BEA or IBM or MICROSOFT BE LIABLE TO ANY OTHER PARTY FOR THE
-COST OF PROCURING SUBSTITUTE GOODS OR SERVICES, LOST PROFITS, LOSS OF USE, 
-LOSS OF DATA, OR ANY INCIDENTAL, CONSEQUENTIAL, DIRECT, INDIRECT, OR SPECIAL 
-DAMAGES WHETHER UNDER CONTRACT, TORT, WARRANTY, OR OTHERWISE, ARISING IN ANY 
-WAY OUT OF THIS OR ANY OTHER AGREEMENT RELATING TO THIS DOCUMENT, WHETHER OR 
-NOT SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Copyright Notice
-
-Copyright 2003,2004 BEA Systems Inc. and IBM Corporation and Microsoft Corporation. All rights reserved.--><xs:schema targetNamespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" elementFormDefault="qualified" blockDefault="#all" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
-  <!--//////////////////// WS-Addressing ////////////////////-->
-  <!--Endpoint reference-->
-  <xs:element name="EndpointReference" type="wsa:EndpointReferenceType"/>
-  <xs:complexType name="EndpointReferenceType">
-    <xs:sequence>
-      <xs:element name="Address" type="wsa:AttributedURI"/>
-      <xs:element name="ReferenceProperties" type="wsa:ReferencePropertiesType" minOccurs="0"/>
-      <xs:element name="PortType" type="wsa:AttributedQName" minOccurs="0"/>
-      <xs:element name="ServiceName" type="wsa:ServiceNameType" minOccurs="0"/>
-      <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-        <xs:annotation>
-          <xs:documentation>If "Policy" elements from namespace "http://schemas.xmlsoap.org/ws/2002/12/policy#policy" are used, they must appear first (before any extensibility elements).</xs:documentation>
-        </xs:annotation>
-      </xs:any>
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-  </xs:complexType>
-  <xs:complexType name="ReferencePropertiesType">
-    <xs:sequence>
-      <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="ServiceNameType">
-    <xs:simpleContent>
-      <xs:extension base="xs:QName">
-        <xs:attribute name="PortName" type="xs:NCName"/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <!--Message information header blocks-->
-  <xs:element name="MessageID" type="wsa:AttributedURI"/>
-  <xs:element name="RelatesTo" type="wsa:Relationship"/>
-  <xs:element name="To" type="wsa:AttributedURI"/>
-  <xs:element name="Action" type="wsa:AttributedURI"/>
-  <xs:element name="From" type="wsa:EndpointReferenceType"/>
-  <xs:element name="ReplyTo" type="wsa:EndpointReferenceType"/>
-  <xs:element name="FaultTo" type="wsa:EndpointReferenceType"/>
-  <xs:complexType name="Relationship">
-    <xs:simpleContent>
-      <xs:extension base="xs:anyURI">
-        <xs:attribute name="RelationshipType" type="xs:QName" use="optional"/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:simpleType name="RelationshipTypeValues">
-    <xs:restriction base="xs:QName">
-      <xs:enumeration value="wsa:Reply"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:element name="ReplyAfter"/>
-  <xs:complexType name="ReplyAfterType">
-    <xs:simpleContent>
-      <xs:extension base="xs:nonNegativeInteger">
-        <xs:anyAttribute namespace="##other"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:simpleType name="FaultSubcodeValues">
-    <xs:restriction base="xs:QName">
-      <xs:enumeration value="wsa:InvalidMessageInformationHeader"/>
-      <xs:enumeration value="wsa:MessageInformationHeaderRequired"/>
-      <xs:enumeration value="wsa:DestinationUnreachable"/>
-      <xs:enumeration value="wsa:ActionNotSupported"/>
-      <xs:enumeration value="wsa:EndpointUnavailable"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:attribute name="Action" type="xs:anyURI"/>
-  <!--Common declarations and definitions-->
-  <xs:complexType name="AttributedQName">
-    <xs:simpleContent>
-      <xs:extension base="xs:QName">
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="AttributedURI">
-    <xs:simpleContent>
-      <xs:extension base="xs:anyURI">
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-</xs:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-BaseFaults.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-BaseFaults.xsd b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-BaseFaults.xsd
deleted file mode 100644
index 87d3798..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-BaseFaults.xsd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director. 
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director. 
-
-Copyright (C) OASIS Open (2004). All Rights Reserved. 
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd">
-  <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd">
-    <xsd:annotation>
-      <xsd:documentation>Get access to the xml: attribute groups for xml:lang as declared on 'schema'
-        and 'documentation' below</xsd:documentation>
-    </xsd:annotation>
-  </xsd:import>
-  <!--====================== BaseFault Types =======================-->
-  <xsd:element name="BaseFault" type="wsbf:BaseFaultType"/>
-  <xsd:complexType name="BaseFaultType">
-    <xsd:sequence>
-      <xsd:element name="Timestamp" type="xsd:dateTime" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="Originator" type="wsa:EndpointReferenceType" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="ErrorCode" minOccurs="0" maxOccurs="1">
-        <xsd:complexType>
-          <xsd:complexContent mixed="true">
-            <xsd:extension base="xsd:anyType">
-              <xsd:attribute name="dialect" type="xsd:anyURI" use="required"/>
-            </xsd:extension>
-          </xsd:complexContent>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="Description" minOccurs="0" maxOccurs="unbounded">
-        <xsd:complexType>
-          <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-              <xsd:attribute ref="xml:lang" use="optional"/>
-            </xsd:extension>
-          </xsd:simpleContent>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="FaultCause" type="wsbf:BaseFaultType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-BaseN.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-BaseN.wsdl b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-BaseN.wsdl
deleted file mode 100644
index 418e66c..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-BaseN.wsdl
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><wsdl:definitions name="WS-BaseNotification" targetNamespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2002/12/policy" xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" xmlns:wsrp="http://docs.oasi
 s-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:wsrl="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl">
-  <!--========================== Imports ===========================-->
-  <wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" location="WS-ResourceProperties.wsdl"/>
-  <wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" location="WS-ResourceLifetime.wsdl"/>
-  <!--===================== Types Definitions ======================-->
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified">
-      <xsd:include schemaLocation="WS-BaseN.xsd"/>
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" schemaLocation="WS-BaseFaults.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" schemaLocation="WS-ResourceProperties.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" schemaLocation="WS-ResourceLifetime.xsd"/>
-      <!--=============== Resource Property Related  ===================-->
-      <!--======== Resource Properties for NotificationProducer ========-->
-      <xsd:element name="NotificationProducerRP">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element ref="wsnt:Topic" minOccurs="1" maxOccurs="unbounded"/>
-            <xsd:element ref="wsnt:FixedTopicSet" minOccurs="1" maxOccurs="1"/>
-            <xsd:element ref="wsnt:TopicExpressionDialects" minOccurs="1" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--======== Resource Properties for SubscriptionManager =========-->
-      <xsd:element name="SubscriptionManagerRP">
-        <xsd:complexType>
-          <xsd:sequence>
-            <!--From WS-ResourceLifetime ScheduledResourceTermination-->
-            <xsd:element ref="wsrl:CurrentTime" minOccurs="1" maxOccurs="1"/>
-            <xsd:element ref="wsrl:TerminationTime" minOccurs="1" maxOccurs="1"/>
-            <!--SubscriptionManager specific-->
-            <xsd:element ref="wsnt:ConsumerReference" minOccurs="1" maxOccurs="1"/>
-            <xsd:element ref="wsnt:TopicExpression" minOccurs="1" maxOccurs="1"/>
-            <xsd:element ref="wsnt:UseNotify" minOccurs="1" maxOccurs="1"/>
-            <xsd:element ref="wsnt:Precondition" minOccurs="0" maxOccurs="1"/>
-            <xsd:element ref="wsnt:Selector" minOccurs="0" maxOccurs="1"/>
-            <xsd:element ref="wsnt:SubscriptionPolicy" minOccurs="0" maxOccurs="1"/>
-            <xsd:element ref="wsnt:CreationTime" minOccurs="0" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--================== Message Helper Types  =====================-->
-      <xsd:complexType name="NotificationMessageHolderType">
-        <xsd:sequence>
-          <xsd:element name="Topic" type="wsnt:TopicExpressionType" minOccurs="1" maxOccurs="1"/>
-          <xsd:element name="ProducerReference" type="wsa:EndpointReferenceType" minOccurs="0" maxOccurs="1"/>
-          <xsd:element name="Message" type="xsd:anyType" minOccurs="1" maxOccurs="1"/>
-        </xsd:sequence>
-      </xsd:complexType>
-      <!--========== Message Types for NotificationConsumer  ===========-->
-      <xsd:element name="Notify">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="NotificationMessage" type="wsnt:NotificationMessageHolderType" minOccurs="1" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--========== Message Types for NotificationProducer  ===========-->
-      <xsd:element name="SubscribeResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="SubscriptionReference" type="wsa:EndpointReferenceType" minOccurs="0" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="GetCurrentMessage">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="Topic" type="wsnt:TopicExpressionType"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="GetCurrentMessageResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:complexType name="ResourceUnknownFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResourceUnknownFault" type="wsnt:ResourceUnknownFaultType"/>
-      <xsd:complexType name="SubscribeCreationFailedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="SubscribeCreationFailedFault" type="wsnt:SubscribeCreationFailedFaultType"/>
-      <xsd:complexType name="TopicPathDialectUnknownFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="TopicPathDialectUnknownFault" type="wsnt:TopicPathDialectUnknownFaultType"/>
-      <xsd:complexType name="InvalidTopicExpressionFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="InvalidTopicExpressionFault" type="wsnt:InvalidTopicExpressionFaultType"/>
-      <xsd:complexType name="TopicNotSupportedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="TopicNotSupportedFault" type="wsnt:TopicNotSupportedFaultType"/>
-      <xsd:complexType name="NoCurrentMessageOnTopicFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="NoCurrentMessageOnTopicFault" type="wsnt:NoCurrentMessageOnTopicFaultType"/>
-      <!--========== Message Types for SubscriptionManager  ===========-->
-      <xsd:element name="PauseSubscription">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:element name="PauseSubscriptionResponse">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:element name="ResumeSubscription">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:element name="ResumeSubscriptionResponse">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:complexType name="PauseFailedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="PauseFailedFault" type="wsnt:PauseFailedFaultType"/>
-      <xsd:complexType name="ResumeFailedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResumeFailedFault" type="wsnt:ResumeFailedFaultType"/>
-    </xsd:schema>
-  </wsdl:types>
-  <!--================ NotificationConsumer::Notify ================ 
-  Notify(
-    NotificationMessage
-      (TopicExpression, ProducerReference, Message)*
-  returns: n/a (one way)-->
-  <wsdl:message name="Notify">
-    <wsdl:part name="Notify" element="wsnt:Notify"/>
-  </wsdl:message>
-  <!--============== NotificationProducer::Subscribe =============== 
-  Subscribe(
-   (ConsumerEndpointReference, TopicExpression, [UseNotify],
-   [Precondition], [Selector], [SubscriptionPolicy], 
-   [InitialTerminationTime])   
-  returns: WS-Resource qualified EPR to a Subscription-->
-  <wsdl:message name="SubscribeRequest">
-    <wsdl:part name="SubscribeRequest" element="wsnt:Subscribe"/>
-  </wsdl:message>
-  <wsdl:message name="SubscribeResponse">
-    <wsdl:part name="SubscribeResponse" element="wsnt:SubscribeResponse"/>
-  </wsdl:message>
-  <wsdl:message name="ResourceUnknownFault">
-    <part name="ResourceUnknownFault" element="wsnt:ResourceUnknownFault"/>
-  </wsdl:message>
-  <wsdl:message name="SubscribeCreationFailedFault">
-    <part name="SubscribeCreationFailedFault" element="wsnt:SubscribeCreationFailedFault"/>
-  </wsdl:message>
-  <wsdl:message name="TopicPathDialectUnknownFault">
-    <part name="TopicPathDialectUnknownFault" element="wsnt:TopicPathDialectUnknownFault"/>
-  </wsdl:message>
-  <!--========== NotificationProducer::GetCurrentMessage =========== 
-  GetCurrentMessage(topicExpression)
-  returns: a NotificationMessage (xsd:any)-->
-  <wsdl:message name="GetCurrentMessageRequest">
-    <wsdl:part name="GetCurrentMessageRequest" element="wsnt:GetCurrentMessage"/>
-  </wsdl:message>
-  <wsdl:message name="GetCurrentMessageResponse">
-    <wsdl:part name="GetCurrentMessageResponse" element="wsnt:GetCurrentMessageResponse"/>
-  </wsdl:message>
-  <wsdl:message name="InvalidTopicExpressionFault">
-    <part name="InvalidTopicExpressionFault" element="wsnt:InvalidTopicExpressionFault"/>
-  </wsdl:message>
-  <wsdl:message name="TopicNotSupportedFault">
-    <part name="TopicNotSupportedFault" element="wsnt:TopicNotSupportedFault"/>
-  </wsdl:message>
-  <wsdl:message name="NoCurrentMessageOnTopicFault">
-    <part name="NoCurrentMessageOnTopicFault" element="wsnt:NoCurrentMessageOnTopicFault"/>
-  </wsdl:message>
-  <!--========== SubscriptionManager::PauseSubscription ============
-   PauseSubscription()
-   returns: empty-->
-  <wsdl:message name="PauseSubscriptionRequest">
-    <wsdl:part name="PauseSubscriptionRequest" element="wsnt:PauseSubscription"/>
-  </wsdl:message>
-  <wsdl:message name="PauseSubscriptionResponse">
-    <wsdl:part name="PauseSubscriptionResponse" element="wsnt:PauseSubscriptionResponse"/>
-  </wsdl:message>
-  <wsdl:message name="PauseFailedFault">
-    <part name="PauseFailedFault" element="wsnt:PauseFailedFault"/>
-  </wsdl:message>
-  <!--========= SubscriptionManager::ResumeSubscription ============
-   ResumeSubscription()
-   returns: empty-->
-  <wsdl:message name="ResumeSubscriptionRequest">
-    <wsdl:part name="ResumeSubscriptionRequest" element="wsnt:ResumeSubscription"/>
-  </wsdl:message>
-  <wsdl:message name="ResumeSubscriptionResponse">
-    <wsdl:part name="ResumeSubscriptionResponse" element="wsnt:ResumeSubscriptionResponse"/>
-  </wsdl:message>
-  <wsdl:message name="ResumeFailedFault">
-    <part name="ResumeFailedFault" element="wsnt:ResumeFailedFault"/>
-  </wsdl:message>
-  <!--=================== PortType Definitions =====================-->
-  <!--========= NotificationConsumer PortType Definition ===========-->
-  <wsdl:portType name="NotificationConsumer">
-    <wsdl:operation name="Notify">
-      <wsdl:input message="wsntw:Notify" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/Notify"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <!--========= NotificationProducer PortType Definition ===========-->
-  <wsdl:portType name="NotificationProducer" wsrp:ResourceProperties="wsnt:NotificationProducerRP">
-    <!--========== extends wsrpw:ResourceProperties =============-->
-    <wsdl:operation name="GetResourceProperty">
-      <wsdl:input name="GetResourcePropertyRequest" message="wsrpw:GetResourcePropertyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:output name="GetResourcePropertyResponse" message="wsrpw:GetResourcePropertyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourcePropertyResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-    </wsdl:operation>
-    <!--=========== NotificationProducer Specific ==============-->
-    <wsdl:operation name="Subscribe">
-      <wsdl:input message="wsntw:SubscribeRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/Subscribe"/>
-      <wsdl:output message="wsntw:SubscribeResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/SubscribeResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-      <wsdl:fault name="SubscribeCreationFailedFault" message="wsntw:SubscribeCreationFailedFault"/>
-      <wsdl:fault name="TopicPathDialectUnknownFault" message="wsntw:TopicPathDialectUnknownFault"/>
-      <wsdl:fault name="InvalidTopicExpressionFault" message="wsntw:InvalidTopicExpressionFault"/>
-      <wsdl:fault name="TopicNotSupportedFault" message="wsntw:TopicNotSupportedFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="GetCurrentMessage">
-      <wsdl:input message="wsntw:GetCurrentMessageRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/GetCurrentMessage"/>
-      <wsdl:output message="wsntw:GetCurrentMessageResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/GetCurrentMessageResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidTopicExpressionFault" message="wsntw:InvalidTopicExpressionFault"/>
-      <wsdl:fault name="TopicNotSupportedFault" message="wsntw:TopicNotSupportedFault"/>
-      <wsdl:fault name="NoCurrentMessageOnTopicFault" message="wsntw:NoCurrentMessageOnTopicFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <!--========== SubscriptionManager PortType Definition ===========-->
-  <wsdl:portType name="SubscriptionManager" wsrp:ResourceProperties="wsnt:SubscriptionManagerRP">
-    <!--========== extends wsrpw:ResourceProperties =============-->
-    <wsdl:operation name="GetResourceProperty">
-      <wsdl:input name="GetResourcePropertyRequest" message="wsrpw:GetResourcePropertyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:output name="GetResourcePropertyResponse" message="wsrpw:GetResourcePropertyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourcePropertyResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-    </wsdl:operation>
-    <!--=== extends wsrlw:ImmediateResourceTermination ==========-->
-    <wsdl:operation name="Destroy">
-      <wsdl:input message="wsrlw:DestroyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/Destroy"/>
-      <wsdl:output message="wsrlw:DestroyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/DestroyResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrlw:ResourceUnknownFault"/>
-      <wsdl:fault name="ResourceNotDestroyedFault" message="wsrlw:ResourceNotDestroyedFault"/>
-    </wsdl:operation>
-    <!--=== extends wsrl:ScheduledResourceTermination ==========-->
-    <wsdl:operation name="SetTerminationTime">
-      <wsdl:input message="wsrlw:SetTerminationTimeRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTime"/>
-      <wsdl:output message="wsrlw:SetTerminationTimeResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTimeResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrlw:ResourceUnknownFault"/>
-      <wsdl:fault name="UnableToSetTerminationTimeFault" message="wsrlw:UnableToSetTerminationTimeFault"/>
-      <wsdl:fault name="TerminationTimeChangeRejectedFault" message="wsrlw:TerminationTimeChangeRejectedFault"/>
-    </wsdl:operation>
-    <!--========= SubscriptionManager specific operations ======-->
-    <wsdl:operation name="PauseSubscription">
-      <wsdl:input message="wsntw:PauseSubscriptionRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/PauseSubscription"/>
-      <wsdl:output message="wsntw:PauseSubscriptionResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/PauseSubscriptionResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-      <wsdl:fault name="PauseFailedFault" message="wsntw:PauseFailedFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="ResumeSubscription">
-      <wsdl:input message="wsntw:ResumeSubscriptionRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/ResumeSubscription"/>
-      <wsdl:output message="wsntw:ResumeSubscriptionResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/ResumeSubscriptionResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-      <wsdl:fault name="ResumeFailedFault" message="wsntw:ResumeFailedFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-BaseN.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-BaseN.xsd b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-BaseN.xsd
deleted file mode 100644
index 9bdf6ae..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-BaseN.xsd
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><xsd:schema targetNamespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd">
-  <!--======================== Imports  ============================-->
-  <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-  <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" schemaLocation="WS-ResourceProperties.xsd"/>
-  <!--========== Message Types for NotificationProducer  ===========-->
-  <xsd:element name="Subscribe">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="ConsumerReference" type="wsa:EndpointReferenceType" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="TopicExpression" type="wsnt:TopicExpressionType" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="UseNotify" type="xsd:boolean" default="true" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="Precondition" type="wsrp:QueryExpressionType" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="Selector" type="wsrp:QueryExpressionType" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="SubscriptionPolicy" type="xsd:anyType" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="InitialTerminationTime" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <!--================= Topic Expression Container =================-->
-  <xsd:complexType name="TopicExpressionType" mixed="true">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="1" processContents="lax"/>
-    </xsd:sequence>
-    <xsd:attribute name="Dialect" type="xsd:anyURI"/>
-  </xsd:complexType>
-  <xsd:element name="TopicExpression" type="wsnt:TopicExpressionType"/>
-  <!--=============== Resource Property Related  ===================-->
-  <!--======== Resource Properties for NotificationProducer ========-->
-  <xsd:element name="Topic" type="wsnt:TopicExpressionType"/>
-  <xsd:element name="FixedTopicSet" type="xsd:boolean"/>
-  <xsd:element name="TopicExpressionDialects" type="xsd:anyURI"/>
-  <!--======== Resource Properties for SubscriptionManager =========-->
-  <xsd:element name="ConsumerReference" type="wsa:EndpointReferenceType"/>
-  <xsd:element name="UseNotify" type="xsd:boolean"/>
-  <xsd:element name="Precondition" type="wsrp:QueryExpressionType"/>
-  <xsd:element name="Selector" type="wsrp:QueryExpressionType"/>
-  <xsd:element name="SubscriptionPolicy" type="xsd:anyType"/>
-  <xsd:element name="CreationTime" type="xsd:dateTime"/>
-</xsd:schema>
\ No newline at end of file


[21/28] incubator-taverna-common-activities git commit: Removed *.bak files

Posted by st...@apache.org.
Removed *.bak files


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/08c302d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/08c302d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/08c302d4

Branch: refs/heads/cwl-browse
Commit: 08c302d411c85a936da25587c46a29454461a612
Parents: 8ed9113
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Apr 28 16:48:01 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Apr 28 16:48:01 2016 +0100

----------------------------------------------------------------------
 .../rest/ApacheHttpClientUsageTest.java.bak     | 215 -------------------
 .../rest/ExampleActivityTest.java.bak           | 153 -------------
 2 files changed, 368 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/08c302d4/taverna-rest-activity/src/test/java/org/apache/taverna/activities/rest/ApacheHttpClientUsageTest.java.bak
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/src/test/java/org/apache/taverna/activities/rest/ApacheHttpClientUsageTest.java.bak b/taverna-rest-activity/src/test/java/org/apache/taverna/activities/rest/ApacheHttpClientUsageTest.java.bak
deleted file mode 100644
index c966a57..0000000
--- a/taverna-rest-activity/src/test/java/org/apache/taverna/activities/rest/ApacheHttpClientUsageTest.java.bak
+++ /dev/null
@@ -1,215 +0,0 @@
-package org.apache.taverna.activities.rest;
-
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.ExecutionContext;
-import org.apache.http.protocol.HttpContext;
-
-/**
- * 
- * @author Sergejs Aleksejevs
- */
-public class ApacheHttpClientUsageTest extends JFrame implements ActionListener
-{
-  private JComboBox cbHttpMethod;
-  private JTextField tfAddressBar;
-  private JButton bGo;
-  private JTextArea taResponse;
-  private JScrollPane spResponse;
-  
-  
-  /**
-   * Constructor is solely involved in the UI initialisation.
-   */
-  public ApacheHttpClientUsageTest()
-  {
-    Container contentPane = this.getContentPane();
-    contentPane.setLayout(new BorderLayout(5,5));
-    
-    bGo = new JButton("GO!");
-    bGo.addActionListener(this);
-    bGo.setDefaultCapable(true);
-    this.getRootPane().setDefaultButton(bGo);
-    
-    tfAddressBar = new JTextField(50);
-    tfAddressBar.setPreferredSize(new Dimension(0,bGo.getPreferredSize().height));
-    tfAddressBar.setText("http://test.biocatalogue.org/");
-    
-    JPanel jpAddressBar = new JPanel();
-    jpAddressBar.add(tfAddressBar);
-    jpAddressBar.add(bGo);
-    
-    cbHttpMethod = new JComboBox(RESTActivity.HTTP_METHOD.values());
-    cbHttpMethod.setBorder(BorderFactory.createCompoundBorder(
-        BorderFactory.createEmptyBorder(5, 5, 5, 5),
-        cbHttpMethod.getBorder()));
-    
-    JPanel jpAllNavigation = new JPanel(new BorderLayout());
-    jpAllNavigation.add(jpAddressBar, BorderLayout.NORTH);
-    jpAllNavigation.add(cbHttpMethod, BorderLayout.CENTER);
-    
-    contentPane.add(jpAllNavigation, BorderLayout.NORTH);
-    
-    taResponse = new JTextArea(20, 20);
-    taResponse.setEditable(true);
-    
-    spResponse = new JScrollPane(taResponse);
-    spResponse.setBorder(BorderFactory.createCompoundBorder(
-        BorderFactory.createEmptyBorder(0, 5, 5, 5),
-        BorderFactory.createEtchedBorder()));
-    contentPane.add(spResponse, BorderLayout.CENTER);
-    
-    this.pack();
-    this.setLocationRelativeTo(null); // center on screen
-  }
-  
-  
-  /**
-   * Click handler for the only button there is - the "GO!" button 
-   */
-  public void actionPerformed(ActionEvent e)
-  {
-    if (e.getSource().equals(bGo))
-    {
-      try { 
-        switch ((RESTActivity.HTTP_METHOD)cbHttpMethod.getSelectedItem()) {
-          case GET:    doGET(); break;
-          case POST:   doPOST(); break;
-          case PUT:    doPUT(); break;
-          case DELETE: doDELETE(); break;
-        }
-      }
-      catch (Exception ex) {
-        taResponse.setText(ex + "\n\n" + ex.getStackTrace());
-      }
-    }
-  }
-  
-  
-  private void doGET() {
-    HttpGet httpGet = new HttpGet(tfAddressBar.getText());
-    httpGet.addHeader("Accept", "application/xml");
-    performHTTPRequest(httpGet);
-  }
-  
-  
-  private void doPOST() throws UnsupportedEncodingException {
-//    // POST TO MYEXPERIMENT - basic auth
-//    HttpPost httpPost = new HttpPost("http://sandbox.myexperiment.org/comment.xml");
-//    httpPost.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(("LOGIN" + ":" + "PASSWORD").getBytes())));
-//    httpPost.addHeader("Accept", "application/xml");
-//    httpPost.addHeader("Content-Type", "application/xml");
-//    httpPost.setEntity(new StringEntity("<comment><subject resource=\"http://sandbox.myexperiment.org/files/226\"/><comment>1234567</comment></comment>"));
-//    performHTTPRequest(httpPost);
-    
-    // POST TO BIOCATALOGUE - no auth
-    HttpPost httpPost = new HttpPost(tfAddressBar.getText());
-    httpPost.addHeader("Accept", "application/xml");
-    httpPost.addHeader("Content-Type", "application/xml");
-    httpPost.setEntity(new StringEntity("<searchByData><searchType>input</searchType><limit>20</limit><data>test</data></searchByData>"));
-    performHTTPRequest(httpPost);
-  }
-  
-  
-  private void doPUT() throws UnsupportedEncodingException {
-    HttpPut httpPut = new HttpPut("http://sandbox.myexperiment.org/comment.xml?id=251");
-    httpPut.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(("LOGIN" + ":" + "PASSWORD").getBytes())));
-    httpPut.addHeader("Accept", "application/xml");
-    httpPut.addHeader("Content-Type", "application/xml");
-    httpPut.setEntity(new StringEntity("<comment><subject resource=\"http://sandbox.myexperiment.org/files/226\"/><comment>12345678</comment></comment>"));
-    performHTTPRequest(httpPut);
-  }
-  
-  
-  private void doDELETE() {
-    HttpDelete httpDelete = new HttpDelete("http://sandbox.myexperiment.org/comment.xml?id=251");
-    httpDelete.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(("LOGIN" + ":" + "PASSWORD").getBytes())));
-    httpDelete.addHeader("Accept", "application/xml");
-    performHTTPRequest(httpDelete);
-  }
-  
-  
-  private void performHTTPRequest(HttpRequestBase httpRequest) {
-    try {
-      StringBuilder responseStr = new StringBuilder();
-      // ---------------------------------------------
-      
-      HttpClient httpClient = new DefaultHttpClient();
-      HttpContext localContext = new BasicHttpContext();
-      
-      HttpResponse response = httpClient.execute(httpRequest, localContext);
-      // ---
-      // TRACK WHERE THE FINAL REDIRECT ENDS UP - target host + URI
-      HttpHost target = (HttpHost) localContext.getAttribute(ExecutionContext.HTTP_TARGET_HOST);
-      HttpUriRequest req = (HttpUriRequest) localContext.getAttribute(ExecutionContext.HTTP_REQUEST);
-
-      responseStr.append("Final request URI: " + req.getMethod() + " " + target + req.getURI() + "\n");
-//      System.out.println("Target host: " + target);
-//      System.out.println("Final request URI: " + req.getURI());
-//      System.out.println("Final request method: " + req.getMethod());
-      // ---
-      responseStr.append(response.getStatusLine() + "\n");
-      
-      HttpEntity entity = response.getEntity();
-      responseStr.append(entity.getContentType() + "\n\n");
-      
-      if (entity != null) {
-        InputStream in = entity.getContent();
-        BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-        
-        String str;
-        while ((str = reader.readLine()) != null) {
-          responseStr.append(str + "\n");
-        }
-        
-        taResponse.setText(responseStr.toString());
-        taResponse.setCaretPosition(0);
-      }
-      
-      httpClient.getConnectionManager().shutdown();
-    }
-    catch (Exception ex) {
-      taResponse.setText(ex.getMessage() + "\n\n" + ex.getStackTrace());
-    }
-  }
-  
-  
-  public static void main(String[] args)
-  {
-    ApacheHttpClientUsageTest frame = new ApacheHttpClientUsageTest();
-    frame.setVisible(true);
-    frame.tfAddressBar.setCaretPosition(frame.tfAddressBar.getText().length());
-  }
-  
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/08c302d4/taverna-rest-activity/src/test/java/org/apache/taverna/activities/rest/ExampleActivityTest.java.bak
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/src/test/java/org/apache/taverna/activities/rest/ExampleActivityTest.java.bak b/taverna-rest-activity/src/test/java/org/apache/taverna/activities/rest/ExampleActivityTest.java.bak
deleted file mode 100644
index 977db27..0000000
--- a/taverna-rest-activity/src/test/java/org/apache/taverna/activities/rest/ExampleActivityTest.java.bak
+++ /dev/null
@@ -1,153 +0,0 @@
-package org.apache.taverna.activities.rest;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.net.URI;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.taverna.activities.testutils.ActivityInvoker;
-import org.apache.taverna.reference.ErrorDocument;
-import org.apache.taverna.reference.ExternalReferenceSPI;
-import org.apache.taverna.workflowmodel.OutputPort;
-import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
-import org.apache.taverna.workflowmodel.processor.activity.ActivityInputPort;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class ExampleActivityTest {
-
-	private RESTActivityConfigurationBean configBean;
-
-	private RESTActivity activity = new RESTActivity();
-
-	@Before
-	public void makeConfigBean() throws Exception {
-		configBean = new RESTActivityConfigurationBean();
-		configBean.setExampleString("something");
-		configBean
-				.setExampleUri(URI.create("http://localhost:8080/myEndPoint"));
-	}
-
-	@Test(expected = ActivityConfigurationException.class)
-	public void invalidConfiguration() throws ActivityConfigurationException {
-		RESTActivityConfigurationBean invalidBean = new RESTActivityConfigurationBean();
-		invalidBean.setExampleString("invalidExample");
-		// Should throw ActivityConfigurationException
-		activity.configure(invalidBean);
-	}
-
-	@Test
-	public void executeAsynch() throws Exception {
-		activity.configure(configBean);
-
-		Map<String, Object> inputs = new HashMap<String, Object>();
-		inputs.put("firstInput", "hello");
-
-		Map<String, Class<?>> expectedOutputTypes = new HashMap<String, Class<?>>();
-		expectedOutputTypes.put("simpleOutput", String.class);
-		expectedOutputTypes.put("moreOutputs", ExternalReferenceSPI.class);
-
-		Map<String, Object> outputs = ActivityInvoker.invokeAsyncActivity(
-				activity, inputs, expectedOutputTypes);
-
-		assertEquals("Unexpected outputs", 2, outputs.size());
-		assertEquals("da39a3ee5e6b4b0d3255bfef95601890afd80709", outputs.get("simpleOutput"));
-		ErrorDocument errorDoc = (ErrorDocument) outputs.get("moreOutputs");
-		assertEquals("java.lang.Exception: There are no more values",
-		             errorDoc.getExceptionMessage());
-
-	}
-	
-	
-	
-	@Test
-  public void checksumOfExtraData() throws Exception {
-    configBean.setExampleString("specialCase");
-	  activity.configure(configBean);
-
-    Map<String, Object> inputs = new HashMap<String, Object>();
-    inputs.put("firstInput", "hello");
-    inputs.put("extraData", Arrays.asList("Test1".getBytes("utf8"),
-        "Test2".getBytes("utf8")));
-
-
-    Map<String, Class<?>> expectedOutputTypes = new HashMap<String, Class<?>>();
-    expectedOutputTypes.put("simpleOutput", String.class);
-    expectedOutputTypes.put("moreOutputs", ExternalReferenceSPI.class);
-    expectedOutputTypes.put("report", String.class);
-
-
-    Map<String, Object> outputs = ActivityInvoker.invokeAsyncActivity(
-        activity, inputs, expectedOutputTypes);
-
-    assertEquals("Unexpected outputs", 3, outputs.size());
-    assertEquals("35bceb434ff8e69fb89b829e461c921a28b423b3", outputs.get("simpleOutput"));
-    ErrorDocument errorDoc = (ErrorDocument) outputs.get("moreOutputs");
-    assertEquals("java.lang.Exception: There are no more values",
-                 errorDoc.getExceptionMessage());
-
-  }
-	
-	
-
-	@Test
-	public void reConfiguredActivity() throws Exception {
-		assertEquals("Unexpected inputs", 0, activity.getInputPorts().size());
-		assertEquals("Unexpected outputs", 0, activity.getOutputPorts().size());
-
-		activity.configure(configBean);
-		assertEquals("Unexpected inputs", 1, activity.getInputPorts().size());
-		assertEquals("Unexpected outputs", 2, activity.getOutputPorts().size());
-
-		activity.configure(configBean);
-		// Should not change on reconfigure
-		assertEquals("Unexpected inputs", 1, activity.getInputPorts().size());
-		assertEquals("Unexpected outputs", 2, activity.getOutputPorts().size());
-	}
-
-	@Test
-	public void reConfiguredSpecialPorts() throws Exception {
-		activity.configure(configBean);
-
-		RESTActivityConfigurationBean specialBean = new RESTActivityConfigurationBean();
-		specialBean.setExampleString("specialCase");
-		specialBean.setExampleUri(URI
-				.create("http://localhost:8080/myEndPoint"));
-		activity.configure(specialBean);		
-		// Should now have added the optional ports
-		assertEquals("Unexpected inputs", 2, activity.getInputPorts().size());
-		assertEquals("Unexpected outputs", 3, activity.getOutputPorts().size());
-	}
-
-	@Test
-	public void configureActivity() throws Exception {
-		Set<String> expectedInputs = new HashSet<String>();
-		expectedInputs.add("firstInput");
-
-		Set<String> expectedOutputs = new HashSet<String>();
-		expectedOutputs.add("simpleOutput");
-		expectedOutputs.add("moreOutputs");
-
-		activity.configure(configBean);
-
-		Set<ActivityInputPort> inputPorts = activity.getInputPorts();
-		assertEquals(expectedInputs.size(), inputPorts.size());
-		for (ActivityInputPort inputPort : inputPorts) {
-			assertTrue("Wrong input : " + inputPort.getName(), expectedInputs
-					.remove(inputPort.getName()));
-		}
-
-		Set<OutputPort> outputPorts = activity.getOutputPorts();
-		assertEquals(expectedOutputs.size(), outputPorts.size());
-		for (OutputPort outputPort : outputPorts) {
-			assertTrue("Wrong output : " + outputPort.getName(),
-					expectedOutputs.remove(outputPort.getName()));
-		}
-	}
-}


[19/28] incubator-taverna-common-activities git commit: Use externally loaded WSDL (if available)

Posted by st...@apache.org.
Use externally loaded WSDL (if available)

as these WSDL/XSDs are not Apache-license compatible


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/0fec6f04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/0fec6f04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/0fec6f04

Branch: refs/heads/cwl-browse
Commit: 0fec6f04578106d733756a78f97d24715d70ac7c
Parents: 9b40ef3
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Apr 28 16:44:30 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Apr 28 16:44:30 2016 +0100

----------------------------------------------------------------------
 taverna-wsdl-activity/pom.xml                   |   8 +
 .../activities/wsdl/WSRFActivityTest.java       |  16 +-
 .../wsrf/counterService/CounterService_.wsdl    |   9 -
 .../wsdl/wsrf/counterService/WS-Addressing.xsd  | 121 --------
 .../wsdl/wsrf/counterService/WS-BaseFaults.xsd  |  47 ---
 .../wsdl/wsrf/counterService/WS-BaseN.wsdl      | 298 -------------------
 .../wsdl/wsrf/counterService/WS-BaseN.xsd       |  50 ----
 .../counterService/WS-ResourceLifetime.wsdl     | 117 --------
 .../wsrf/counterService/WS-ResourceLifetime.xsd |  26 --
 .../counterService/WS-ResourceProperties.wsdl   | 240 ---------------
 .../counterService/WS-ResourceProperties.xsd    |  42 ---
 .../wsrf/counterService/counter_bindings.wsdl   | 157 ----------
 .../wsrf/counterService/counter_flattened.wsdl  | 111 -------
 .../activities/wsdl/wsrf/counterService/xml.xsd | 105 -------
 .../taverna/wsdl/testutils/WSDLTestHelper.java  |   2 -
 15 files changed, 18 insertions(+), 1331 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0fec6f04/taverna-wsdl-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/pom.xml b/taverna-wsdl-activity/pom.xml
index 1fbc097..89d10ae 100644
--- a/taverna-wsdl-activity/pom.xml
+++ b/taverna-wsdl-activity/pom.xml
@@ -59,6 +59,14 @@
 			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>taverna-wsdl-generic</artifactId>
 			<version>${project.parent.version}</version>
+			<type>test-jar</type>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.parent.groupId}</groupId>
+			<artifactId>taverna-wsdl-generic</artifactId>
+			<version>${project.parent.version}</version>			
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.taverna.engine</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0fec6f04/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/WSRFActivityTest.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/WSRFActivityTest.java b/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/WSRFActivityTest.java
index 887ff88..dad2f4b 100644
--- a/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/WSRFActivityTest.java
+++ b/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/WSRFActivityTest.java
@@ -19,12 +19,18 @@
 
 package org.apache.taverna.activities.wsdl;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+
 import javax.xml.namespace.QName;
 import javax.xml.soap.MessageFactory;
 import javax.xml.soap.SOAPConstants;
@@ -33,15 +39,13 @@ import javax.xml.soap.SOAPEnvelope;
 import javax.xml.soap.SOAPHeader;
 import javax.xml.soap.SOAPHeaderElement;
 import javax.xml.soap.SOAPMessage;
+
 import org.apache.taverna.wsdl.parser.WSDLParser;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import org.apache.taverna.wsdl.testutils.WSDLTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
-public class WSRFActivityTest {
+public class WSRFActivityTest extends WSDLTestHelper {
 
 	public class DummyInvoker extends T2WSDLSOAPInvoker {
 
@@ -65,7 +69,7 @@ public class WSRFActivityTest {
 	@Before
 	public void makeWSDLParser() throws Exception {
 		String path = "wsrf/counterService/CounterService_.wsdl";
-		counterServiceWSDL = getClass().getResource(path);
+		counterServiceWSDL = getResource(path);
 		assertNotNull("Coult not find test WSDL " + path, counterServiceWSDL);
 		wsdlParser = new WSDLParser(counterServiceWSDL.toExternalForm());
 	}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0fec6f04/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/CounterService_.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/CounterService_.wsdl b/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/CounterService_.wsdl
deleted file mode 100644
index 7e628e0..0000000
--- a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/CounterService_.wsdl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="Counter" targetNamespace="http://counter.com/service" xmlns:binding="http://counter.com/bindings" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:import location="counter_bindings.wsdl" namespace="http://counter.com/bindings"/>
-  <wsdl:service name="CounterService">
-    <wsdl:port binding="binding:CounterPortTypeSOAPBinding" name="CounterPortTypePort">
-      <soap:address location="http://localhost:8080/wsrf/services/CounterService"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0fec6f04/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-Addressing.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-Addressing.xsd b/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-Addressing.xsd
deleted file mode 100644
index 008c65e..0000000
--- a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-Addressing.xsd
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Legal Disclaimer
-
-The presentation, distribution or other dissemination of the information 
-contained in this document is not a license, either expressly or impliedly, 
-to any intellectual property owned or controlled by BEA or IBM or Microsoft
-and\or any other third party.  BEA and IBM and Microsoft and\or any other
-third party may have patents, patent applications, trademarks, copyrights, 
-or other intellectual property rights covering subject matter in this 
-document.  The furnishing of this document does not give you any license 
-to BEA's and IBM's and Microsoft's or any other third party's patents, 
-trademarks, copyrights, or other intellectual property.
-
-This document and the information contained herein is provided on an "AS IS"
-basis and to the maximum extent permitted by applicable law, BEA and IBM 
-and Microsoft provide the document AS IS AND WITH ALL FAULTS, and hereby 
-disclaims all other warranties and conditions, either express, implied or 
-statutory, including, but not limited to, any (if any) implied warranties, 
-duties or conditions of merchantability, of fitness for a particular 
-purpose, of accuracy or completeness of responses, of results, of 
-workmanlike effort, of lack of viruses, and of lack of negligence, all with
-regard to the document. ALSO, THERE IS NO WARRANTY OR CONDITION OF 
-TITLE, QUIET ENJOYMENT, QUIET POSSESSION, CORRESPONDENCE TO DESCRIPTION OR 
-NON-INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS WITH REGARD TO THE 
-DOCUMENT.
-
-IN NO EVENT WILL BEA or IBM or MICROSOFT BE LIABLE TO ANY OTHER PARTY FOR THE
-COST OF PROCURING SUBSTITUTE GOODS OR SERVICES, LOST PROFITS, LOSS OF USE, 
-LOSS OF DATA, OR ANY INCIDENTAL, CONSEQUENTIAL, DIRECT, INDIRECT, OR SPECIAL 
-DAMAGES WHETHER UNDER CONTRACT, TORT, WARRANTY, OR OTHERWISE, ARISING IN ANY 
-WAY OUT OF THIS OR ANY OTHER AGREEMENT RELATING TO THIS DOCUMENT, WHETHER OR 
-NOT SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Copyright Notice
-
-Copyright 2003,2004 BEA Systems Inc. and IBM Corporation and Microsoft Corporation. All rights reserved.--><xs:schema targetNamespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" elementFormDefault="qualified" blockDefault="#all" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
-  <!--//////////////////// WS-Addressing ////////////////////-->
-  <!--Endpoint reference-->
-  <xs:element name="EndpointReference" type="wsa:EndpointReferenceType"/>
-  <xs:complexType name="EndpointReferenceType">
-    <xs:sequence>
-      <xs:element name="Address" type="wsa:AttributedURI"/>
-      <xs:element name="ReferenceProperties" type="wsa:ReferencePropertiesType" minOccurs="0"/>
-      <xs:element name="PortType" type="wsa:AttributedQName" minOccurs="0"/>
-      <xs:element name="ServiceName" type="wsa:ServiceNameType" minOccurs="0"/>
-      <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-        <xs:annotation>
-          <xs:documentation>If "Policy" elements from namespace "http://schemas.xmlsoap.org/ws/2002/12/policy#policy" are used, they must appear first (before any extensibility elements).</xs:documentation>
-        </xs:annotation>
-      </xs:any>
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-  </xs:complexType>
-  <xs:complexType name="ReferencePropertiesType">
-    <xs:sequence>
-      <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="ServiceNameType">
-    <xs:simpleContent>
-      <xs:extension base="xs:QName">
-        <xs:attribute name="PortName" type="xs:NCName"/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <!--Message information header blocks-->
-  <xs:element name="MessageID" type="wsa:AttributedURI"/>
-  <xs:element name="RelatesTo" type="wsa:Relationship"/>
-  <xs:element name="To" type="wsa:AttributedURI"/>
-  <xs:element name="Action" type="wsa:AttributedURI"/>
-  <xs:element name="From" type="wsa:EndpointReferenceType"/>
-  <xs:element name="ReplyTo" type="wsa:EndpointReferenceType"/>
-  <xs:element name="FaultTo" type="wsa:EndpointReferenceType"/>
-  <xs:complexType name="Relationship">
-    <xs:simpleContent>
-      <xs:extension base="xs:anyURI">
-        <xs:attribute name="RelationshipType" type="xs:QName" use="optional"/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:simpleType name="RelationshipTypeValues">
-    <xs:restriction base="xs:QName">
-      <xs:enumeration value="wsa:Reply"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:element name="ReplyAfter"/>
-  <xs:complexType name="ReplyAfterType">
-    <xs:simpleContent>
-      <xs:extension base="xs:nonNegativeInteger">
-        <xs:anyAttribute namespace="##other"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:simpleType name="FaultSubcodeValues">
-    <xs:restriction base="xs:QName">
-      <xs:enumeration value="wsa:InvalidMessageInformationHeader"/>
-      <xs:enumeration value="wsa:MessageInformationHeaderRequired"/>
-      <xs:enumeration value="wsa:DestinationUnreachable"/>
-      <xs:enumeration value="wsa:ActionNotSupported"/>
-      <xs:enumeration value="wsa:EndpointUnavailable"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:attribute name="Action" type="xs:anyURI"/>
-  <!--Common declarations and definitions-->
-  <xs:complexType name="AttributedQName">
-    <xs:simpleContent>
-      <xs:extension base="xs:QName">
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="AttributedURI">
-    <xs:simpleContent>
-      <xs:extension base="xs:anyURI">
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-</xs:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0fec6f04/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-BaseFaults.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-BaseFaults.xsd b/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-BaseFaults.xsd
deleted file mode 100644
index 87d3798..0000000
--- a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-BaseFaults.xsd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director. 
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director. 
-
-Copyright (C) OASIS Open (2004). All Rights Reserved. 
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd">
-  <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd">
-    <xsd:annotation>
-      <xsd:documentation>Get access to the xml: attribute groups for xml:lang as declared on 'schema'
-        and 'documentation' below</xsd:documentation>
-    </xsd:annotation>
-  </xsd:import>
-  <!--====================== BaseFault Types =======================-->
-  <xsd:element name="BaseFault" type="wsbf:BaseFaultType"/>
-  <xsd:complexType name="BaseFaultType">
-    <xsd:sequence>
-      <xsd:element name="Timestamp" type="xsd:dateTime" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="Originator" type="wsa:EndpointReferenceType" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="ErrorCode" minOccurs="0" maxOccurs="1">
-        <xsd:complexType>
-          <xsd:complexContent mixed="true">
-            <xsd:extension base="xsd:anyType">
-              <xsd:attribute name="dialect" type="xsd:anyURI" use="required"/>
-            </xsd:extension>
-          </xsd:complexContent>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="Description" minOccurs="0" maxOccurs="unbounded">
-        <xsd:complexType>
-          <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-              <xsd:attribute ref="xml:lang" use="optional"/>
-            </xsd:extension>
-          </xsd:simpleContent>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="FaultCause" type="wsbf:BaseFaultType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0fec6f04/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-BaseN.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-BaseN.wsdl b/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-BaseN.wsdl
deleted file mode 100644
index 418e66c..0000000
--- a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-BaseN.wsdl
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><wsdl:definitions name="WS-BaseNotification" targetNamespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2002/12/policy" xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" xmlns:wsrp="http://docs.oasi
 s-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:wsrl="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl">
-  <!--========================== Imports ===========================-->
-  <wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" location="WS-ResourceProperties.wsdl"/>
-  <wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" location="WS-ResourceLifetime.wsdl"/>
-  <!--===================== Types Definitions ======================-->
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified">
-      <xsd:include schemaLocation="WS-BaseN.xsd"/>
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" schemaLocation="WS-BaseFaults.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" schemaLocation="WS-ResourceProperties.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" schemaLocation="WS-ResourceLifetime.xsd"/>
-      <!--=============== Resource Property Related  ===================-->
-      <!--======== Resource Properties for NotificationProducer ========-->
-      <xsd:element name="NotificationProducerRP">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element ref="wsnt:Topic" minOccurs="1" maxOccurs="unbounded"/>
-            <xsd:element ref="wsnt:FixedTopicSet" minOccurs="1" maxOccurs="1"/>
-            <xsd:element ref="wsnt:TopicExpressionDialects" minOccurs="1" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--======== Resource Properties for SubscriptionManager =========-->
-      <xsd:element name="SubscriptionManagerRP">
-        <xsd:complexType>
-          <xsd:sequence>
-            <!--From WS-ResourceLifetime ScheduledResourceTermination-->
-            <xsd:element ref="wsrl:CurrentTime" minOccurs="1" maxOccurs="1"/>
-            <xsd:element ref="wsrl:TerminationTime" minOccurs="1" maxOccurs="1"/>
-            <!--SubscriptionManager specific-->
-            <xsd:element ref="wsnt:ConsumerReference" minOccurs="1" maxOccurs="1"/>
-            <xsd:element ref="wsnt:TopicExpression" minOccurs="1" maxOccurs="1"/>
-            <xsd:element ref="wsnt:UseNotify" minOccurs="1" maxOccurs="1"/>
-            <xsd:element ref="wsnt:Precondition" minOccurs="0" maxOccurs="1"/>
-            <xsd:element ref="wsnt:Selector" minOccurs="0" maxOccurs="1"/>
-            <xsd:element ref="wsnt:SubscriptionPolicy" minOccurs="0" maxOccurs="1"/>
-            <xsd:element ref="wsnt:CreationTime" minOccurs="0" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--================== Message Helper Types  =====================-->
-      <xsd:complexType name="NotificationMessageHolderType">
-        <xsd:sequence>
-          <xsd:element name="Topic" type="wsnt:TopicExpressionType" minOccurs="1" maxOccurs="1"/>
-          <xsd:element name="ProducerReference" type="wsa:EndpointReferenceType" minOccurs="0" maxOccurs="1"/>
-          <xsd:element name="Message" type="xsd:anyType" minOccurs="1" maxOccurs="1"/>
-        </xsd:sequence>
-      </xsd:complexType>
-      <!--========== Message Types for NotificationConsumer  ===========-->
-      <xsd:element name="Notify">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="NotificationMessage" type="wsnt:NotificationMessageHolderType" minOccurs="1" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--========== Message Types for NotificationProducer  ===========-->
-      <xsd:element name="SubscribeResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="SubscriptionReference" type="wsa:EndpointReferenceType" minOccurs="0" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="GetCurrentMessage">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="Topic" type="wsnt:TopicExpressionType"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="GetCurrentMessageResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:complexType name="ResourceUnknownFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResourceUnknownFault" type="wsnt:ResourceUnknownFaultType"/>
-      <xsd:complexType name="SubscribeCreationFailedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="SubscribeCreationFailedFault" type="wsnt:SubscribeCreationFailedFaultType"/>
-      <xsd:complexType name="TopicPathDialectUnknownFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="TopicPathDialectUnknownFault" type="wsnt:TopicPathDialectUnknownFaultType"/>
-      <xsd:complexType name="InvalidTopicExpressionFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="InvalidTopicExpressionFault" type="wsnt:InvalidTopicExpressionFaultType"/>
-      <xsd:complexType name="TopicNotSupportedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="TopicNotSupportedFault" type="wsnt:TopicNotSupportedFaultType"/>
-      <xsd:complexType name="NoCurrentMessageOnTopicFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="NoCurrentMessageOnTopicFault" type="wsnt:NoCurrentMessageOnTopicFaultType"/>
-      <!--========== Message Types for SubscriptionManager  ===========-->
-      <xsd:element name="PauseSubscription">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:element name="PauseSubscriptionResponse">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:element name="ResumeSubscription">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:element name="ResumeSubscriptionResponse">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:complexType name="PauseFailedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="PauseFailedFault" type="wsnt:PauseFailedFaultType"/>
-      <xsd:complexType name="ResumeFailedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResumeFailedFault" type="wsnt:ResumeFailedFaultType"/>
-    </xsd:schema>
-  </wsdl:types>
-  <!--================ NotificationConsumer::Notify ================ 
-  Notify(
-    NotificationMessage
-      (TopicExpression, ProducerReference, Message)*
-  returns: n/a (one way)-->
-  <wsdl:message name="Notify">
-    <wsdl:part name="Notify" element="wsnt:Notify"/>
-  </wsdl:message>
-  <!--============== NotificationProducer::Subscribe =============== 
-  Subscribe(
-   (ConsumerEndpointReference, TopicExpression, [UseNotify],
-   [Precondition], [Selector], [SubscriptionPolicy], 
-   [InitialTerminationTime])   
-  returns: WS-Resource qualified EPR to a Subscription-->
-  <wsdl:message name="SubscribeRequest">
-    <wsdl:part name="SubscribeRequest" element="wsnt:Subscribe"/>
-  </wsdl:message>
-  <wsdl:message name="SubscribeResponse">
-    <wsdl:part name="SubscribeResponse" element="wsnt:SubscribeResponse"/>
-  </wsdl:message>
-  <wsdl:message name="ResourceUnknownFault">
-    <part name="ResourceUnknownFault" element="wsnt:ResourceUnknownFault"/>
-  </wsdl:message>
-  <wsdl:message name="SubscribeCreationFailedFault">
-    <part name="SubscribeCreationFailedFault" element="wsnt:SubscribeCreationFailedFault"/>
-  </wsdl:message>
-  <wsdl:message name="TopicPathDialectUnknownFault">
-    <part name="TopicPathDialectUnknownFault" element="wsnt:TopicPathDialectUnknownFault"/>
-  </wsdl:message>
-  <!--========== NotificationProducer::GetCurrentMessage =========== 
-  GetCurrentMessage(topicExpression)
-  returns: a NotificationMessage (xsd:any)-->
-  <wsdl:message name="GetCurrentMessageRequest">
-    <wsdl:part name="GetCurrentMessageRequest" element="wsnt:GetCurrentMessage"/>
-  </wsdl:message>
-  <wsdl:message name="GetCurrentMessageResponse">
-    <wsdl:part name="GetCurrentMessageResponse" element="wsnt:GetCurrentMessageResponse"/>
-  </wsdl:message>
-  <wsdl:message name="InvalidTopicExpressionFault">
-    <part name="InvalidTopicExpressionFault" element="wsnt:InvalidTopicExpressionFault"/>
-  </wsdl:message>
-  <wsdl:message name="TopicNotSupportedFault">
-    <part name="TopicNotSupportedFault" element="wsnt:TopicNotSupportedFault"/>
-  </wsdl:message>
-  <wsdl:message name="NoCurrentMessageOnTopicFault">
-    <part name="NoCurrentMessageOnTopicFault" element="wsnt:NoCurrentMessageOnTopicFault"/>
-  </wsdl:message>
-  <!--========== SubscriptionManager::PauseSubscription ============
-   PauseSubscription()
-   returns: empty-->
-  <wsdl:message name="PauseSubscriptionRequest">
-    <wsdl:part name="PauseSubscriptionRequest" element="wsnt:PauseSubscription"/>
-  </wsdl:message>
-  <wsdl:message name="PauseSubscriptionResponse">
-    <wsdl:part name="PauseSubscriptionResponse" element="wsnt:PauseSubscriptionResponse"/>
-  </wsdl:message>
-  <wsdl:message name="PauseFailedFault">
-    <part name="PauseFailedFault" element="wsnt:PauseFailedFault"/>
-  </wsdl:message>
-  <!--========= SubscriptionManager::ResumeSubscription ============
-   ResumeSubscription()
-   returns: empty-->
-  <wsdl:message name="ResumeSubscriptionRequest">
-    <wsdl:part name="ResumeSubscriptionRequest" element="wsnt:ResumeSubscription"/>
-  </wsdl:message>
-  <wsdl:message name="ResumeSubscriptionResponse">
-    <wsdl:part name="ResumeSubscriptionResponse" element="wsnt:ResumeSubscriptionResponse"/>
-  </wsdl:message>
-  <wsdl:message name="ResumeFailedFault">
-    <part name="ResumeFailedFault" element="wsnt:ResumeFailedFault"/>
-  </wsdl:message>
-  <!--=================== PortType Definitions =====================-->
-  <!--========= NotificationConsumer PortType Definition ===========-->
-  <wsdl:portType name="NotificationConsumer">
-    <wsdl:operation name="Notify">
-      <wsdl:input message="wsntw:Notify" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/Notify"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <!--========= NotificationProducer PortType Definition ===========-->
-  <wsdl:portType name="NotificationProducer" wsrp:ResourceProperties="wsnt:NotificationProducerRP">
-    <!--========== extends wsrpw:ResourceProperties =============-->
-    <wsdl:operation name="GetResourceProperty">
-      <wsdl:input name="GetResourcePropertyRequest" message="wsrpw:GetResourcePropertyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:output name="GetResourcePropertyResponse" message="wsrpw:GetResourcePropertyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourcePropertyResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-    </wsdl:operation>
-    <!--=========== NotificationProducer Specific ==============-->
-    <wsdl:operation name="Subscribe">
-      <wsdl:input message="wsntw:SubscribeRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/Subscribe"/>
-      <wsdl:output message="wsntw:SubscribeResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/SubscribeResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-      <wsdl:fault name="SubscribeCreationFailedFault" message="wsntw:SubscribeCreationFailedFault"/>
-      <wsdl:fault name="TopicPathDialectUnknownFault" message="wsntw:TopicPathDialectUnknownFault"/>
-      <wsdl:fault name="InvalidTopicExpressionFault" message="wsntw:InvalidTopicExpressionFault"/>
-      <wsdl:fault name="TopicNotSupportedFault" message="wsntw:TopicNotSupportedFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="GetCurrentMessage">
-      <wsdl:input message="wsntw:GetCurrentMessageRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/GetCurrentMessage"/>
-      <wsdl:output message="wsntw:GetCurrentMessageResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/GetCurrentMessageResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidTopicExpressionFault" message="wsntw:InvalidTopicExpressionFault"/>
-      <wsdl:fault name="TopicNotSupportedFault" message="wsntw:TopicNotSupportedFault"/>
-      <wsdl:fault name="NoCurrentMessageOnTopicFault" message="wsntw:NoCurrentMessageOnTopicFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <!--========== SubscriptionManager PortType Definition ===========-->
-  <wsdl:portType name="SubscriptionManager" wsrp:ResourceProperties="wsnt:SubscriptionManagerRP">
-    <!--========== extends wsrpw:ResourceProperties =============-->
-    <wsdl:operation name="GetResourceProperty">
-      <wsdl:input name="GetResourcePropertyRequest" message="wsrpw:GetResourcePropertyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:output name="GetResourcePropertyResponse" message="wsrpw:GetResourcePropertyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourcePropertyResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-    </wsdl:operation>
-    <!--=== extends wsrlw:ImmediateResourceTermination ==========-->
-    <wsdl:operation name="Destroy">
-      <wsdl:input message="wsrlw:DestroyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/Destroy"/>
-      <wsdl:output message="wsrlw:DestroyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/DestroyResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrlw:ResourceUnknownFault"/>
-      <wsdl:fault name="ResourceNotDestroyedFault" message="wsrlw:ResourceNotDestroyedFault"/>
-    </wsdl:operation>
-    <!--=== extends wsrl:ScheduledResourceTermination ==========-->
-    <wsdl:operation name="SetTerminationTime">
-      <wsdl:input message="wsrlw:SetTerminationTimeRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTime"/>
-      <wsdl:output message="wsrlw:SetTerminationTimeResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTimeResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrlw:ResourceUnknownFault"/>
-      <wsdl:fault name="UnableToSetTerminationTimeFault" message="wsrlw:UnableToSetTerminationTimeFault"/>
-      <wsdl:fault name="TerminationTimeChangeRejectedFault" message="wsrlw:TerminationTimeChangeRejectedFault"/>
-    </wsdl:operation>
-    <!--========= SubscriptionManager specific operations ======-->
-    <wsdl:operation name="PauseSubscription">
-      <wsdl:input message="wsntw:PauseSubscriptionRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/PauseSubscription"/>
-      <wsdl:output message="wsntw:PauseSubscriptionResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/PauseSubscriptionResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-      <wsdl:fault name="PauseFailedFault" message="wsntw:PauseFailedFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="ResumeSubscription">
-      <wsdl:input message="wsntw:ResumeSubscriptionRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/ResumeSubscription"/>
-      <wsdl:output message="wsntw:ResumeSubscriptionResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/ResumeSubscriptionResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-      <wsdl:fault name="ResumeFailedFault" message="wsntw:ResumeFailedFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0fec6f04/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-BaseN.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-BaseN.xsd b/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-BaseN.xsd
deleted file mode 100644
index 9bdf6ae..0000000
--- a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-BaseN.xsd
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><xsd:schema targetNamespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd">
-  <!--======================== Imports  ============================-->
-  <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-  <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" schemaLocation="WS-ResourceProperties.xsd"/>
-  <!--========== Message Types for NotificationProducer  ===========-->
-  <xsd:element name="Subscribe">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="ConsumerReference" type="wsa:EndpointReferenceType" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="TopicExpression" type="wsnt:TopicExpressionType" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="UseNotify" type="xsd:boolean" default="true" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="Precondition" type="wsrp:QueryExpressionType" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="Selector" type="wsrp:QueryExpressionType" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="SubscriptionPolicy" type="xsd:anyType" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="InitialTerminationTime" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <!--================= Topic Expression Container =================-->
-  <xsd:complexType name="TopicExpressionType" mixed="true">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="1" processContents="lax"/>
-    </xsd:sequence>
-    <xsd:attribute name="Dialect" type="xsd:anyURI"/>
-  </xsd:complexType>
-  <xsd:element name="TopicExpression" type="wsnt:TopicExpressionType"/>
-  <!--=============== Resource Property Related  ===================-->
-  <!--======== Resource Properties for NotificationProducer ========-->
-  <xsd:element name="Topic" type="wsnt:TopicExpressionType"/>
-  <xsd:element name="FixedTopicSet" type="xsd:boolean"/>
-  <xsd:element name="TopicExpressionDialects" type="xsd:anyURI"/>
-  <!--======== Resource Properties for SubscriptionManager =========-->
-  <xsd:element name="ConsumerReference" type="wsa:EndpointReferenceType"/>
-  <xsd:element name="UseNotify" type="xsd:boolean"/>
-  <xsd:element name="Precondition" type="wsrp:QueryExpressionType"/>
-  <xsd:element name="Selector" type="wsrp:QueryExpressionType"/>
-  <xsd:element name="SubscriptionPolicy" type="xsd:anyType"/>
-  <xsd:element name="CreationTime" type="xsd:dateTime"/>
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0fec6f04/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-ResourceLifetime.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-ResourceLifetime.wsdl b/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-ResourceLifetime.wsdl
deleted file mode 100644
index 3d81ce5..0000000
--- a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-ResourceLifetime.wsdl
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><wsdl:definitions name="WS-ResourceLifetime" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsrl="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addr
 essing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema">
-      <xsd:include schemaLocation="WS-ResourceLifetime.xsd"/>
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" schemaLocation="WS-BaseFaults.xsd"/>
-      <!--==== Resource Properties for ScheduledResourceTermination ====-->
-      <xsd:element name="ScheduledResourceTerminationRP">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="wsrl:CurrentTime"/>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="wsrl:TerminationTime"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--====== Message Types for ImmediateResourceTermination  =======-->
-      <xsd:element name="Destroy">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:element name="DestroyResponse">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:complexType name="ResourceUnknownFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResourceUnknownFault" type="wsrl:ResourceUnknownFaultType"/>
-      <xsd:complexType name="ResourceNotDestroyedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResourceNotDestroyedFault" type="wsrl:ResourceNotDestroyedFaultType"/>
-      <!--====== Message Types for ScheduledResourceTermination  =======-->
-      <xsd:element name="SetTerminationTime">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="RequestedTerminationTime" nillable="true" type="xsd:dateTime"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="SetTerminationTimeResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="NewTerminationTime" nillable="true" type="xsd:dateTime"/>
-            <xsd:element name="CurrentTime" type="xsd:dateTime"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:complexType name="UnableToSetTerminationTimeFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="UnableToSetTerminationTimeFault" type="wsrl:UnableToSetTerminationTimeFaultType"/>
-      <xsd:complexType name="TerminationTimeChangeRejectedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="TerminationTimeChangeRejectedFault" type="wsrl:TerminationTimeChangeRejectedFaultType"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="DestroyResponse">
-    <wsdl:part element="wsrl:DestroyResponse" name="DestroyResponse"/>
-  </wsdl:message>
-  <wsdl:message name="SetTerminationTimeRequest">
-    <wsdl:part element="wsrl:SetTerminationTime" name="SetTerminationTimeRequest"/>
-  </wsdl:message>
-  <wsdl:message name="ResourceUnknownFault">
-    <wsdl:part element="wsrl:ResourceUnknownFault" name="ResourceUnknownFault"/>
-  </wsdl:message>
-  <wsdl:message name="DestroyRequest">
-    <wsdl:part element="wsrl:Destroy" name="DestroyRequest"/>
-  </wsdl:message>
-  <wsdl:message name="UnableToSetTerminationTimeFault">
-    <wsdl:part element="wsrl:UnableToSetTerminationTimeFault" name="UnableToSetTerminationTimeFault"/>
-  </wsdl:message>
-  <wsdl:message name="SetTerminationTimeResponse">
-    <wsdl:part element="wsrl:SetTerminationTimeResponse" name="SetTerminationTimeResponse"/>
-  </wsdl:message>
-  <wsdl:message name="ResourceNotDestroyedFault">
-    <wsdl:part element="wsrl:ResourceNotDestroyedFault" name="ResourceNotDestroyedFault"/>
-  </wsdl:message>
-  <wsdl:message name="TerminationTimeChangeRejectedFault">
-    <wsdl:part element="wsrl:TerminationTimeChangeRejectedFault" name="TerminationTimeChangeRejectedFault"/>
-  </wsdl:message>
-  <wsdl:portType name="ScheduledResourceTermination" wsrp:ResourceProperties="wsrl:ScheduledResourceTerminationRP">
-    <wsdl:operation name="SetTerminationTime">
-      <wsdl:input message="wsrlw:SetTerminationTimeRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTime"/>
-      <wsdl:output message="wsrlw:SetTerminationTimeResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTimeResponse"/>
-      <wsdl:fault message="wsrlw:UnableToSetTerminationTimeFault" name="UnableToSetTerminationTimeFault"/>
-      <wsdl:fault message="wsrlw:ResourceUnknownFault" name="ResourceUnknownFault"/>
-      <wsdl:fault message="wsrlw:TerminationTimeChangeRejectedFault" name="TerminationTimeChangeRejectedFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="ImmediateResourceTermination">
-    <wsdl:operation name="Destroy">
-      <wsdl:input message="wsrlw:DestroyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/Destroy"/>
-      <wsdl:output message="wsrlw:DestroyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/DestroyResponse"/>
-      <wsdl:fault message="wsrlw:ResourceNotDestroyedFault" name="ResourceNotDestroyedFault"/>
-      <wsdl:fault message="wsrlw:ResourceUnknownFault" name="ResourceUnknownFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0fec6f04/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-ResourceLifetime.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-ResourceLifetime.xsd b/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-ResourceLifetime.xsd
deleted file mode 100644
index a6dbef7..0000000
--- a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-ResourceLifetime.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsrl="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd">
-  <!--=============== Resource Property Related  ===================-->
-  <!--==== Resource Properties for ScheduledResourceTermination ====-->
-  <xsd:element name="CurrentTime" type="xsd:dateTime"/>
-  <xsd:element name="TerminationTime" nillable="true" type="xsd:dateTime"/>
-  <!--============= Notification Message Related  ==================-->
-  <xsd:element name="TerminationNotification">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="TerminationTime" type="xsd:dateTime" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="TerminationReason" type="xsd:anyType" minOccurs="0" maxOccurs="1"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0fec6f04/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-ResourceProperties.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-ResourceProperties.wsdl b/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-ResourceProperties.wsdl
deleted file mode 100644
index 267066a..0000000
--- a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-ResourceProperties.wsdl
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><wsdl:definitions name="WS-ResourceProperties" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl">
-  <!--===================== Types Definitions ======================-->
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified">
-      <xsd:include schemaLocation="WS-ResourceProperties.xsd"/>
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" schemaLocation="WS-BaseFaults.xsd"/>
-      <!--========== Message Types for GetResourceProperty  ============-->
-      <xsd:element name="GetResourceProperty" type="xsd:QName"/>
-      <xsd:element name="GetResourcePropertyResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any minOccurs="0" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:complexType name="ResourceUnknownFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResourceUnknownFault" type="wsrp:ResourceUnknownFaultType"/>
-      <xsd:complexType name="InvalidResourcePropertyQNameFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="InvalidResourcePropertyQNameFault" type="wsrp:InvalidResourcePropertyQNameFaultType"/>
-      <!--====== Message Types for GetMultipleResourceProperties =======-->
-      <xsd:element name="GetMultipleResourceProperties">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="ResourceProperty" type="xsd:QName" minOccurs="1" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="GetMultipleResourcePropertiesResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any minOccurs="0" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--========= Message Types for SetResourceProperties ===========-->
-      <xsd:complexType name="InsertType">
-        <xsd:sequence>
-          <xsd:any processContents="lax" minOccurs="1" maxOccurs="unbounded"/>
-        </xsd:sequence>
-      </xsd:complexType>
-      <xsd:element name="Insert" type="wsrp:InsertType"/>
-      <xsd:complexType name="UpdateType">
-        <xsd:sequence>
-          <xsd:any processContents="lax" minOccurs="1" maxOccurs="unbounded"/>
-        </xsd:sequence>
-      </xsd:complexType>
-      <xsd:element name="Update" type="wsrp:UpdateType"/>
-      <xsd:complexType name="DeleteType">
-        <xsd:attribute name="ResourceProperty" type="xsd:QName" use="required"/>
-      </xsd:complexType>
-      <xsd:element name="Delete" type="wsrp:DeleteType"/>
-      <xsd:element name="SetResourceProperties">
-        <xsd:complexType>
-          <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element ref="wsrp:Insert"/>
-            <xsd:element ref="wsrp:Update"/>
-            <xsd:element ref="wsrp:Delete"/>
-          </xsd:choice>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="SetResourcePropertiesResponse">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:complexType name="InvalidSetResourcePropertiesRequestContentFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="InvalidSetResourcePropertiesRequestContentFault" type="wsrp:InvalidSetResourcePropertiesRequestContentFaultType"/>
-      <xsd:complexType name="UnableToModifyResourcePropertyFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="UnableToModifyResourcePropertyFault" type="wsrp:UnableToModifyResourcePropertyFaultType"/>
-      <xsd:complexType name="SetResourcePropertyRequestFailedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="SetResourcePropertyRequestFailedFault" type="wsrp:SetResourcePropertyRequestFailedFaultType"/>
-      <!--========= Message Types for QueryResourceProperties ==========-->
-      <xsd:element name="QueryResourceProperties">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element ref="wsrp:QueryExpression" minOccurs="1" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="QueryResourcePropertiesResponse">
-        <xsd:complexType mixed="true">
-          <xsd:sequence>
-            <xsd:any processContents="lax" minOccurs="1" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:complexType name="UnknownQueryExpressionDialectFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="UnknownQueryExpressionDialectFault" type="wsrp:UnknownQueryExpressionDialectFaultType"/>
-      <xsd:complexType name="InvalidQueryExpressionFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="InvalidQueryExpressionFault" type="wsrp:InvalidQueryExpressionFaultType"/>
-      <xsd:complexType name="QueryEvaluationErrorFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="QueryEvaluationErrorFault" type="wsrp:QueryEvaluationErrorFaultType"/>
-    </xsd:schema>
-  </wsdl:types>
-  <!--===================== GetResourceProperty ==================== 
-  GetResourceProperty(QName)
-  returns: any-->
-  <wsdl:message name="GetResourcePropertyRequest">
-    <wsdl:part name="GetResourcePropertyRequest" element="wsrp:GetResourceProperty"/>
-  </wsdl:message>
-  <wsdl:message name="GetResourcePropertyResponse">
-    <wsdl:part name="GetResourcePropertyResponse" element="wsrp:GetResourcePropertyResponse"/>
-  </wsdl:message>
-  <wsdl:message name="ResourceUnknownFault">
-    <part name="ResourceUnknownFault" element="wsrp:ResourceUnknownFault"/>
-  </wsdl:message>
-  <wsdl:message name="InvalidResourcePropertyQNameFault">
-    <part name="InvalidResourcePropertyQNameFault" element="wsrp:InvalidResourcePropertyQNameFault"/>
-  </wsdl:message>
-  <!--==============GetMultipleResourceProperties ================== 
-  GetMultipleResourceProperties(list of QName)
-  returns: sequence of any-->
-  <wsdl:message name="GetMultipleResourcePropertiesRequest">
-    <wsdl:part name="GetMultipleResourcePropertiesRequest" element="wsrp:GetMultipleResourceProperties"/>
-  </wsdl:message>
-  <wsdl:message name="GetMultipleResourcePropertiesResponse">
-    <wsdl:part name="GetMultipleResourcePropertiesResponse" element="wsrp:GetMultipleResourcePropertiesResponse"/>
-  </wsdl:message>
-  <!--================= SetResourceProperties ====================== 
-  SetResourceProperties(
-  { insert (any)* |
-    update (any)* |
-    delete@QName } + 
-  )
-  returns: empty-->
-  <wsdl:message name="SetResourcePropertiesRequest">
-    <wsdl:part name="SetResourcePropertiesRequest" element="wsrp:SetResourceProperties"/>
-  </wsdl:message>
-  <wsdl:message name="SetResourcePropertiesResponse">
-    <wsdl:part name="SetResourcePropertiesResponse" element="wsrp:SetResourcePropertiesResponse"/>
-  </wsdl:message>
-  <wsdl:message name="InvalidSetResourcePropertiesRequestContentFault">
-    <part name="InvalidSetResourcePropertiesRequestContentFault" element="wsrp:InvalidSetResourcePropertiesRequestContentFault"/>
-  </wsdl:message>
-  <wsdl:message name="UnableToModifyResourcePropertyFault">
-    <part name="UnableToModifyResourcePropertyFault" element="wsrp:UnableToModifyResourcePropertyFault"/>
-  </wsdl:message>
-  <wsdl:message name="SetResourcePropertyRequestFailedFault">
-    <part name="SetResourcePropertyRequestFailedFault" element="wsrp:SetResourcePropertyRequestFailedFault"/>
-  </wsdl:message>
-  <!--================ QueryResourceProperties ===================== 
-  QueryResourceProperties(QueryExpression)
-  returns: any-->
-  <wsdl:message name="QueryResourcePropertiesRequest">
-    <wsdl:part name="QueryResourcePropertiesRequest" element="wsrp:QueryResourceProperties"/>
-  </wsdl:message>
-  <wsdl:message name="QueryResourcePropertiesResponse">
-    <wsdl:part name="QueryResourcePropertiesResponse" element="wsrp:QueryResourcePropertiesResponse"/>
-  </wsdl:message>
-  <wsdl:message name="UnknownQueryExpressionDialectFault">
-    <part name="UnknownQueryExpressionDialectFault" element="wsrp:UnknownQueryExpressionDialectFault"/>
-  </wsdl:message>
-  <wsdl:message name="InvalidQueryExpressionFault">
-    <part name="InvalidQueryExpressionFault" element="wsrp:InvalidQueryExpressionFault"/>
-  </wsdl:message>
-  <wsdl:message name="QueryEvaluationErrorFault">
-    <part name="QueryEvaluationErrorFault" element="wsrp:QueryEvaluationErrorFault"/>
-  </wsdl:message>
-  <!--=================== PortType Definitions =====================-->
-  <wsdl:portType name="GetResourceProperty">
-    <wsdl:operation name="GetResourceProperty">
-      <wsdl:input name="GetResourcePropertyRequest" message="wsrpw:GetResourcePropertyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:output name="GetResourcePropertyResponse" message="wsrpw:GetResourcePropertyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourcePropertyResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="GetMultipleResourceProperties">
-    <wsdl:operation name="GetMultipleResourceProperties">
-      <wsdl:input name="GetMultipleResourcePropertiesRequest" message="wsrpw:GetMultipleResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourceProperties"/>
-      <wsdl:output name="GetMultipleResourcePropertiesResponse" message="wsrpw:GetMultipleResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourcePropertiesResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="SetResourceProperties">
-    <wsdl:operation name="SetResourceProperties">
-      <wsdl:input name="SetResourcePropertiesRequest" message="wsrpw:SetResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/SetResourceProperties"/>
-      <wsdl:output name="SetResourcePropertiesResponse" message="wsrpw:SetResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/SetResourcePropertiesResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidSetResourcePropertiesRequestContentFault" message="wsrpw:InvalidSetResourcePropertiesRequestContentFault"/>
-      <wsdl:fault name="UnableToModifyResourcePropertyFault" message="wsrpw:UnableToModifyResourcePropertyFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="SetResourcePropertyRequestFailedFault" message="wsrpw:SetResourcePropertyRequestFailedFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="QueryResourceProperties">
-    <wsdl:operation name="QueryResourceProperties">
-      <wsdl:input name="QueryResourcePropertiesRequest" message="wsrpw:QueryResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourceProperties"/>
-      <wsdl:output name="QueryResourcePropertiesResponse" message="wsrpw:QueryResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourcePropertiesResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="UnknownQueryExpressionDialectFault" message="wsrpw:UnknownQueryExpressionDialectFault"/>
-      <wsdl:fault name="InvalidQueryExpressionFault" message="wsrpw:InvalidQueryExpressionFault"/>
-      <wsdl:fault name="QueryEvaluationErrorFault" message="wsrpw:QueryEvaluationErrorFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0fec6f04/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-ResourceProperties.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-ResourceProperties.xsd b/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-ResourceProperties.xsd
deleted file mode 100644
index 1527149..0000000
--- a/taverna-wsdl-activity/src/test/resources/org/apache/taverna/activities/wsdl/wsrf/counterService/WS-ResourceProperties.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <!--======= Global Attribute Declaration for WSDL 1.1 portType====-->
-  <xsd:attribute name="ResourceProperties" type="xsd:QName"/>
-  <!--= Notification Message for ResourceProperties value change ===-->
-  <xsd:complexType name="ResourcePropertyValueChangeNotificationType">
-    <xsd:sequence>
-      <xsd:element name="OldValue" nillable="true" minOccurs="0" maxOccurs="1">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any minOccurs="1" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="NewValue" nillable="true" minOccurs="1" maxOccurs="1">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any minOccurs="1" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:element name="ResourcePropertyValueChangeNotification" type="wsrp:ResourcePropertyValueChangeNotificationType"/>
-  <xsd:complexType name="QueryExpressionType" mixed="true">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="1" processContents="lax"/>
-    </xsd:sequence>
-    <xsd:attribute name="Dialect" type="xsd:anyURI"/>
-  </xsd:complexType>
-  <xsd:element name="QueryExpression" type="wsrp:QueryExpressionType"/>
-</xsd:schema>
\ No newline at end of file


[26/28] incubator-taverna-common-activities git commit: TAVERNA-959: more Export Restrictions

Posted by st...@apache.org.
TAVERNA-959: more Export Restrictions


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/8e6553fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/8e6553fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/8e6553fd

Branch: refs/heads/cwl-browse
Commit: 8e6553fd43cf6e01a75d73adf73bd99c2418494e
Parents: 335831a
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sun May 1 19:05:21 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sun May 1 19:05:21 2016 +0100

----------------------------------------------------------------------
 README.md | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/8e6553fd/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index d77d70b..f139215 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ the actual workflow execution.
 
 (c) 2007-2014 University of Manchester
 
-(c) 2014-2015 Apache Software Foundation
+(c) 2014-2016 Apache Software Foundation
 
 This product includes software developed at The
 [Apache Software Foundation](http://www.apache.org/).
@@ -131,12 +131,23 @@ for both object code and source code.
 
 The following provides more details on the included cryptographic software:
 
-* `taverna-rest-activity` uses Apache HttpComponents SSL support if
-  accessing `https://` connections.
-* `taverna-wsdl-generic` and `taverna-wsdl-activity` uses 
-  Java Secure Socket Extension (JSSE),
-  Apache WSS4J and  Apache XML Security for Java if accessing
-  secure SOAP Web Services.
-* This software relies on Apache Taverna Engine's Credential Manager for
+* [taverna-rest-activity](taverna-rest-activity)
+  depend on
+  [Apache HttpComponents](https://hc.apache.org/) Client,
+  which can be configured to initiate
+  `https://` connections.
+* [taverna-wsdl-generic](taverna-wsdl-generic)
+  and [taverna-wsdl-activity](taverna-wsdl-activity) uses
+  [Java Secure Socket Extension](https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html)
+  (JSSE) and depend on
+  [Apache WSS4J](https://ws.apache.org/wss4j/),
+  [Apache XML Security for Java](https://santuario.apache.org/javaindex.html)
+  and [Open SAML Java](https://shibboleth.net/products/opensaml-java.html))
+  for accessing secure SOAP Web Services.
+* Apache Taverna Common Activities depends on the
+  [Apache Taverna Engine](http://taverna.incubator.apache.org/download/engine/)
+  Credential Manager API for
   management of username/password and client/server SSL certificates.
-
+* [taverna-interaction-activity](taverna-interaction-activity) depend on
+  [Jetty](http://www.eclipse.org/jetty/),
+  which includes UnixCrypt.java for one way cryptography.


[16/28] incubator-taverna-common-activities git commit: ASF header

Posted by st...@apache.org.
ASF header


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/ed5b18dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/ed5b18dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/ed5b18dc

Branch: refs/heads/cwl-browse
Commit: ed5b18dcbd7c5d737fb7d4fc24f0bfa4f23f242c
Parents: db41b59
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Apr 28 16:39:32 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Apr 28 16:39:32 2016 +0100

----------------------------------------------------------------------
 .../taverna/activities/externaltool/package.html   | 17 +++++++++++++++++
 .../taverna/activities/spreadsheet/package.html    | 17 +++++++++++++++++
 .../apache/taverna/activities/wsdl/package.html    | 17 +++++++++++++++++
 .../src/test/resources/log4j.properties            | 15 +++++++++++++++
 .../org/apache/taverna/wsdl/parser/package.html    | 17 +++++++++++++++++
 .../java/org/apache/taverna/wsdl/soap/package.html | 17 +++++++++++++++++
 .../src/test/resources/log4j.properties            | 15 +++++++++++++++
 7 files changed, 115 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ed5b18dc/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/package.html
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/package.html b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/package.html
index b07bedc..cb3f8cf 100644
--- a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/package.html
+++ b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/package.html
@@ -1,3 +1,20 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <body>
 Contains the activity classes required to interact with use cases.
 </body>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ed5b18dc/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/package.html
----------------------------------------------------------------------
diff --git a/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/package.html b/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/package.html
index 356b9b2..9b031bf 100644
--- a/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/package.html
+++ b/taverna-spreadsheet-import-activity/src/main/java/org/apache/taverna/activities/spreadsheet/package.html
@@ -1,3 +1,20 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <body>
 Contains the activity classes required to include spreadsheet files within a DataFlow.
 </body>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ed5b18dc/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/package.html
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/package.html b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/package.html
index e38a14e..0f2b17c 100644
--- a/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/package.html
+++ b/taverna-wsdl-activity/src/main/java/org/apache/taverna/activities/wsdl/package.html
@@ -1,3 +1,20 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <body>
 Contains the activity classes required to interact with a WSDL based web-service.
 </body>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ed5b18dc/taverna-wsdl-activity/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/resources/log4j.properties b/taverna-wsdl-activity/src/test/resources/log4j.properties
index e8980e5..b017fd9 100644
--- a/taverna-wsdl-activity/src/test/resources/log4j.properties
+++ b/taverna-wsdl-activity/src/test/resources/log4j.properties
@@ -1,3 +1,18 @@
+##  Licensed to the Apache Software Foundation (ASF) under one or more
+##  contributor license agreements.  See the NOTICE file distributed with
+##  this work for additional information regarding copyright ownership.
+##  The ASF licenses this file to You under the Apache License, Version 2.0
+##  (the "License"); you may not use this file except in compliance with
+##  the License.  You may obtain a copy of the License at
+##
+##  http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
+
 log4j.rootLogger=WARN, CONSOLE
 
 # Default output to console

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ed5b18dc/taverna-wsdl-generic/src/main/java/org/apache/taverna/wsdl/parser/package.html
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/main/java/org/apache/taverna/wsdl/parser/package.html b/taverna-wsdl-generic/src/main/java/org/apache/taverna/wsdl/parser/package.html
index 8fc2638..99dd5f6 100644
--- a/taverna-wsdl-generic/src/main/java/org/apache/taverna/wsdl/parser/package.html
+++ b/taverna-wsdl-generic/src/main/java/org/apache/taverna/wsdl/parser/package.html
@@ -1,3 +1,20 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <body>
 Contains classes required to parse a WSDL to discover and describe the operations and their input and output data structures.<br>
 These classes are derived heavily from the original parsing classes from the Taverna 1 WSDLBasedProcessor and have been refactored<br>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ed5b18dc/taverna-wsdl-generic/src/main/java/org/apache/taverna/wsdl/soap/package.html
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/main/java/org/apache/taverna/wsdl/soap/package.html b/taverna-wsdl-generic/src/main/java/org/apache/taverna/wsdl/soap/package.html
index 5fd36e5..9b584df 100644
--- a/taverna-wsdl-generic/src/main/java/org/apache/taverna/wsdl/soap/package.html
+++ b/taverna-wsdl-generic/src/main/java/org/apache/taverna/wsdl/soap/package.html
@@ -1,3 +1,20 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <body>
 Contains classes required to invoke an endpoint for a SOAP based web-service described by a WSDL.<br>
 These classes are derived heavily from the original parsing classes from the Taverna 1 WSDLBasedProcessor and have been refactored<br>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/ed5b18dc/taverna-wsdl-generic/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/log4j.properties b/taverna-wsdl-generic/src/test/resources/log4j.properties
index 3be01eb..78c6e06 100644
--- a/taverna-wsdl-generic/src/test/resources/log4j.properties
+++ b/taverna-wsdl-generic/src/test/resources/log4j.properties
@@ -1,3 +1,18 @@
+##  Licensed to the Apache Software Foundation (ASF) under one or more
+##  contributor license agreements.  See the NOTICE file distributed with
+##  this work for additional information regarding copyright ownership.
+##  The ASF licenses this file to You under the Apache License, Version 2.0
+##  (the "License"); you may not use this file except in compliance with
+##  the License.  You may obtain a copy of the License at
+##
+##  http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
+
 log4j.rootLogger=WARN, CONSOLE
 
 # Default output to console


[07/28] incubator-taverna-common-activities git commit: Moved third-party test WSDLs to https://github.com/taverna-extras/wsdl-generic-test-cases

Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_pmc.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_pmc.xsd b/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_pmc.xsd
deleted file mode 100644
index e5b697e..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_pmc.xsd
+++ /dev/null
@@ -1,5910 +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" -->
-    <!-- no mml, no xlink -->
-    
-    <!-- http://dtd.nlm.nih.gov/2.1/xsd/archivearticle.xsd  date: 01/10/2006-->
-
-  <xs:element name="copyright-holder">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="copyright-statement">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="copyright-year" type="xs:string"/>
-  <xs:element name="license">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tns:p"/>
-      </xs:sequence>
-      <xs:attribute type="xs:string" name="license-type"/>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="permissions">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="tns:copyright-statement"/>
-        <xs:element minOccurs="0" ref="tns:copyright-year"/>
-        <xs:element minOccurs="0" ref="tns:copyright-holder"/>
-        <xs:element minOccurs="0" ref="tns:license"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="article-title">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-        <xs:element ref="tns:break"/>
-      </xs:choice>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="aff">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:addr-line"/>
-        <xs:element ref="tns:country"/>
-        <xs:element ref="tns:fax"/>
-        <xs:element ref="tns:institution"/>
-        <xs:element ref="tns:phone"/>
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-        <xs:element ref="tns:break"/>
-        <xs:element ref="tns:label"/>
-        <xs:element ref="tns:x"/>
-      </xs:choice>
-      <xs:attribute name="id" type="xs:ID"/>
-      <xs:attribute name="rid" type="xs:IDREFS"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="collab">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-        <xs:element ref="tns:break"/>
-        <xs:element ref="tns:x"/>
-      </xs:choice>
-      <xs:attribute type="xs:string" name="collab-type"/>
-      <xs:attribute name="id" type="xs:ID"/>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="conf-date">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:day"/>
-        <xs:element ref="tns:month"/>
-        <xs:element ref="tns:season"/>
-        <xs:element ref="tns:year"/>
-        <xs:element ref="tns:x"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="conf-loc">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="conf-name">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="object-id">
-    <xs:complexType mixed="true">
-      <xs:attribute type="xs:string" name="pub-id-type"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="issn">
-    <xs:complexType mixed="true">
-      <xs:attribute type="xs:string" name="pub-type"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="issue">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="issue-id">
-    <xs:complexType mixed="true">
-      <xs:attribute type="xs:string" name="pub-id-type"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="issue-title">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="role">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="trans-subtitle">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-        <xs:element ref="tns:break"/>
-      </xs:choice>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="trans-title">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-        <xs:element ref="tns:break"/>
-      </xs:choice>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="volume-id">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-      <xs:attribute type="xs:string" name="pub-id-type"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="etal">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="publisher">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:publisher-name"/>
-        <xs:element minOccurs="0" ref="tns:publisher-loc"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="publisher-name">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="publisher-loc">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:addr-line"/>
-        <xs:element ref="tns:country"/>
-        <xs:element ref="tns:fax"/>
-        <xs:element ref="tns:institution"/>
-        <xs:element ref="tns:phone"/>
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-        <xs:element ref="tns:break"/>
-        <xs:element ref="tns:x"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="fpage">
-    <xs:complexType mixed="true">
-      <xs:attribute type="xs:string" name="seq"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="lpage" type="xs:string"/>
-  <xs:element name="page-range" type="xs:string"/>
-  <xs:element name="elocation-id">
-    <xs:complexType mixed="true">
-      <xs:attribute type="xs:string" name="seq"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="citation">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:label"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:access-date"/>
-        <xs:element ref="tns:annotation"/>
-        <xs:element ref="tns:article-title"/>
-        <xs:element ref="tns:collab"/>
-        <xs:element ref="tns:comment"/>
-        <xs:element ref="tns:conf-date"/>
-        <xs:element ref="tns:conf-loc"/>
-        <xs:element ref="tns:conf-name"/>
-        <xs:element ref="tns:day"/>
-        <xs:element ref="tns:edition"/>
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:elocation-id"/>
-        <xs:element ref="tns:etal"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:fpage"/>
-        <xs:element ref="tns:gov"/>
-        <xs:element ref="tns:isbn"/>
-        <xs:element ref="tns:issn"/>
-        <xs:element ref="tns:issue"/>
-        <xs:element ref="tns:issue-id"/>
-        <xs:element ref="tns:issue-title"/>
-        <xs:element ref="tns:lpage"/>
-        <xs:element ref="tns:month"/>
-        <xs:element ref="tns:name"/>
-        <xs:element ref="tns:object-id"/>
-        <xs:element ref="tns:page-count"/>
-        <xs:element ref="tns:page-range"/>
-        <xs:element ref="tns:patent"/>
-        <xs:element ref="tns:person-group"/>
-        <xs:element ref="tns:pub-id"/>
-        <xs:element ref="tns:publisher-loc"/>
-        <xs:element ref="tns:publisher-name"/>
-        <xs:element ref="tns:role"/>
-        <xs:element ref="tns:season"/>
-        <xs:element ref="tns:series"/>
-        <xs:element ref="tns:source"/>
-        <xs:element ref="tns:std"/>
-        <xs:element ref="tns:string-name"/>
-        <xs:element ref="tns:supplement"/>
-        <xs:element ref="tns:time-stamp"/>
-        <xs:element ref="tns:trans-source"/>
-        <xs:element ref="tns:trans-title"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:volume"/>
-        <xs:element ref="tns:volume-id"/>
-        <xs:element ref="tns:year"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-        <xs:element ref="tns:x"/>
-      </xs:choice>
-      <xs:attribute type="xs:string" name="citation-type"/>
-      <xs:attribute name="id" type="xs:ID"/>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="address">
-    <xs:complexType>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:addr-line"/>
-        <xs:element ref="tns:country"/>
-        <xs:element ref="tns:fax"/>
-        <xs:element ref="tns:institution"/>
-        <xs:element ref="tns:phone"/>
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-      </xs:choice>
-      <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="addr-line">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="country" type="xs:string"/>
-  <xs:element name="email">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="fax">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="institution">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-        <xs:element ref="tns:break"/>
-        <xs:element ref="tns:x"/>
-      </xs:choice>
-      <xs:attribute name="id" type="xs:ID"/>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="phone">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="uri">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="date">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:choice minOccurs="0">
-          <xs:sequence>
-            <xs:element minOccurs="0" ref="tns:day"/>
-            <xs:element minOccurs="0" ref="tns:month"/>
-          </xs:sequence>
-          <xs:element ref="tns:season"/>
-        </xs:choice>
-        <xs:element minOccurs="0" ref="tns:year"/>
-        <xs:element minOccurs="0" ref="tns:string-date"/>
-      </xs:sequence>
-      <xs:attribute type="xs:string" name="date-type"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="day" type="xs:string"/>
-  <xs:element name="month" type="xs:string"/>
-  <xs:element name="season" type="xs:string"/>
-  <xs:element name="year" type="xs:string"/>
-  <xs:element name="string-date">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-        <xs:element ref="tns:day"/>
-        <xs:element ref="tns:month"/>
-        <xs:element ref="tns:season"/>
-        <xs:element ref="tns:year"/>
-        <xs:element ref="tns:x"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="string-name">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-        <xs:element ref="tns:given-names"/>
-        <xs:element ref="tns:prefix"/>
-        <xs:element ref="tns:surname"/>
-        <xs:element ref="tns:suffix"/>
-        <xs:element ref="tns:x"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="name">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:surname"/>
-        <xs:element minOccurs="0" ref="tns:given-names"/>
-        <xs:element minOccurs="0" ref="tns:prefix"/>
-        <xs:element minOccurs="0" ref="tns:suffix"/>
-      </xs:sequence>
-      <xs:attribute name="name-style" default="western">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="western"/>
-            <xs:enumeration value="eastern"/>
-            <xs:enumeration value="islensk"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="surname">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-      <xs:attribute type="xs:string" name="initials"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="given-names">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-      <xs:attribute type="xs:string" name="initials"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="prefix">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="suffix">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ext-link">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-      <xs:attribute type="xs:string" name="ext-link-type"/>
-      <xs:attribute name="id" type="xs:ID"/>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="attrib">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="title">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-        <xs:element ref="tns:break"/>
-        <xs:element ref="tns:x"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="label">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:break"/>
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-article">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:break"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:access-date"/>
-        <xs:element ref="tns:annotation"/>
-        <xs:element ref="tns:article-title"/>
-        <xs:element ref="tns:collab"/>
-        <xs:element ref="tns:comment"/>
-        <xs:element ref="tns:conf-date"/>
-        <xs:element ref="tns:conf-loc"/>
-        <xs:element ref="tns:conf-name"/>
-        <xs:element ref="tns:day"/>
-        <xs:element ref="tns:edition"/>
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:elocation-id"/>
-        <xs:element ref="tns:etal"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:fpage"/>
-        <xs:element ref="tns:gov"/>
-        <xs:element ref="tns:isbn"/>
-        <xs:element ref="tns:issn"/>
-        <xs:element ref="tns:issue"/>
-        <xs:element ref="tns:issue-id"/>
-        <xs:element ref="tns:issue-title"/>
-        <xs:element ref="tns:lpage"/>
-        <xs:element ref="tns:month"/>
-        <xs:element ref="tns:name"/>
-        <xs:element ref="tns:object-id"/>
-        <xs:element ref="tns:page-count"/>
-        <xs:element ref="tns:page-range"/>
-        <xs:element ref="tns:patent"/>
-        <xs:element ref="tns:person-group"/>
-        <xs:element ref="tns:pub-id"/>
-        <xs:element ref="tns:publisher-loc"/>
-        <xs:element ref="tns:publisher-name"/>
-        <xs:element ref="tns:role"/>
-        <xs:element ref="tns:season"/>
-        <xs:element ref="tns:series"/>
-        <xs:element ref="tns:source"/>
-        <xs:element ref="tns:std"/>
-        <xs:element ref="tns:string-name"/>
-        <xs:element ref="tns:supplement"/>
-        <xs:element ref="tns:time-stamp"/>
-        <xs:element ref="tns:trans-source"/>
-        <xs:element ref="tns:trans-title"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:volume"/>
-        <xs:element ref="tns:volume-id"/>
-        <xs:element ref="tns:year"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-        <xs:element ref="tns:x"/>
-      </xs:choice>
-      <xs:attribute name="id" type="xs:ID"/>
-      <xs:attribute name="alternate-form-of" type="xs:IDREF"/>
-      <xs:attribute type="xs:string" name="related-article-type" use="required"/>
-      <xs:attribute type="xs:string" name="ext-link-type"/>
-      <xs:attribute type="xs:string" name="vol"/>
-      <xs:attribute type="xs:string" name="page"/>
-      <xs:attribute type="xs:string" name="issue"/>
-      <xs:attribute type="xs:string" name="journal-id"/>
-      <xs:attribute type="xs:string" name="journal-id-type"/>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ack">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="tns:label"/>
-        <xs:element minOccurs="0" ref="tns:title"/>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="tns:array"/>
-          <xs:element ref="tns:boxed-text"/>
-          <xs:element ref="tns:chem-struct"/>
-          <xs:element ref="tns:chem-struct-wrapper"/>
-          <xs:element ref="tns:fig"/>
-          <xs:element ref="tns:fig-group"/>
-          <xs:element ref="tns:graphic"/>
-          <xs:element ref="tns:media"/>
-          <xs:element ref="tns:preformat"/>
-          <xs:element ref="tns:supplementary-material"/>
-          <xs:element ref="tns:table-wrap"/>
-          <xs:element ref="tns:table-wrap-group"/>
-          <xs:element ref="tns:disp-formula"/>
-          <xs:element ref="tns:p"/>
-          <xs:element ref="tns:def-list"/>
-          <xs:element ref="tns:list"/>
-          <xs:element ref="tns:tex-math"/>
-          
-          <xs:element ref="tns:related-article"/>
-          <xs:element ref="tns:ack"/>
-          <xs:element ref="tns:disp-quote"/>
-          <xs:element ref="tns:speech"/>
-          <xs:element ref="tns:statement"/>
-          <xs:element ref="tns:verse-group"/>
-        </xs:choice>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:sec"/>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="tns:notes"/>
-          <xs:element ref="tns:fn-group"/>
-          <xs:element ref="tns:glossary"/>
-          <xs:element ref="tns:ref-list"/>
-        </xs:choice>
-      </xs:sequence>
-      <xs:attribute name="id" type="xs:ID"/>
-      <xs:attribute type="xs:string" name="content-type"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="bio">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="tns:title"/>
-        <xs:element maxOccurs="unbounded" ref="tns:p"/>
-      </xs:sequence>
-      <xs:attribute name="id" type="xs:ID"/>
-      <xs:attribute name="rid" type="xs:IDREFS"/>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="notes">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="tns:label"/>
-        <xs:element minOccurs="0" ref="tns:title"/>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="tns:array"/>
-          <xs:element ref="tns:boxed-text"/>
-          <xs:element ref="tns:chem-struct"/>
-          <xs:element ref="tns:chem-struct-wrapper"/>
-          <xs:element ref="tns:fig"/>
-          <xs:element ref="tns:fig-group"/>
-          <xs:element ref="tns:graphic"/>
-          <xs:element ref="tns:media"/>
-          <xs:element ref="tns:preformat"/>
-          <xs:element ref="tns:supplementary-material"/>
-          <xs:element ref="tns:table-wrap"/>
-          <xs:element ref="tns:table-wrap-group"/>
-          <xs:element ref="tns:disp-formula"/>
-          <xs:element ref="tns:p"/>
-          <xs:element ref="tns:def-list"/>
-          <xs:element ref="tns:list"/>
-          <xs:element ref="tns:tex-math"/>
-          
-          <xs:element ref="tns:related-article"/>
-          <xs:element ref="tns:ack"/>
-          <xs:element ref="tns:disp-quote"/>
-          <xs:element ref="tns:speech"/>
-          <xs:element ref="tns:statement"/>
-          <xs:element ref="tns:verse-group"/>
-        </xs:choice>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:sec"/>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="tns:notes"/>
-          <xs:element ref="tns:fn-group"/>
-          <xs:element ref="tns:glossary"/>
-          <xs:element ref="tns:ref-list"/>
-        </xs:choice>
-      </xs:sequence>
-      <xs:attribute name="id" type="xs:ID"/>
-      <xs:attribute type="xs:string" name="notes-type"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="alt-text">
-    <xs:complexType mixed="true">
-      <xs:attribute name="id" type="xs:ID"/>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="long-desc">
-    <xs:complexType mixed="true">
-      <xs:attribute name="id" type="xs:ID"/>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="def">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tns:p"/>
-      </xs:sequence>
-      <xs:attribute name="rid" type="xs:IDREFS"/>
-      <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="custom-meta-wrap">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tns:custom-meta"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="custom-meta">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:meta-name"/>
-        <xs:element ref="tns:meta-value"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="meta-name">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="meta-value">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="x">
-    <xs:complexType mixed="true">
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="article-meta">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:article-id"/>
-        <xs:element minOccurs="0" ref="tns:article-categories"/>
-        <xs:element minOccurs="0" ref="tns:title-group"/>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="tns:contrib-group"/>
-          <xs:element ref="tns:aff"/>
-          <xs:element ref="tns:x"/>
-        </xs:choice>
-        <xs:element minOccurs="0" ref="tns:author-notes"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:pub-date"/>
-        <xs:element minOccurs="0" ref="tns:volume"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:volume-id"/>
-        <xs:element minOccurs="0" ref="tns:issue"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:issue-id"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:issue-title"/>
-        <xs:element minOccurs="0" ref="tns:supplement"/>
-        <xs:choice minOccurs="0">
-          <xs:sequence>
-            <xs:element ref="tns:fpage"/>
-            <xs:element minOccurs="0" ref="tns:lpage"/>
-            <xs:element minOccurs="0" ref="tns:page-range"/>
-          </xs:sequence>
-          <xs:element ref="tns:elocation-id"/>
-        </xs:choice>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="tns:email"/>
-          <xs:element ref="tns:ext-link"/>
-          <xs:element ref="tns:uri"/>
-          <xs:element ref="tns:product"/>
-          <xs:element ref="tns:supplementary-material"/>
-        </xs:choice>
-        <xs:element minOccurs="0" ref="tns:history"/>
-        <xs:element minOccurs="0" ref="tns:copyright-statement"/>
-        <xs:element minOccurs="0" ref="tns:copyright-year"/>
-        <xs:element minOccurs="0" ref="tns:license"/>
-        <xs:element minOccurs="0" ref="tns:permissions"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:self-uri"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:related-article"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:abstract"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:trans-abstract"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:kwd-group"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:contract-num"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:contract-sponsor"/>
-<!--        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:conference"/> -->
-        <xs:element minOccurs="0" ref="tns:counts"/>
-        <xs:element minOccurs="0" ref="tns:custom-meta-wrap"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="article-id">
-    <xs:complexType mixed="true">
-      <xs:attribute type="xs:string" name="pub-id-type"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="article-categories">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:subj-group"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:series-title"/>
-        <xs:element minOccurs="0" ref="tns:series-text"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="subj-group">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tns:subject"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:subj-group"/>
-      </xs:sequence>
-      
-      <xs:attribute type="xs:string" name="subj-group-type"/>
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="subject">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-        <xs:element ref="tns:break"/>
-        <xs:element ref="tns:x"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="series-title">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="series-text">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="author-notes">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:label"/>
-        <xs:element minOccurs="0" ref="tns:title"/>
-        <xs:choice maxOccurs="unbounded">
-          <xs:element ref="tns:corresp"/>
-          <xs:element ref="tns:fn"/>
-        </xs:choice>
-      </xs:sequence>
-      <xs:attribute name="id" type="xs:ID"/>
-      <xs:attribute name="rid" type="xs:IDREFS"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="product">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:break"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:access-date"/>
-        <xs:element ref="tns:annotation"/>
-        <xs:element ref="tns:article-title"/>
-        <xs:element ref="tns:collab"/>
-        <xs:element ref="tns:comment"/>
-        <xs:element ref="tns:conf-date"/>
-        <xs:element ref="tns:conf-loc"/>
-        <xs:element ref="tns:conf-name"/>
-        <xs:element ref="tns:day"/>
-        <xs:element ref="tns:edition"/>
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:elocation-id"/>
-        <xs:element ref="tns:etal"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:fpage"/>
-        <xs:element ref="tns:gov"/>
-        <xs:element ref="tns:isbn"/>
-        <xs:element ref="tns:issn"/>
-        <xs:element ref="tns:issue"/>
-        <xs:element ref="tns:issue-id"/>
-        <xs:element ref="tns:issue-title"/>
-        <xs:element ref="tns:lpage"/>
-        <xs:element ref="tns:month"/>
-        <xs:element ref="tns:name"/>
-        <xs:element ref="tns:object-id"/>
-        <xs:element ref="tns:page-count"/>
-        <xs:element ref="tns:page-range"/>
-        <xs:element ref="tns:patent"/>
-        <xs:element ref="tns:person-group"/>
-        <xs:element ref="tns:pub-id"/>
-        <xs:element ref="tns:publisher-loc"/>
-        <xs:element ref="tns:publisher-name"/>
-        <xs:element ref="tns:role"/>
-        <xs:element ref="tns:season"/>
-        <xs:element ref="tns:series"/>
-        <xs:element ref="tns:source"/>
-        <xs:element ref="tns:std"/>
-        <xs:element ref="tns:string-name"/>
-        <xs:element ref="tns:supplement"/>
-        <xs:element ref="tns:time-stamp"/>
-        <xs:element ref="tns:trans-source"/>
-        <xs:element ref="tns:trans-title"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:volume"/>
-        <xs:element ref="tns:volume-id"/>
-        <xs:element ref="tns:year"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-        <xs:element ref="tns:x"/>
-      </xs:choice>
-      <xs:attribute type="xs:string" name="product-type"/>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="history">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-        <xs:element ref="tns:break"/>
-        <xs:element ref="tns:date"/>
-        <xs:element ref="tns:string-date"/>
-        <xs:element ref="tns:x"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="self-uri">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="abstract">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:object-id"/>
-        <xs:sequence>
-          <xs:element minOccurs="0" ref="tns:label"/>
-          <xs:element minOccurs="0" ref="tns:title"/>
-          <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:element ref="tns:array"/>
-            <xs:element ref="tns:boxed-text"/>
-            <xs:element ref="tns:chem-struct"/>
-            <xs:element ref="tns:chem-struct-wrapper"/>
-            <xs:element ref="tns:fig"/>
-            <xs:element ref="tns:fig-group"/>
-            <xs:element ref="tns:graphic"/>
-            <xs:element ref="tns:media"/>
-            <xs:element ref="tns:preformat"/>
-            <xs:element ref="tns:supplementary-material"/>
-            <xs:element ref="tns:table-wrap"/>
-            <xs:element ref="tns:table-wrap-group"/>
-            <xs:element ref="tns:disp-formula"/>
-            <xs:element ref="tns:p"/>
-            <xs:element ref="tns:def-list"/>
-            <xs:element ref="tns:list"/>
-            <xs:element ref="tns:tex-math"/>
-            
-            <xs:element ref="tns:related-article"/>
-            <xs:element ref="tns:ack"/>
-            <xs:element ref="tns:disp-quote"/>
-            <xs:element ref="tns:speech"/>
-            <xs:element ref="tns:statement"/>
-            <xs:element ref="tns:verse-group"/>
-          </xs:choice>
-          <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:sec"/>
-          <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:element ref="tns:notes"/>
-            <xs:element ref="tns:fn-group"/>
-            <xs:element ref="tns:glossary"/>
-            <xs:element ref="tns:ref-list"/>
-          </xs:choice>
-        </xs:sequence>
-      </xs:sequence>
-      <xs:attribute type="xs:string" name="abstract-type"/>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="trans-abstract">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="tns:label"/>
-        <xs:element minOccurs="0" ref="tns:title"/>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="tns:array"/>
-          <xs:element ref="tns:boxed-text"/>
-          <xs:element ref="tns:chem-struct"/>
-          <xs:element ref="tns:chem-struct-wrapper"/>
-          <xs:element ref="tns:fig"/>
-          <xs:element ref="tns:fig-group"/>
-          <xs:element ref="tns:graphic"/>
-          <xs:element ref="tns:media"/>
-          <xs:element ref="tns:preformat"/>
-          <xs:element ref="tns:supplementary-material"/>
-          <xs:element ref="tns:table-wrap"/>
-          <xs:element ref="tns:table-wrap-group"/>
-          <xs:element ref="tns:disp-formula"/>
-          <xs:element ref="tns:p"/>
-          <xs:element ref="tns:def-list"/>
-          <xs:element ref="tns:list"/>
-          <xs:element ref="tns:tex-math"/>
-          
-          <xs:element ref="tns:related-article"/>
-          <xs:element ref="tns:ack"/>
-          <xs:element ref="tns:disp-quote"/>
-          <xs:element ref="tns:speech"/>
-          <xs:element ref="tns:statement"/>
-          <xs:element ref="tns:verse-group"/>
-        </xs:choice>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:sec"/>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="tns:notes"/>
-          <xs:element ref="tns:fn-group"/>
-          <xs:element ref="tns:glossary"/>
-          <xs:element ref="tns:ref-list"/>
-        </xs:choice>
-      </xs:sequence>
-      <xs:attribute type="xs:string" name="abstract-type"/>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="kwd-group">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="tns:title"/>
-        <xs:choice maxOccurs="unbounded">
-          <xs:element ref="tns:kwd"/>
-          <xs:element ref="tns:x"/>
-        </xs:choice>
-      </xs:sequence>
-      <xs:attribute name="id" type="xs:ID"/>
-      <xs:attribute type="xs:string" name="kwd-group-type"/>
-      
-      
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="kwd">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:break"/>
-        <xs:element ref="tns:email"/>
-        <xs:element ref="tns:ext-link"/>
-        <xs:element ref="tns:uri"/>
-        <xs:element ref="tns:inline-supplementary-material"/>
-        <xs:element ref="tns:related-article"/>
-        <xs:element ref="tns:font"/>
-        <xs:element ref="tns:hr"/>
-        <xs:element ref="tns:bold"/>
-        <xs:element ref="tns:italic"/>
-        <xs:element ref="tns:monospace"/>
-        <xs:element ref="tns:overline"/>
-        <xs:element ref="tns:overline-start"/>
-        <xs:element ref="tns:overline-end"/>
-        <xs:element ref="tns:sc"/>
-        <xs:element ref="tns:strike"/>
-        <xs:element ref="tns:underline"/>
-        <xs:element ref="tns:underline-start"/>
-        <xs:element ref="tns:underline-end"/>
-        <xs:element ref="tns:inline-graphic"/>
-        <xs:element ref="tns:private-char"/>
-        <xs:element ref="tns:inline-formula"/>
-        <xs:element ref="tns:tex-math"/>
-        
-        <xs:element ref="tns:abbrev"/>
-        <xs:element ref="tns:named-content"/>
-        <xs:element ref="tns:fn"/>
-        <xs:element ref="tns:target"/>
-        <xs:element ref="tns:xref"/>
-        <xs:element ref="tns:sub"/>
-        <xs:element ref="tns:sup"/>
-      </xs:choice>
-      <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="corresp">
-    <xs:complexType mixed="true">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="tns:addr-line"/>
-        <xs:element ref="tns:country"/>
-        <xs:element ref="tns:fax"/>
-        <xs:element ref="tns:institution"/>
-        <xs:element ref="tns:phone"/>
-        <xs:element ref="tns:email"/>
-        <xs:element r

<TRUNCATED>


[20/28] incubator-taverna-common-activities git commit: ASF headers

Posted by st...@apache.org.
ASF headers


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/8ed9113f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/8ed9113f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/8ed9113f

Branch: refs/heads/cwl-browse
Commit: 8ed9113fa42750f290b06f6d665fd5bd0fed72bd
Parents: 0fec6f0
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Apr 28 16:46:43 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Apr 28 16:46:43 2016 +0100

----------------------------------------------------------------------
 .../src/main/resources/xml-splitter.schema.json   |  2 ++
 .../XMLSplitterConfigurationBeanBuilderTest.java  | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/8ed9113f/taverna-wsdl-activity/src/main/resources/xml-splitter.schema.json
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/main/resources/xml-splitter.schema.json b/taverna-wsdl-activity/src/main/resources/xml-splitter.schema.json
index 471defc..7207999 100644
--- a/taverna-wsdl-activity/src/main/resources/xml-splitter.schema.json
+++ b/taverna-wsdl-activity/src/main/resources/xml-splitter.schema.json
@@ -1,4 +1,6 @@
 {
+  "http://purl.org/dc/terms/rights": "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to You under the Apache License, Version 2.0 (the 'License'); you may not use this file except in compliance with the License.  You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License.",
+  "http://purl.org/dc/terms/license": {"@id": "http://www.apache.org/licenses/LICENSE-2.0"},
     "$schema": "http://json-schema.org/draft-03/schema#",
     "id": "http://ns.taverna.org.uk/2010/activity/xml-splitter.schema.json",
     "title": "XML splitter activity configuration",

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/8ed9113f/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLSplitterConfigurationBeanBuilderTest.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLSplitterConfigurationBeanBuilderTest.java b/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLSplitterConfigurationBeanBuilderTest.java
index 0f47e7c..18b5f18 100644
--- a/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLSplitterConfigurationBeanBuilderTest.java
+++ b/taverna-wsdl-activity/src/test/java/org/apache/taverna/activities/wsdl/xmlsplitter/XMLSplitterConfigurationBeanBuilderTest.java
@@ -1,3 +1,21 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 package org.apache.taverna.activities.wsdl.xmlsplitter;
 
 import static org.junit.Assert.assertEquals;


[24/28] incubator-taverna-common-activities git commit: ASF headers

Posted by st...@apache.org.
ASF headers


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/aff32dbb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/aff32dbb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/aff32dbb

Branch: refs/heads/cwl-browse
Commit: aff32dbb955dbe005a052169ec15d2e23dab3023
Parents: bb25b36
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Apr 28 16:57:41 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Apr 28 16:57:41 2016 +0100

----------------------------------------------------------------------
 .../main/resources/abdera/adapter/feed.properties   | 14 ++++++++++++++
 .../src/main/resources/index                        | 14 ++++++++++++++
 .../src/main/resources/interaction.css              | 16 ++++++++++++++++
 3 files changed, 44 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/aff32dbb/taverna-interaction-activity/src/main/resources/abdera/adapter/feed.properties
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/abdera/adapter/feed.properties b/taverna-interaction-activity/src/main/resources/abdera/adapter/feed.properties
index 3371f38..b031968 100644
--- a/taverna-interaction-activity/src/main/resources/abdera/adapter/feed.properties
+++ b/taverna-interaction-activity/src/main/resources/abdera/adapter/feed.properties
@@ -1,3 +1,17 @@
+##  Licensed to the Apache Software Foundation (ASF) under one or more
+##  contributor license agreements.  See the NOTICE file distributed with
+##  this work for additional information regarding copyright ownership.
+##  The ASF licenses this file to You under the Apache License, Version 2.0
+##  (the "License"); you may not use this file except in compliance with
+##  the License.  You may obtain a copy of the License at
+##
+##  http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
 subUri=feed
 adapterClassName=net.sf.taverna.t2.activities.interaction.jetty.HackedFilesystemAdapter
 title=Taverna interaction

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/aff32dbb/taverna-interaction-activity/src/main/resources/index
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/index b/taverna-interaction-activity/src/main/resources/index
index 8d3d1bc..6aecd49 100644
--- a/taverna-interaction-activity/src/main/resources/index
+++ b/taverna-interaction-activity/src/main/resources/index
@@ -1,3 +1,17 @@
+##  Licensed to the Apache Software Foundation (ASF) under one or more
+##  contributor license agreements.  See the NOTICE file distributed with
+##  this work for additional information regarding copyright ownership.
+##  The ASF licenses this file to You under the Apache License, Version 2.0
+##  (the "License"); you may not use this file except in compliance with
+##  the License.  You may obtain a copy of the License at
+##
+##  http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
 ask
 choose
 notify

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/aff32dbb/taverna-interaction-activity/src/main/resources/interaction.css
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/interaction.css b/taverna-interaction-activity/src/main/resources/interaction.css
index a6e3301..3c64d17 100644
--- a/taverna-interaction-activity/src/main/resources/interaction.css
+++ b/taverna-interaction-activity/src/main/resources/interaction.css
@@ -1,3 +1,19 @@
+/*
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
       	html, body { height: 100%; width: 100%; margin: 0; border:0; }
       	#presentationFrame, #presentationDiv { height: 90%; width: 95%; margin: 0; border:0; frameborder:0; }
      	#acknowledgment { width: 95%; margin: 0; border:0; frameborder:0; background-color: #eeeb99; color: #555555; text-align:center; }


[10/28] incubator-taverna-common-activities git commit: Moved third-party test WSDLs to https://github.com/taverna-extras/wsdl-generic-test-cases

Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/SBWReader.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/SBWReader.wsdl b/taverna-wsdl-generic/src/test/resources/testwsdls/SBWReader.wsdl
deleted file mode 100644
index adf4582..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/SBWReader.wsdl
+++ /dev/null
@@ -1,602 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://www.sys-bio.org/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" targetNamespace="http://www.sys-bio.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://www.sys-bio.org/">
-      <s:element name="doAnalysis">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="var0" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-
-      </s:element>
-      <s:element name="doAnalysisResponse">
-        <s:complexType />
-      </s:element>
-      <s:element name="loadSBML">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="var0" type="s:string" />
-          </s:sequence>
-
-        </s:complexType>
-      </s:element>
-      <s:element name="loadSBMLResponse">
-        <s:complexType />
-      </s:element>
-      <s:element name="getErrors">
-        <s:complexType />
-      </s:element>
-      <s:element name="getErrorsResponse">
-
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="getErrorsResult" type="tns:ArrayOfString" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:complexType name="ArrayOfString">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="unbounded" name="string" nillable="true" type="s:string" />
-
-        </s:sequence>
-      </s:complexType>
-      <s:element name="getWarnings">
-        <s:complexType />
-      </s:element>
-      <s:element name="getWarningsResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="getWarningsResult" type="tns:ArrayOfString" />
-
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="getFatals">
-        <s:complexType />
-      </s:element>
-      <s:element name="getFatalsResponse">
-        <s:complexType>
-          <s:sequence>
-
-            <s:element minOccurs="0" maxOccurs="1" name="getFatalsResult" type="tns:ArrayOfString" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="getInfo">
-        <s:complexType />
-      </s:element>
-      <s:element name="getInfoResponse">
-        <s:complexType>
-
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="getInfoResult" type="tns:ArrayOfString" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="numErrors">
-        <s:complexType />
-      </s:element>
-      <s:element name="numErrorsResponse">
-
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="numErrorsResult" type="s:int" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="ArrayOfString" nillable="true" type="tns:ArrayOfString" />
-      <s:element name="int" type="s:int" />
-    </s:schema>
-
-  </wsdl:types>
-  <wsdl:message name="doAnalysisSoapIn">
-    <wsdl:part name="parameters" element="tns:doAnalysis" />
-  </wsdl:message>
-  <wsdl:message name="doAnalysisSoapOut">
-    <wsdl:part name="parameters" element="tns:doAnalysisResponse" />
-  </wsdl:message>
-  <wsdl:message name="loadSBMLSoapIn">
-    <wsdl:part name="parameters" element="tns:loadSBML" />
-
-  </wsdl:message>
-  <wsdl:message name="loadSBMLSoapOut">
-    <wsdl:part name="parameters" element="tns:loadSBMLResponse" />
-  </wsdl:message>
-  <wsdl:message name="getErrorsSoapIn">
-    <wsdl:part name="parameters" element="tns:getErrors" />
-  </wsdl:message>
-  <wsdl:message name="getErrorsSoapOut">
-    <wsdl:part name="parameters" element="tns:getErrorsResponse" />
-
-  </wsdl:message>
-  <wsdl:message name="getWarningsSoapIn">
-    <wsdl:part name="parameters" element="tns:getWarnings" />
-  </wsdl:message>
-  <wsdl:message name="getWarningsSoapOut">
-    <wsdl:part name="parameters" element="tns:getWarningsResponse" />
-  </wsdl:message>
-  <wsdl:message name="getFatalsSoapIn">
-    <wsdl:part name="parameters" element="tns:getFatals" />
-
-  </wsdl:message>
-  <wsdl:message name="getFatalsSoapOut">
-    <wsdl:part name="parameters" element="tns:getFatalsResponse" />
-  </wsdl:message>
-  <wsdl:message name="getInfoSoapIn">
-    <wsdl:part name="parameters" element="tns:getInfo" />
-  </wsdl:message>
-  <wsdl:message name="getInfoSoapOut">
-    <wsdl:part name="parameters" element="tns:getInfoResponse" />
-
-  </wsdl:message>
-  <wsdl:message name="numErrorsSoapIn">
-    <wsdl:part name="parameters" element="tns:numErrors" />
-  </wsdl:message>
-  <wsdl:message name="numErrorsSoapOut">
-    <wsdl:part name="parameters" element="tns:numErrorsResponse" />
-  </wsdl:message>
-  <wsdl:message name="doAnalysisHttpGetIn">
-    <wsdl:part name="var0" type="s:string" />
-
-  </wsdl:message>
-  <wsdl:message name="doAnalysisHttpGetOut" />
-  <wsdl:message name="loadSBMLHttpGetIn">
-    <wsdl:part name="var0" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="loadSBMLHttpGetOut" />
-  <wsdl:message name="getErrorsHttpGetIn" />
-  <wsdl:message name="getErrorsHttpGetOut">
-    <wsdl:part name="Body" element="tns:ArrayOfString" />
-
-  </wsdl:message>
-  <wsdl:message name="getWarningsHttpGetIn" />
-  <wsdl:message name="getWarningsHttpGetOut">
-    <wsdl:part name="Body" element="tns:ArrayOfString" />
-  </wsdl:message>
-  <wsdl:message name="getFatalsHttpGetIn" />
-  <wsdl:message name="getFatalsHttpGetOut">
-    <wsdl:part name="Body" element="tns:ArrayOfString" />
-  </wsdl:message>
-
-  <wsdl:message name="getInfoHttpGetIn" />
-  <wsdl:message name="getInfoHttpGetOut">
-    <wsdl:part name="Body" element="tns:ArrayOfString" />
-  </wsdl:message>
-  <wsdl:message name="numErrorsHttpGetIn" />
-  <wsdl:message name="numErrorsHttpGetOut">
-    <wsdl:part name="Body" element="tns:int" />
-  </wsdl:message>
-  <wsdl:message name="doAnalysisHttpPostIn">
-
-    <wsdl:part name="var0" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="doAnalysisHttpPostOut" />
-  <wsdl:message name="loadSBMLHttpPostIn">
-    <wsdl:part name="var0" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="loadSBMLHttpPostOut" />
-  <wsdl:message name="getErrorsHttpPostIn" />
-  <wsdl:message name="getErrorsHttpPostOut">
-
-    <wsdl:part name="Body" element="tns:ArrayOfString" />
-  </wsdl:message>
-  <wsdl:message name="getWarningsHttpPostIn" />
-  <wsdl:message name="getWarningsHttpPostOut">
-    <wsdl:part name="Body" element="tns:ArrayOfString" />
-  </wsdl:message>
-  <wsdl:message name="getFatalsHttpPostIn" />
-  <wsdl:message name="getFatalsHttpPostOut">
-    <wsdl:part name="Body" element="tns:ArrayOfString" />
-
-  </wsdl:message>
-  <wsdl:message name="getInfoHttpPostIn" />
-  <wsdl:message name="getInfoHttpPostOut">
-    <wsdl:part name="Body" element="tns:ArrayOfString" />
-  </wsdl:message>
-  <wsdl:message name="numErrorsHttpPostIn" />
-  <wsdl:message name="numErrorsHttpPostOut">
-    <wsdl:part name="Body" element="tns:int" />
-  </wsdl:message>
-
-  <wsdl:portType name="validateSoap">
-    <wsdl:operation name="doAnalysis">
-      <wsdl:input message="tns:doAnalysisSoapIn" />
-      <wsdl:output message="tns:doAnalysisSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="loadSBML">
-      <wsdl:input message="tns:loadSBMLSoapIn" />
-      <wsdl:output message="tns:loadSBMLSoapOut" />
-    </wsdl:operation>
-
-    <wsdl:operation name="getErrors">
-      <wsdl:input message="tns:getErrorsSoapIn" />
-      <wsdl:output message="tns:getErrorsSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="getWarnings">
-      <wsdl:input message="tns:getWarningsSoapIn" />
-      <wsdl:output message="tns:getWarningsSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="getFatals">
-
-      <wsdl:input message="tns:getFatalsSoapIn" />
-      <wsdl:output message="tns:getFatalsSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="getInfo">
-      <wsdl:input message="tns:getInfoSoapIn" />
-      <wsdl:output message="tns:getInfoSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="numErrors">
-      <wsdl:input message="tns:numErrorsSoapIn" />
-
-      <wsdl:output message="tns:numErrorsSoapOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="validateHttpGet">
-    <wsdl:operation name="doAnalysis">
-      <wsdl:input message="tns:doAnalysisHttpGetIn" />
-      <wsdl:output message="tns:doAnalysisHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="loadSBML">
-
-      <wsdl:input message="tns:loadSBMLHttpGetIn" />
-      <wsdl:output message="tns:loadSBMLHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="getErrors">
-      <wsdl:input message="tns:getErrorsHttpGetIn" />
-      <wsdl:output message="tns:getErrorsHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="getWarnings">
-      <wsdl:input message="tns:getWarningsHttpGetIn" />
-
-      <wsdl:output message="tns:getWarningsHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="getFatals">
-      <wsdl:input message="tns:getFatalsHttpGetIn" />
-      <wsdl:output message="tns:getFatalsHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="getInfo">
-      <wsdl:input message="tns:getInfoHttpGetIn" />
-      <wsdl:output message="tns:getInfoHttpGetOut" />
-
-    </wsdl:operation>
-    <wsdl:operation name="numErrors">
-      <wsdl:input message="tns:numErrorsHttpGetIn" />
-      <wsdl:output message="tns:numErrorsHttpGetOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="validateHttpPost">
-    <wsdl:operation name="doAnalysis">
-      <wsdl:input message="tns:doAnalysisHttpPostIn" />
-
-      <wsdl:output message="tns:doAnalysisHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="loadSBML">
-      <wsdl:input message="tns:loadSBMLHttpPostIn" />
-      <wsdl:output message="tns:loadSBMLHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="getErrors">
-      <wsdl:input message="tns:getErrorsHttpPostIn" />
-      <wsdl:output message="tns:getErrorsHttpPostOut" />
-
-    </wsdl:operation>
-    <wsdl:operation name="getWarnings">
-      <wsdl:input message="tns:getWarningsHttpPostIn" />
-      <wsdl:output message="tns:getWarningsHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="getFatals">
-      <wsdl:input message="tns:getFatalsHttpPostIn" />
-      <wsdl:output message="tns:getFatalsHttpPostOut" />
-    </wsdl:operation>
-
-    <wsdl:operation name="getInfo">
-      <wsdl:input message="tns:getInfoHttpPostIn" />
-      <wsdl:output message="tns:getInfoHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="numErrors">
-      <wsdl:input message="tns:numErrorsHttpPostIn" />
-      <wsdl:output message="tns:numErrorsHttpPostOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-
-  <wsdl:binding name="validateSoap" type="tns:validateSoap">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="doAnalysis">
-      <soap:operation soapAction="http://www.sys-bio.org/doAnalysis" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="loadSBML">
-      <soap:operation soapAction="http://www.sys-bio.org/loadSBML" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getErrors">
-      <soap:operation soapAction="http://www.sys-bio.org/getErrors" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getWarnings">
-      <soap:operation soapAction="http://www.sys-bio.org/getWarnings" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getFatals">
-      <soap:operation soapAction="http://www.sys-bio.org/getFatals" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getInfo">
-      <soap:operation soapAction="http://www.sys-bio.org/getInfo" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="numErrors">
-      <soap:operation soapAction="http://www.sys-bio.org/numErrors" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="validateSoap12" type="tns:validateSoap">
-    <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="doAnalysis">
-      <soap12:operation soapAction="http://www.sys-bio.org/doAnalysis" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="loadSBML">
-      <soap12:operation soapAction="http://www.sys-bio.org/loadSBML" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getErrors">
-      <soap12:operation soapAction="http://www.sys-bio.org/getErrors" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getWarnings">
-      <soap12:operation soapAction="http://www.sys-bio.org/getWarnings" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getFatals">
-      <soap12:operation soapAction="http://www.sys-bio.org/getFatals" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getInfo">
-      <soap12:operation soapAction="http://www.sys-bio.org/getInfo" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="numErrors">
-      <soap12:operation soapAction="http://www.sys-bio.org/numErrors" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="validateHttpGet" type="tns:validateHttpGet">
-    <http:binding verb="GET" />
-    <wsdl:operation name="doAnalysis">
-
-      <http:operation location="/doAnalysis" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output />
-    </wsdl:operation>
-    <wsdl:operation name="loadSBML">
-      <http:operation location="/loadSBML" />
-      <wsdl:input>
-
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output />
-    </wsdl:operation>
-    <wsdl:operation name="getErrors">
-      <http:operation location="/getErrors" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getWarnings">
-      <http:operation location="/getWarnings" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getFatals">
-      <http:operation location="/getFatals" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getInfo">
-      <http:operation location="/getInfo" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="numErrors">
-      <http:operation location="/numErrors" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-
-      <wsdl:output>
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="validateHttpPost" type="tns:validateHttpPost">
-    <http:binding verb="POST" />
-    <wsdl:operation name="doAnalysis">
-      <http:operation location="/doAnalysis" />
-
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output />
-    </wsdl:operation>
-    <wsdl:operation name="loadSBML">
-      <http:operation location="/loadSBML" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-
-      </wsdl:input>
-      <wsdl:output />
-    </wsdl:operation>
-    <wsdl:operation name="getErrors">
-      <http:operation location="/getErrors" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getWarnings">
-      <http:operation location="/getWarnings" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getFatals">
-      <http:operation location="/getFatals" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getInfo">
-      <http:operation location="/getInfo" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="numErrors">
-      <http:operation location="/numErrors" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-
-        <mime:mimeXml part="Body" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="validate">
-    <wsdl:port name="validateSoap" binding="tns:validateSoap">
-      <soap:address location="http://128.208.17.26/generate/SBWReader.asmx" />
-    </wsdl:port>
-    <wsdl:port name="validateSoap12" binding="tns:validateSoap12">
-
-      <soap12:address location="http://128.208.17.26/generate/SBWReader.asmx" />
-    </wsdl:port>
-    <wsdl:port name="validateHttpGet" binding="tns:validateHttpGet">
-      <http:address location="http://128.208.17.26/generate/SBWReader.asmx" />
-    </wsdl:port>
-    <wsdl:port name="validateHttpPost" binding="tns:validateHttpPost">
-      <http:address location="http://128.208.17.26/generate/SBWReader.asmx" />
-    </wsdl:port>
-  </wsdl:service>
-
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/TestServices-rpcencoded.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/TestServices-rpcencoded.wsdl b/taverna-wsdl-generic/src/test/resources/testwsdls/TestServices-rpcencoded.wsdl
deleted file mode 100644
index 6352bcb..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/TestServices-rpcencoded.wsdl
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://testing.org" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://testing.org" xmlns:intf="http://testing.org" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<!--WSDL created by Apache Axis version: 1.3
-Built on Oct 05, 2005 (05:23:37 EDT)-->
- <wsdl:types>
-  <schema targetNamespace="http://testing.org" xmlns="http://www.w3.org/2001/XMLSchema">
-   <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-   <complexType name="ArrayOf_xsd_string">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="xsd:string[]"/>
-
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="Address">
-    <sequence>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="number" type="xsd:int"/>
-     <element name="road" nillable="true" type="xsd:string"/>
-    </sequence>
-
-   </complexType>
-   <complexType name="Person">
-    <sequence>
-     <element name="address" nillable="true" type="impl:Address"/>
-     <element name="age" type="xsd:int"/>
-     <element name="name" nillable="true" type="xsd:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="ArrayOfPerson">
-
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="impl:Person[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-  </schema>
- </wsdl:types>
-
-   <wsdl:message name="getStringRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="getPersonResponse">
-
-      <wsdl:part name="getPersonReturn" type="impl:Person"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getBinaryDataRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="getPersonRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="countStringArrayResponse">
-
-      <wsdl:part name="countStringArrayReturn" type="xsd:int"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getStringResponse">
-
-      <wsdl:part name="getStringReturn" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="countStringRequest">
-
-      <wsdl:part name="str" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="countStringResponse">
-
-      <wsdl:part name="countStringReturn" type="xsd:int"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="countStringArrayRequest">
-
-      <wsdl:part name="array" type="impl:ArrayOf_xsd_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getBinaryDataResponse">
-
-      <wsdl:part name="getBinaryDataReturn" type="xsd:base64Binary"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="personArrayToStringResponse">
-
-      <wsdl:part name="personArrayToStringReturn" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getStringArrayResponse">
-
-      <wsdl:part name="getStringArrayReturn" type="impl:ArrayOf_xsd_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="personArrayToStringRequest">
-
-      <wsdl:part name="array" type="impl:ArrayOfPerson"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="personToStringResponse">
-
-      <wsdl:part name="personToStringReturn" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="countBytesResponse">
-
-      <wsdl:part name="countBytesReturn" type="xsd:int"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getStringArrayRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="countBytesRequest">
-
-      <wsdl:part name="bytes" type="xsd:base64Binary"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="personToStringRequest">
-
-      <wsdl:part name="p" type="impl:Person"/>
-
-   </wsdl:message>
-
-   <wsdl:portType name="TestServices">
-
-      <wsdl:operation name="getStringArray">
-
-         <wsdl:input message="impl:getStringArrayRequest" name="getStringArrayRequest"/>
-
-         <wsdl:output message="impl:getStringArrayResponse" name="getStringArrayResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getString">
-
-         <wsdl:input message="impl:getStringRequest" name="getStringRequest"/>
-
-         <wsdl:output message="impl:getStringResponse" name="getStringResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getPerson">
-
-         <wsdl:input message="impl:getPersonRequest" name="getPersonRequest"/>
-
-         <wsdl:output message="impl:getPersonResponse" name="getPersonResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="personToString" parameterOrder="p">
-
-         <wsdl:input message="impl:personToStringRequest" name="personToStringRequest"/>
-
-         <wsdl:output message="impl:personToStringResponse" name="personToStringResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countString" parameterOrder="str">
-
-         <wsdl:input message="impl:countStringRequest" name="countStringRequest"/>
-
-         <wsdl:output message="impl:countStringResponse" name="countStringResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countStringArray" parameterOrder="array">
-
-         <wsdl:input message="impl:countStringArrayRequest" name="countStringArrayRequest"/>
-
-         <wsdl:output message="impl:countStringArrayResponse" name="countStringArrayResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="personArrayToString" parameterOrder="array">
-
-         <wsdl:input message="impl:personArrayToStringRequest" name="personArrayToStringRequest"/>
-
-         <wsdl:output message="impl:personArrayToStringResponse" name="personArrayToStringResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getBinaryData">
-
-         <wsdl:input message="impl:getBinaryDataRequest" name="getBinaryDataRequest"/>
-
-         <wsdl:output message="impl:getBinaryDataResponse" name="getBinaryDataResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countBytes" parameterOrder="bytes">
-
-         <wsdl:input message="impl:countBytesRequest" name="countBytesRequest"/>
-
-         <wsdl:output message="impl:countBytesResponse" name="countBytesResponse"/>
-
-      </wsdl:operation>
-
-   </wsdl:portType>
-
-   <wsdl:binding name="TestServicesSoapBinding" type="impl:TestServices">
-
-      <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-      <wsdl:operation name="getStringArray">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getStringArrayRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getStringArrayResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getString">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getStringRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getStringResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getPerson">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getPersonRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getPersonResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="personToString">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="personToStringRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="personToStringResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countString">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="countStringRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="countStringResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countStringArray">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="countStringArrayRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="countStringArrayResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="personArrayToString">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="personArrayToStringRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="personArrayToStringResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getBinaryData">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getBinaryDataRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getBinaryDataResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countBytes">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="countBytesRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="countBytesResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://testing.org" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-   </wsdl:binding>
-
-   <wsdl:service name="TestServicesService">
-
-      <wsdl:port binding="impl:TestServicesSoapBinding" name="TestServices">
-
-         <wsdlsoap:address location="http://localhost:8080/testservices/services/TestServices"/>
-
-      </wsdl:port>
-
-   </wsdl:service>
-
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/TestServices-unwrapped.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/TestServices-unwrapped.wsdl b/taverna-wsdl-generic/src/test/resources/testwsdls/TestServices-unwrapped.wsdl
deleted file mode 100644
index 10dd09d..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/TestServices-unwrapped.wsdl
+++ /dev/null
@@ -1,434 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://testing.org" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://testing.org" xmlns:intf="http://testing.org" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<!--WSDL created by Apache Axis version: 1.3
-Built on Oct 05, 2005 (05:23:37 EDT)-->
- <wsdl:types>
-  <schema elementFormDefault="qualified" targetNamespace="http://testing.org" xmlns="http://www.w3.org/2001/XMLSchema">
-   <element name="getStringArrayReturn">
-    <complexType>
-     <sequence>
-      <element maxOccurs="unbounded" minOccurs="0" name="item" type="xsd:string"/>
-     </sequence>
-
-    </complexType>
-   </element>
-   <element name="getStringReturn" type="xsd:string"/>
-   <complexType name="Address">
-    <sequence>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="number" type="xsd:int"/>
-     <element name="road" nillable="true" type="xsd:string"/>
-    </sequence>
-
-   </complexType>
-   <complexType name="Person">
-    <sequence>
-     <element name="address" nillable="true" type="impl:Address"/>
-     <element name="age" type="xsd:int"/>
-     <element name="name" nillable="true" type="xsd:string"/>
-    </sequence>
-   </complexType>
-   <element name="getPersonReturn" type="impl:Person"/>
-
-   <element name="p" type="impl:Person"/>
-   <element name="personToStringReturn" type="xsd:string"/>
-   <element name="str" type="xsd:string"/>
-   <element name="countStringReturn" type="xsd:int"/>
-   <element name="array">
-    <complexType>
-     <sequence>
-      <element maxOccurs="unbounded" minOccurs="0" name="item" type="xsd:string"/>
-     </sequence>
-
-    </complexType>
-   </element>
-   <element name="countStringArrayReturn" type="xsd:int"/>
-   <complexType name="ArrayOfPerson">
-    <sequence>
-     <element maxOccurs="unbounded" minOccurs="0" name="item" type="impl:Person"/>
-    </sequence>
-   </complexType>
-   <element name="array1">
-
-    <complexType>
-     <sequence>
-      <element maxOccurs="unbounded" minOccurs="0" name="item" type="impl:Person"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="personArrayToStringReturn" type="xsd:string"/>
-   <element name="getBinaryDataReturn">
-    <complexType>
-
-     <sequence>
-      <element maxOccurs="unbounded" minOccurs="0" name="item" type="xsd:byte"/>
-     </sequence>
-    </complexType>
-   </element>
-   <element name="bytes">
-    <complexType>
-     <sequence>
-      <element maxOccurs="unbounded" minOccurs="0" name="item" type="xsd:byte"/>
-
-     </sequence>
-    </complexType>
-   </element>
-   <element name="countBytesReturn" type="xsd:int"/>
-  </schema>
- </wsdl:types>
-
-   <wsdl:message name="getStringRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="getPersonResponse">
-
-      <wsdl:part element="impl:getPersonReturn" name="getPersonReturn"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getBinaryDataRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="getPersonRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="countStringArrayResponse">
-
-      <wsdl:part element="impl:countStringArrayReturn" name="countStringArrayReturn"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getStringResponse">
-
-      <wsdl:part element="impl:getStringReturn" name="getStringReturn"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="countStringRequest">
-
-      <wsdl:part element="impl:str" name="str"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="countStringResponse">
-
-      <wsdl:part element="impl:countStringReturn" name="countStringReturn"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="countStringArrayRequest">
-
-      <wsdl:part element="impl:array" name="array"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getBinaryDataResponse">
-
-      <wsdl:part element="impl:getBinaryDataReturn" name="getBinaryDataReturn"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="personArrayToStringResponse">
-
-      <wsdl:part element="impl:personArrayToStringReturn" name="personArrayToStringReturn"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getStringArrayResponse">
-
-      <wsdl:part element="impl:getStringArrayReturn" name="getStringArrayReturn"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="personArrayToStringRequest">
-
-      <wsdl:part element="impl:array1" name="array"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="personToStringResponse">
-
-      <wsdl:part element="impl:personToStringReturn" name="personToStringReturn"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="countBytesResponse">
-
-      <wsdl:part element="impl:countBytesReturn" name="countBytesReturn"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getStringArrayRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="countBytesRequest">
-
-      <wsdl:part element="impl:bytes" name="bytes"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="personToStringRequest">
-
-      <wsdl:part element="impl:p" name="p"/>
-
-   </wsdl:message>
-
-   <wsdl:portType name="TestServices">
-
-      <wsdl:operation name="getStringArray">
-
-         <wsdl:input message="impl:getStringArrayRequest" name="getStringArrayRequest"/>
-
-         <wsdl:output message="impl:getStringArrayResponse" name="getStringArrayResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getString">
-
-         <wsdl:input message="impl:getStringRequest" name="getStringRequest"/>
-
-         <wsdl:output message="impl:getStringResponse" name="getStringResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getPerson">
-
-         <wsdl:input message="impl:getPersonRequest" name="getPersonRequest"/>
-
-         <wsdl:output message="impl:getPersonResponse" name="getPersonResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="personToString" parameterOrder="p">
-
-         <wsdl:input message="impl:personToStringRequest" name="personToStringRequest"/>
-
-         <wsdl:output message="impl:personToStringResponse" name="personToStringResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countString" parameterOrder="str">
-
-         <wsdl:input message="impl:countStringRequest" name="countStringRequest"/>
-
-         <wsdl:output message="impl:countStringResponse" name="countStringResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countStringArray" parameterOrder="array">
-
-         <wsdl:input message="impl:countStringArrayRequest" name="countStringArrayRequest"/>
-
-         <wsdl:output message="impl:countStringArrayResponse" name="countStringArrayResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="personArrayToString" parameterOrder="array">
-
-         <wsdl:input message="impl:personArrayToStringRequest" name="personArrayToStringRequest"/>
-
-         <wsdl:output message="impl:personArrayToStringResponse" name="personArrayToStringResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getBinaryData">
-
-         <wsdl:input message="impl:getBinaryDataRequest" name="getBinaryDataRequest"/>
-
-         <wsdl:output message="impl:getBinaryDataResponse" name="getBinaryDataResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countBytes" parameterOrder="bytes">
-
-         <wsdl:input message="impl:countBytesRequest" name="countBytesRequest"/>
-
-         <wsdl:output message="impl:countBytesResponse" name="countBytesResponse"/>
-
-      </wsdl:operation>
-
-   </wsdl:portType>
-
-   <wsdl:binding name="TestServicesSoapBinding" type="impl:TestServices">
-
-      <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-      <wsdl:operation name="getStringArray">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getStringArrayRequest">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getStringArrayResponse">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getString">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getStringRequest">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getStringResponse">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getPerson">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getPersonRequest">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getPersonResponse">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="personToString">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="personToStringRequest">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="personToStringResponse">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countString">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="countStringRequest">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="countStringResponse">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countStringArray">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="countStringArrayRequest">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="countStringArrayResponse">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="personArrayToString">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="personArrayToStringRequest">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="personArrayToStringResponse">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getBinaryData">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getBinaryDataRequest">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getBinaryDataResponse">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countBytes">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="countBytesRequest">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="countBytesResponse">
-
-            <wsdlsoap:body use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-   </wsdl:binding>
-
-   <wsdl:service name="TestServicesService">
-
-      <wsdl:port binding="impl:TestServicesSoapBinding" name="TestServices">
-
-         <wsdlsoap:address location="http://localhost:8080/testservices/services/TestServices"/>
-
-      </wsdl:port>
-
-   </wsdl:service>
-
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/VSOi.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/VSOi.wsdl b/taverna-wsdl-generic/src/test/resources/testwsdls/VSOi.wsdl
deleted file mode 100644
index 5070310..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/VSOi.wsdl
+++ /dev/null
@@ -1,305 +0,0 @@
-<?xml version="1.0"?>
-<!-- VSO Data Types -->
-<!-- 2005/03/21 : updated for java's 'wscompile'; added 'Extra' fields access. -->
-<!-- 2005/06/03 : pointing at production instance -->
-
-<definitions name="VSO"
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
-	xmlns:vso="http://virtualsolar.org/VSO/VSOi"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	targetNamespace="http://virtualsolar.org/VSO/VSOi">
-	<types>
-		<schema xmlns="http://www.w3.org/2001/XMLSchema"
-  	                targetNamespace="http://virtualsolar.org/VSO/VSOi">
-		
-			<complexType name="StringArray">
-				<complexContent>
-					<restriction base="soapenc:Array">
-						<attribute ref="soapenc:arrayType" wsdl:arrayType="string[]" />
-					</restriction>
-				</complexContent>
-			</complexType>
-
-			<complexType name="Time">
-				<all>
-					<element name="start" type="string" />
-					<element name="end"   type="string" />
-				</all>
-			</complexType>
-			<complexType name="Wave">
-				<all>
-					<element name="wavemin" type="float" />
-					<element name="wavemax" type="float" />
-					<element name="waveunit" type="string" />
-					<element name="wavetype" type="string" minOccurs="0" />
-				</all>
-			</complexType>
-			<complexType name="Extent">
-				<all>
-					<element name="x"    type="string" minOccurs="0" />
-					<element name="y"    type="string" minOccurs="0" />
-					<element name="width" type="string" minOccurs="0" />
-					<element name="length" type="string" minOccurs="0" />
-					<element name="type"  type="string" minOccurs="0" />
-				</all>
-			</complexType>
-			<complexType name="Thumbnail">
-				<all>
-					<element name="hires" type="string" minOccurs="0" />
-					<element name="lowres" type="string" minOccurs="0" />
-				</all>
-			</complexType>
-			<complexType name="Extra">
-				<all>
-					<element name="thumbnail" type="vso:Thumbnail" minOccurs="0" />
-				</all>
-			</complexType>
-    
-
-			<!-- for "Query" function -->
-			
-			<complexType name="QueryRequestBlock">
-				<all>
-					<element name="provider" type="string" minOccurs="0" />
-					<element name="source" type="string" minOccurs="0" />
-					<element name="instrument" type="string" minOccurs="0" />
-					<element name="physobs" type="string" minOccurs="0" />
-					<element name="time" type="vso:Time" minOccurs="1" />
-					<element name="wave" type="vso:Wave" minOccurs="0" />
-					<element name="extent" type="vso:Extent" minOccurs="0" />
-					<element name="field" type="vso:StringArray" minOccurs="0" />
-				</all>
-			</complexType>
-			<complexType name="QueryRequest">
-				<all>
-					<element name="version" type="float" minOccurs="0" />
-					<element name="block" type="vso:QueryRequestBlock" />
-				</all>
-			</complexType>
-			<complexType name="QueryResponseBlock">
-				<all>
-					<element name="provider" type="string" />
-					<element name="source" type="string" minOccurs="0" />
-					<element name="instrument" type="string" minOccurs="0" />
-					<element name="physobs" type="string" minOccurs="0" />
-					<element name="time" type="vso:Time" />
-					<element name="wave" type="vso:Wave" minOccurs="0" />
-					<element name="extent" type="vso:Extent" minOccurs="0" />
-					<element name="fileid" type="string" minOccurs="0" />
-					<element name="size" type="float" minOccurs="0" /> 
-					<element name="extra" type="vso:Extra" minOccurs="0"/>
-					<element name="info" type="string" minOccurs="0" />
-				</all>
-			</complexType>
-			
-			<complexType name="QueryResponseBlockArray">
-				<complexContent>
-<!--					<sequence>
-						<element name="record" type="vso:QueryResponseBlock" minOccurs="0" />
-					</sequence> --> 
-					<restriction base="soapenc:Array">
-						<attribute ref="soapenc:arrayType" wsdl:arrayType="vso:QueryResponseBlock[]" />
-					</restriction>
-				</complexContent>
-			</complexType>
-			
-			
-			<!-- provider response block (a bit late to rename it now) -->
-			<complexType name="ProviderQueryResponse">
-				<all>
-					<element name="version" type="float" />
-					<element name="provider" type="string" minOccurs="0" />
-					<element name="no_of_records_found" type="int" minOccurs="0" />
-					<element name="no_of_records_returned" type="int" minOccurs="0" />
-					<element name="record" type="vso:QueryResponseBlockArray" minOccurs="0" />
-					<element name="error" type="string" minOccurs="0" />
-					<element name="debug" type="string" minOccurs="0" />
-					<element name="status" type="string" minOccurs="0" />
-				</all>
-			</complexType>
-                        <complexType name="VSOQueryResponse">
-				<complexContent>
-<!--					<sequence>
-						<element name="vsoqueryresponse" type="vso:ProviderQueryResponse" minOccurs="0" />
-					</sequence> -->
-                                        <restriction base="soapenc:Array">
-                                                <attribute ref="soapenc:arrayType" wsdl:arrayType="vso:ProviderQueryResponse[]"/>
-					</restriction>
-				</complexContent>
-			</complexType>
-
-			
-			<!-- for "GetData" function -->
-			<complexType name="Info">
-			        <all>
-				        <element name="email" type="string" />
-					<element name="host"  type="string" minOccurs="0" />
-   			                <element name="user"  type="string" minOccurs="0" />
-					<element name="directory" type="string" minOccurs="0" />  
-					<element name="password"  type="string" minOcurrs="0" />
-					<element name="address"   type="string" minOccurs="0" />
-					<element name="required" type="string" minOccurs="0" />
-			        </all>
-			</complexType>
-
-			<complexType name="DataRequest">
-				<all>
-					<element name="provider" type="string" />
-					<element name="fileid" type="vso:StringArray" />
-				</all>
-			</complexType>
-
-			<complexType name="DataRequestArray">
-				<complexContent>
-<!--
-					<sequence>
-						<element name="datarequestarray" type="vso:DataRequest" minOccurs='0' />
-					</sequence>
--->
-					<restriction base="soapenc:Array">
-						<attribute ref="soapenc:arrayType" wsdl:arrayType="vso:DataRequest[]" />
-					</restriction>
-				</complexContent>
-			</complexType>
-			
-			<complexType name="GetDataRequest">
-				<all>
-					<element name="method" type="vso:StringArray" />
-					<element name="info" type="vso:Info" minOccurs="0" />
-					<element name="data" type="vso:DataRequestArray" minOccurs="0"/>
-				</all>
-			</complexType>
-			
-			<complexType name="VSOGetDataRequest">
-				<all>
-					<element name="version" type="float" minOccurs="0" />
-					<element name="request" type="vso:GetDataRequest" />
-				</all>
-			</complexType>
-			
-			
-			<complexType name="Data">
-				<all>
-					<element name="fileid" type="vso:StringArray" minOccurs="0" />
-					<element name="url" type="string" minOccurs="0" />
-					<element name="provider" type="string" minOccurs="0" />
-					<element name="status" type="string" minOccurs="0"  />
-					<element name="details" type="string" minOccurs="0" />
-					<element name="content" type="string" minOccurs="0" />
-				</all>
-			</complexType>
-
-			<complexType name="DataArray">
-				<complexContent>
-<!--
-					<sequence>
-						<element name="dataarray" type="vso:Data" minOccurs='0' />
-					</sequence>
--->
-					<restriction base="soapenc:Array">
-						<attribute ref="soapenc:arrayType" wsdl:arrayType="vso:Data[]" />
-					</restriction>
-				</complexContent>
-			</complexType>
-
-
-			<complexType name="ProviderGetDataResponse">
-				<all>
-					<element name="version" type="float" />
-					<element name="info" type="vso:StringArray" minOccurs="0" />
-					<element name="provider" type="string" minOccurs="0" />
-					<element name="data" type="vso:DataArray" minOccurs="0" />
-					<element name="status" type="string" minOccurs="0" />
-					<element name="debug" type="string" minOccurs="0" />
-					<element name="method" type="vso:StringArray" minOccurs="0" />
-				</all>
-			</complexType>
-
-			<complexType name="VSOGetDataResponse">
-				<complexContent>
-<!--
-					<sequence>
-						<element name="vsogetdataresponse" type="vso:ProviderGetDataResponse" minOccurs='0' />
-					</sequence>
--->
-					<restriction base="soapenc:Array">
-						<attribute ref="soapenc:arrayType" wsdl:arrayType="vso:ProviderGetDataResponse[]" />
-					</restriction>
-				</complexContent>
-			</complexType>
-		</schema>
-	</types>
-
-	<message name="QueryInput">
-		<part name="body" type="vso:QueryRequest" />
-	</message>
-	<message name="QueryOutput">
-		<part name="body" type="vso:VSOQueryResponse" />
-	</message>
-	
-	<message name="GetDataInput">
-		<part name="body" type="vso:VSOGetDataRequest" />
-	</message>
-	<message name="GetDataOutput">
-		<part name="body" type="vso:VSOGetDataResponse" />
-	</message>
-	
-	<portType name="VSOiPort">
-		<operation name="Query">
-			<input message="vso:QueryInput" />
-			<output message="vso:QueryOutput" />
-		</operation>
-		<operation name="GetData">
-			<input message="vso:GetDataInput" />
-			<output message="vso:GetDataOutput" />
-		</operation>
-	</portType>
-	
-	<binding name="VSOiBinding" type="vso:VSOiPort">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
-		<operation name="Query">
-			<soap:operation soapAction="http://virtualsolar.org/VSO/VSOi#Query" />
-			<input>
-				<soap:body
-					use="encoded"
-					namespace="http://virtualsolar.org/VSO/VSOi"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-				/>
-			</input>
-			<output>
-				<soap:body
-					use="encoded"
-					namespace="http://virtualsolar.org/VSO/VSOi"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-				/>
-			</output>
-		</operation>
-		
-		<operation name="GetData">
-			<soap:operation soapAction="http://virtualsolar.org/VSO/VSOi#GetData" />
-			<input>
-				<soap:body
-					use="encoded"
-					namespace="http://virtualsolar.org/VSO/VSOi"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-				/>
-			</input>
-			<output>
-				<soap:body
-					use="encoded"
-					namespace="http://virtualsolar.org/VSO/VSOi"
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-				/>
-			</output>
-		</operation>
-	</binding>
-	
-	<service name="VSOiService">
-		<port name="sdacVSOi" binding="vso:VSOiBinding">
-			<soap:address location="http://vso.nascom.nasa.gov/cgi/VSOi_strict" />
-		</port>
-	</service>
-</definitions>
-

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/bind.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/bind.wsdl b/taverna-wsdl-generic/src/test/resources/testwsdls/bind.wsdl
deleted file mode 100644
index cd50141..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/bind.wsdl
+++ /dev/null
@@ -1,354 +0,0 @@
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="urn:BINDSOAP" xmlns:intf="urn:BINDSOAP" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:BINDSOAP">
-	<wsdl:types>
-		<schema targetNamespace="urn:BINDSOAP" xmlns="http://www.w3.org/2001/XMLSchema">
-			<import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-			<complexType name="BINDSOAPException">
-				<sequence>
-					<element name="message" type="xsd:string" nillable="true"/>
-				</sequence>
-			</complexType>
-			<complexType name="SearchResultBean">
-				<sequence>
-					<element name="totalRecordsFound" type="xsd:int"/>
-					<element name="records" type="xsd:string" nillable="true"/>
-					<element name="query" type="xsd:string" nillable="true"/>
-					<element name="returnType" type="xsd:string" nillable="true"/>
-				</sequence>
-			</complexType>
-			
-			<complexType name="BIVMolecule">
-				<sequence>
-					<element name="id" type="xsd:int"/>
-					<element name="idtype" type="xsd:string" nillable="true"/>
-					<element name="shortlabel" type="xsd:string" nillable="true"/>
-					<element name="taxname" type="xsd:string" nillable="true"/>
-					<element name="aliases" type="xsd:string" nillable="true"/>
-					<element name="redundant-ids" type="xsd:string" nillable="true"/>
-					<element name="smid-hits" type="xsd:int"/>
-				</sequence>
-			</complexType>
-			
-			<complexType name="BIVInteraction">
-				<sequence>
-					<element name="bid" type="xsd:int"/>
-					<element name="molA" type="impl:BIVMolecule" nillable="true"/>
-					<element name="molB" type="impl:BIVMolecule" nillable="true"/>
-				</sequence>
-			</complexType>
-			
-			<complexType name="BIVComplex">
-				<sequence>
-					<element name="bid" type="xsd:int"/>
-					<element name="spokeModel" type="xsd:boolean"/>
-					<element name="subunit" type="impl:BIVMolecule" maxOccurs="unbounded"/>
-				</sequence>
-			</complexType>
-			<complexType name="BIVRecord">
-				<choice>
-					<element name="interaction" type="impl:BIVInteraction" />
-					<element name="complex" type="impl:BIVComplex"/>
-				</choice>
-			</complexType>
-			<complexType name="ArrayOfBIVInteraction">
-				<complexContent>
-					<restriction base="soapenc:Array">
-						<attribute ref="soapenc:arrayType" wsdl:arrayType="impl:BIVInteraction[]" />
-					</restriction>
-				</complexContent>
-			</complexType>
-			<complexType name="ArrayOfBIVRecord">
-				<complexContent>
-					<restriction base="soapenc:Array">
-						<attribute ref="soapenc:arrayType" wsdl:arrayType="impl:BIVRecord[]" />
-					</restriction>
-				</complexContent>
-			</complexType>
-			<complexType name="ArrayOf_xsd_int">
-				<complexContent>
-					<restriction base="soapenc:Array">
-						<attribute ref="soapenc:arrayType" wsdl:arrayType="xsd:int[]" />
-					</restriction>
-				</complexContent>
-			</complexType>
-		</schema>
-	</wsdl:types>
-	<wsdl:message name="BINDSOAPException">
-		<wsdl:part name="BINDSOAPException" type="impl:BINDSOAPException"/>
-	</wsdl:message>
-	<wsdl:message name="isServiceAliveResponse">
-		<wsdl:part name="isServiceAliveReturn" type="xsd:boolean"/>
-	</wsdl:message>
-	<wsdl:message name="idSearchRequest">
-		<wsdl:part name="id" type="xsd:string"/>
-		<wsdl:part name="idType" type="xsd:string"/>
-		<wsdl:part name="returnType" type="xsd:string"/>
-	</wsdl:message>
-	<wsdl:message name="idSearchAttachmentRequest">
-		<wsdl:part name="id" type="xsd:string"/>
-		<wsdl:part name="idType" type="xsd:string"/>
-		<wsdl:part name="returnType" type="xsd:string"/>
-		<wsdl:part name="attachmentFormat" type="xsd:string"/>
-	</wsdl:message>
-	<wsdl:message name="textSearchRequest">
-		<wsdl:part name="luceneQuery" type="xsd:string"/>
-		<wsdl:part name="returnType" type="xsd:string"/>
-	</wsdl:message>
-	<wsdl:message name="textSearchAttachmentRequest">
-		<wsdl:part name="luceneQuery" type="xsd:string"/>
-		<wsdl:part name="returnType" type="xsd:string"/>
-		<wsdl:part name="attachmentFormat" type="xsd:string"/>
-	</wsdl:message>
-	<wsdl:message name="BIVGetInteractionRecordRequest">
-		<wsdl:part name="bid" type="xsd:int"/>
-	</wsdl:message>
-	<wsdl:message name="BIVGetInteractionRecordResponse">
-		<wsdl:part name="BIVInteraction" type="impl:BIVInteraction"/>
-	</wsdl:message>
-	<wsdl:message name="BIVGetComplexRecordRequest">
-		<wsdl:part name="bid" type="xsd:int"/>
-	</wsdl:message>
-	<wsdl:message name="BIVGetComplexRecordResponse">
-		<wsdl:part name="BIVComplex" type="impl:BIVComplex"/>
-	</wsdl:message>
-	<wsdl:message name="BIVGetNeighboursRequest">
-		<wsdl:part name="id" type="xsd:string"/>
-		<wsdl:part name="idType" type="xsd:string"/>
-	</wsdl:message>
-	<wsdl:message name="BIVGetNeighboursResponse">
-		<wsdl:part name="BIVInteraction" type="impl:ArrayOfBIVInteraction"/>
-	</wsdl:message>
-	<wsdl:message name="BIVGetRecordRequest">
-		<wsdl:part name="bid" type="xsd:int"/>
-	</wsdl:message>
-	<wsdl:message name="BIVGetRecordResponse">
-		<wsdl:part name="BIVRecord" type="impl:BIVRecord"/>
-	</wsdl:message>
-	<wsdl:message name="BIVGetRecordsRequest">
-		<wsdl:part name="ids" type="impl:ArrayOf_xsd_int"/>
-	</wsdl:message>
-	<wsdl:message name="BIVGetRecordsResponse">
-		<wsdl:part name="BIVRecords" type="impl:ArrayOfBIVRecord"/>
-	</wsdl:message>
-	<wsdl:message name="getResponse">
-		<wsdl:part name="searchResultBean" type="impl:SearchResultBean"/>
-	</wsdl:message>
-	<wsdl:message name="getVersionResponse">
-		<wsdl:part name="version" type="xsd:string"/>
-	</wsdl:message>
-	<wsdl:message name="emptyRequest"/>
-	<wsdl:portType name="BINDSOAPPort">
-		<wsdl:operation name="isServiceAlive" parameterOrder="">
-			<wsdl:input name="isServiceAliveRequest" message="impl:emptyRequest"/>
-			<wsdl:output name="isServiceAliveResponse" message="impl:isServiceAliveResponse"/>
-			<wsdl:fault name="BINDSOAPException" message="impl:BINDSOAPException"/>
-		</wsdl:operation>
-		<wsdl:operation name="getSoftwareVersion" parameterOrder="">
-			<wsdl:input name="getSoftwareVersionRequest" message="impl:emptyRequest"/>
-			<wsdl:output name="getSoftwareVersionResponse" message="impl:getVersionResponse"/>
-			<wsdl:fault name="BINDSOAPException" message="impl:BINDSOAPException"/>
-		</wsdl:operation>
-		<wsdl:operation name="getSpecVersion" parameterOrder="">
-			<wsdl:input name="getSpecVersionRequest" message="impl:emptyRequest"/>
-			<wsdl:output name="getSpecVersionResponse" message="impl:getVersionResponse"/>
-			<wsdl:fault name="BINDSOAPException" message="impl:BINDSOAPException"/>
-		</wsdl:operation>
-		<wsdl:operation name="idSearch" parameterOrder="id idType returnType">
-			<wsdl:input name="idSearchRequest" message="impl:idSearchRequest"/>
-			<wsdl:output name="idSearchResponse" message="impl:getResponse"/>
-			<wsdl:fault name="BINDSOAPException" message="impl:BINDSOAPException"/>
-		</wsdl:operation>
-		<wsdl:operation name="idSearchAttachment" parameterOrder="id idType returnType attachmentFormat">
-			<wsdl:input name="idSearchAttachmentRequest" message="impl:idSearchAttachmentRequest"/>
-			<wsdl:output name="idSearchAttachmentResponse" message="impl:getResponse"/>
-			<wsdl:fault name="BINDSOAPException" message="impl:BINDSOAPException"/>
-		</wsdl:operation>
-		<wsdl:operation name="textSearch" parameterOrder="luceneQuery returnType">
-			<wsdl:input name="textSearchRequest" message="impl:textSearchRequest"/>
-			<wsdl:output name="textSearchResponse" message="impl:getResponse"/>
-			<wsdl:fault name="BINDSOAPException" message="impl:BINDSOAPException"/>
-		</wsdl:operation>
-		<wsdl:operation name="textSearchAttachment" parameterOrder="luceneQuery returnType attachmentFormat">
-			<wsdl:input name="textSearchAttachmentRequest" message="impl:textSearchAttachmentRequest"/>
-			<wsdl:output name="textSearchAttachmentResponse" message="impl:getResponse"/>
-			<wsdl:fault name="BINDSOAPException" message="impl:BINDSOAPException"/>
-		</wsdl:operation>
-		<wsdl:operation name="BIVGetInteractionRecord" parameterOrder="bid">
-			<wsdl:input name="BIVGetInteractionRecordRequest" message="impl:BIVGetInteractionRecordRequest"/>
-			<wsdl:output name="BIVGetInteractionRecordResponse" message="impl:BIVGetInteractionRecordResponse"/>
-			<wsdl:fault name="BINDSOAPException" message="impl:BINDSOAPException"/>
-		</wsdl:operation>
-		<wsdl:operation name="BIVGetComplexRecord" parameterOrder="bid">
-			<wsdl:input name="BIVGetComplexRecordRequest" message="impl:BIVGetComplexRecordRequest"/>
-			<wsdl:output name="BIVGetComplexRecordResponse" message="impl:BIVGetComplexRecordResponse"/>
-			<wsdl:fault name="BINDSOAPException" message="impl:BINDSOAPException"/>
-		</wsdl:operation>
-		<wsdl:operation name="BIVGetNeighbours" parameterOrder="id idType">
-			<wsdl:input name="BIVGetNeighboursRequest" message="impl:BIVGetNeighboursRequest"/>
-			<wsdl:output name="BIVGetNeighboursResponse" message="impl:BIVGetNeighboursResponse"/>
-			<wsdl:fault name="BINDSOAPException" message="impl:BINDSOAPException"/>
-		</wsdl:operation>
-		<wsdl:operation name="BIVGetRecord" parameterOrder="bid">
-			<wsdl:input name="BIVGetRecordRequest" message="impl:BIVGetRecordRequest"/>
-			<wsdl:output name="BIVGetRecordResponse" message="impl:BIVGetRecordResponse"/>
-			<wsdl:fault name="BINDSOAPException" message="impl:BINDSOAPException"/>
-		</wsdl:operation>
-		<wsdl:operation name="BIVGetRecords" parameterOrder="ids">
-			<wsdl:input name="BIVGetRecordsRequest" message="impl:BIVGetRecordsRequest"/>
-			<wsdl:output name="BIVGetRecordsResponse" message="impl:BIVGetRecordsResponse"/>
-			<wsdl:fault name="BINDSOAPException" message="impl:BINDSOAPException"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="BINDSOAPBinding" type="impl:BINDSOAPPort">
-		<wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsdl:operation name="isServiceAlive">
-			<wsdlsoap:operation soapAction="urn:#isServiceAlive"/>
-			<wsdl:input>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:input>			
-			<wsdl:output>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:output>
-			<wsdl:fault name="BINDSOAPException">
-				<wsdlsoap:fault name="BINDSOAPException" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="getSoftwareVersion">
-			<wsdlsoap:operation soapAction="urn:#getSoftwareVersion"/>
-			<wsdl:input>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:input>
-			<wsdl:output>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:output>
-			<wsdl:fault name="BINDSOAPException">
-				<wsdlsoap:fault name="BINDSOAPException" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="getSpecVersion">
-			<wsdlsoap:operation soapAction="urn:#getSpecVersion"/>
-			<wsdl:input>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:input>
-			<wsdl:output>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:output>
-			<wsdl:fault name="BINDSOAPException">
-				<wsdlsoap:fault name="BINDSOAPException" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="idSearch">
-			<wsdlsoap:operation soapAction="urn:#idSearch"/>
-			<wsdl:input>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:input>
-			<wsdl:output>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:output>
-			<wsdl:fault name="BINDSOAPException">
-				<wsdlsoap:fault name="BINDSOAPException" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="idSearchAttachment">
-			<wsdlsoap:operation soapAction="urn:#idSearchAttachment"/>
-			<wsdl:input>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:input>
-			<wsdl:output>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:output>
-			<wsdl:fault name="BINDSOAPException">
-				<wsdlsoap:fault name="BINDSOAPException" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="textSearch">
-			<wsdlsoap:operation soapAction="urn:#textSearch"/>
-			<wsdl:input>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:input>
-			<wsdl:output>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:output>
-			<wsdl:fault name="BINDSOAPException">
-				<wsdlsoap:fault name="BINDSOAPException" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="textSearchAttachment">
-			<wsdlsoap:operation soapAction="urn:#textSearchAttachment"/>
-			<wsdl:input>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:input>
-			<wsdl:output>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:output>
-			<wsdl:fault name="BINDSOAPException">
-				<wsdlsoap:fault name="BINDSOAPException" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="BIVGetInteractionRecord">
-			<wsdlsoap:operation soapAction="urn:#BIVGetInteractionRecord"/>
-			<wsdl:input>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:input>
-			<wsdl:output>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:output>
-			<wsdl:fault name="BINDSOAPException">
-				<wsdlsoap:fault name="BINDSOAPException" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="BIVGetComplexRecord">
-			<wsdlsoap:operation soapAction="urn:#BIVGetComplexRecord"/>
-			<wsdl:input>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:input>
-			<wsdl:output>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:output>
-			<wsdl:fault name="BINDSOAPException">
-				<wsdlsoap:fault name="BINDSOAPException" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="BIVGetNeighbours">
-			<wsdlsoap:operation soapAction="urn:#BIVGetNeighbours"/>
-			<wsdl:input>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:input>
-			<wsdl:output>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:output>
-			<wsdl:fault name="BINDSOAPException">
-				<wsdlsoap:fault name="BINDSOAPException" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="BIVGetRecord">
-			<wsdlsoap:operation soapAction="urn:#BIVGetRecord"/>
-			<wsdl:input>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:input>
-			<wsdl:output>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:output>
-			<wsdl:fault name="BINDSOAPException">
-				<wsdlsoap:fault name="BINDSOAPException" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="BIVGetRecords">
-			<wsdlsoap:operation soapAction="urn:#BIVGetRecords"/>
-			<wsdl:input>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:input>
-			<wsdl:output>
-				<wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:output>
-			<wsdl:fault name="BINDSOAPException">
-				<wsdlsoap:fault name="BINDSOAPException" use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:BINDSOAP"/>
-			</wsdl:fault>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="BINDService">
-		<wsdl:port name="BINDSOAP" binding="impl:BINDSOAPBinding">
-			<wsdlsoap:address location="http://soap.bind.ca/services/BINDSOAP"/>
-		</wsdl:port>
-	</wsdl:service>
-
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch.xsd b/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch.xsd
deleted file mode 100644
index e9d522c..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch.xsd
+++ /dev/null
@@ -1,118 +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" -->
-
-<s:include schemaLocation="efetch_taxon.xsd" /> 
-<s:include schemaLocation="efetch_bio.xsd" />
-<s:include schemaLocation="efetch_nlmc.xsd" /> 
-<s:include schemaLocation="efetch_pubmed.xsd" /> 
-<s:include schemaLocation="efetch_pmc.xsd" />  
-
-  <s:complexType name="IdListType">
-    <s:sequence>
-      <s:element minOccurs="0" maxOccurs="unbounded" name="Id" type="s:string" />
-    </s:sequence>
-  </s:complexType>
-
-<!-- Request/Response -->
-
-  <s:element name="eFetchRequest">
-    <s:complexType>
-      <s:sequence>
-        <s:element minOccurs="0" maxOccurs="1" name="db" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="id" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="WebEnv" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="query_key" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="tool" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="email" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="retstart" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="retmax" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="rettype" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="strand" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="seq_start" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="seq_stop" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="complexity" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="report" type="s:string" />
-      </s:sequence>
-    </s:complexType>
-  </s:element>
-
-  <s:element name="eFetchRequestMS">
-    <s:complexType>
-      <s:sequence>
-        <s:element minOccurs="0" maxOccurs="1" name="db" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="id" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="WebEnv" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="query_key" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="tool" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="email" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="retstart" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="retmax" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="rettype" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="strand" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="seq_start" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="seq_stop" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="complexity" type="s:string" />
-        <s:element minOccurs="0" maxOccurs="1" name="report" type="s:string" />
-      </s:sequence>
-    </s:complexType>
-  </s:element>
-
-  
-<!-- All in one -->  
-
-  <s:element name="eFetchResult">
-    <s:complexType>
-      <s:sequence>
-        <s:element minOccurs="0" maxOccurs="1" name="ERROR" type="s:string" />
-
-        <s:element minOccurs="0" maxOccurs="1" name="NLMCatalogRecordSet" type="tns:NLMCatalogRecordSetType" />
-        <s:element minOccurs="0" maxOccurs="1" name="PubmedArticleSet" type="tns:PubmedArticleSetType" />
-        <s:element minOccurs="0" maxOccurs="1" name="pmc-articleset" type="tns:pmc-articlesetType" />
-        <s:element minOccurs="0" maxOccurs="1" ref="tns:Mim-entries" />
-
-        <s:element minOccurs="0" maxOccurs="1" name="TaxaSet" type="tns:TaxaSetType" />
-        <s:element minOccurs="0" maxOccurs="1" ref="tns:TSeqSet"/>
-        <s:element minOccurs="0" maxOccurs="1" ref="tns:GBSet" />
-        <s:element minOccurs="0" maxOccurs="1" name="Bioseq-set" type="tns:Bioseq-setType" />
-        <s:element minOccurs="0" maxOccurs="1" ref="tns:Entrezgene-Set" />
-        <s:element minOccurs="0" maxOccurs="1" ref="tns:ExchangeSet" /> 
-        <s:element minOccurs="0" maxOccurs="1" name="IdList" type="tns:IdListType" />
-      </s:sequence>
-    </s:complexType>
-  </s:element>
-
-    <s:complexType name="eFetchResultType">
-      <s:sequence>
-        <s:element minOccurs="0" maxOccurs="1" name="ERROR" type="s:string" />
-
-        <s:element minOccurs="0" maxOccurs="1" name="NLMCatalogRecordSet" type="tns:NLMCatalogRecordSetType" />
-        <s:element minOccurs="0" maxOccurs="1" name="PubmedArticleSet" type="tns:PubmedArticleSetType" />
-        <s:element minOccurs="0" maxOccurs="1" name="pmc-articleset" type="tns:pmc-articlesetType" />
-        <s:element minOccurs="0" maxOccurs="1" ref="tns:Mim-entries" />
-
-        <s:element minOccurs="0" maxOccurs="1" name="TaxaSet" type="tns:TaxaSetType" />
-        <s:element minOccurs="0" maxOccurs="1" ref="tns:TSeqSet"/>
-        <s:element minOccurs="0" maxOccurs="1" ref="tns:GBSet" />
-        <s:element minOccurs="0" maxOccurs="1" name="Bioseq-set" type="tns:Bioseq-setType" />
-        <s:element minOccurs="0" maxOccurs="1" ref="tns:Entrezgene-Set" />
-        <s:element minOccurs="0" maxOccurs="1" ref="tns:ExchangeSet" /> 
-        <s:element minOccurs="0" maxOccurs="1" name="IdList" type="tns:IdListType" />
-      </s:sequence>
-    </s:complexType>
-
-  <s:element name="eFetchResultMS">
-    <s:complexType>
-      <s:sequence>
-        <s:element minOccurs="0" maxOccurs="1" name="eFetchResult" type="tns:eFetchResultType" />
-      </s:sequence>
-    </s:complexType>
-  </s:element>
-  
-  
-</s:schema>


[27/28] incubator-taverna-common-activities git commit: Details about Jetty

Posted by st...@apache.org.
Details about Jetty


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/c49ce852
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/c49ce852
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/c49ce852

Branch: refs/heads/cwl-browse
Commit: c49ce8523735bfcc564ca42425bb494f7130cd72
Parents: 8e6553f
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon May 2 01:24:22 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon May 2 01:28:31 2016 +0100

----------------------------------------------------------------------
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c49ce852/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index f139215..5213e04 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,6 @@ The following provides more details on the included cryptographic software:
   (JSSE) and depend on
   [Apache WSS4J](https://ws.apache.org/wss4j/),
   [Apache XML Security for Java](https://santuario.apache.org/javaindex.html)
-  and [Open SAML Java](https://shibboleth.net/products/opensaml-java.html))
   for accessing secure SOAP Web Services.
 * Apache Taverna Common Activities depends on the
   [Apache Taverna Engine](http://taverna.incubator.apache.org/download/engine/)
@@ -150,4 +149,6 @@ The following provides more details on the included cryptographic software:
   management of username/password and client/server SSL certificates.
 * [taverna-interaction-activity](taverna-interaction-activity) depend on
   [Jetty](http://www.eclipse.org/jetty/),
-  which includes UnixCrypt.java for one way cryptography.
+  which includes UnixCrypt.java for one way cryptography, and can be
+  configured for SSL encryption using
+  [Java Secure Socket Extension](https://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html)


[08/28] incubator-taverna-common-activities git commit: Moved third-party test WSDLs to https://github.com/taverna-extras/wsdl-generic-test-cases

Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_nlmc.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_nlmc.xsd b/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_nlmc.xsd
deleted file mode 100644
index 6596cd6..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/eutils/efetch_nlmc.xsd
+++ /dev/null
@@ -1,1021 +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.nlm.nih.gov/databases/dtd/nlmcatalogrecord_060101.dtd date: 01/09/2006 -->
-
-    <xs:complexType name="AbstractType">
-		<xs:sequence>
-			<xs:element ref="tns:AbstractText"/>
-			<xs:element ref="tns:CopyrightInformation" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="AbstractText" type="xs:string"/>
-	<xs:element name="AccessionNumber" type="xs:string"/>
-	<xs:complexType name="AccessionNumberListType">
-		<xs:sequence>
-			<xs:element ref="tns:AccessionNumber" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AcquisitionInfoType">
-		<xs:sequence>
-			<xs:element ref="tns:StockNumber" minOccurs="0"/>
-			<xs:element ref="tns:AcquisitionSource" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AcquisitionInfoListType">
-		<xs:sequence>
-			<xs:element name="AcquisitionInfo" type="tns:AcquisitionInfoType" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="AcquisitionSource" type="xs:string"/>
-	<xs:element name="Acronym" type="xs:string"/>
-	<xs:element name="Affiliation" type="xs:string"/>
-	<xs:element name="Agency" type="xs:string"/>
-	<xs:complexType name="ArticleType">
-		<xs:sequence>
-			<xs:element name="Journal" type="tns:JournalType"/>
-			<xs:element name="Book" type="tns:BookType"/>
-			<xs:element ref="tns:ArticleTitle" minOccurs="0"/>
-			<xs:element name="Pagination" type="tns:PaginationType"/>
-			<xs:element name="Abstract" type="tns:AbstractType" minOccurs="0"/>
-			<xs:element ref="tns:Affiliation" minOccurs="0"/>
-			<xs:element name="AuthorList" type="tns:AuthorListType" minOccurs="0"/>
-			<xs:element ref="tns:Language" maxOccurs="unbounded"/>
-			<xs:element name="DataBankList" type="tns:DataBankListType" minOccurs="0"/>
-			<xs:element name="GrantList" type="tns:GrantListType" minOccurs="0"/>
-			<xs:element name="PublicationTypeList" type="tns:PublicationTypeListType" minOccurs="0"/>
-			<xs:element ref="tns:VernacularTitle" minOccurs="0"/>
-			<xs:element name="ArticleDate" type="tns:ArticleDateType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ArticleDateType">
-		<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="DateType" type="xs:string" fixed="Electronic"/>
-	</xs:complexType>
-	<xs:element name="ArticleTitle" type="xs:string"/>
-	<xs:complexType name="AuthorType_nlmc">
-		<xs:sequence>
-            <xs:element ref="tns:LastName"/>
-            <xs:element ref="tns:ForeName"/>
-            <xs:element ref="tns:FirstName"/>
-            <xs:element ref="tns:MiddleName" minOccurs="0"/>
-            <xs:element ref="tns:Initials" minOccurs="0"/>
-            <xs:element ref="tns:Suffix" minOccurs="0"/>
-            <xs:element ref="tns:CollectiveName"/>
-            <xs:element ref="tns:Affiliation" minOccurs="0"/>
-            <xs:element ref="tns:DatesAssociatedWithName" minOccurs="0"/>
-            <xs:element ref="tns:NameQualifier" minOccurs="0"/>
-            <xs:element ref="tns:OtherInformation" minOccurs="0"/>
-            <xs:element ref="tns:TitleAssociatedWithName" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="ValidYN" default="Y">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="Y"/>
-					<xs:enumeration value="N"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="AuthorListType">
-		<xs:sequence>
-			<xs:element name="Author" type="tns:AuthorType_nlmc" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="CompleteYN" default="Y">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="Y"/>
-					<xs:enumeration value="N"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="BookType">
-		<xs:sequence>
-			<xs:element name="PubDate" type="tns:PubDateType" minOccurs="0"/>
-			<xs:element name="Publisher" type="tns:PublisherType"/>
-			<xs:element ref="tns:Title"/>
-			<xs:element name="AuthorList" type="tns:AuthorListType" minOccurs="0"/>
-			<xs:element ref="tns:CollectionTitle" minOccurs="0"/>
-			<xs:element ref="tns:Volume" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="BroadJournalHeading" type="xs:string"/>
-	<xs:complexType name="BroadJournalHeadingListType">
-		<xs:sequence>
-			<xs:element ref="tns:BroadJournalHeading" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="ChapterPgn" type="xs:string"/>
-	<xs:complexType name="ChemicalType">
-		<xs:sequence>
-			<xs:element ref="tns:RegistryNumber"/>
-			<xs:element ref="tns:NameOfSubstance"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ChemicalListType">
-		<xs:sequence>
-			<xs:element name="Chemical" type="tns:ChemicalType" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ClassificationType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="NLMCallNumberYN" default="Y">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Y"/>
-							<xs:enumeration value="N"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-				<xs:attribute name="Authority" default="Undetermined">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="KIE"/>
-							<xs:enumeration value="MARC"/>
-							<xs:enumeration value="NLM"/>
-							<xs:enumeration value="Other"/>
-							<xs:enumeration value="Undetermined"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-				<xs:attribute name="CallNumberType" default="Other">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="NLMClass"/>
-							<xs:enumeration value="Other"/>
-							<xs:enumeration value="ShelvingNumber"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="Coden" type="xs:string"/>
-	<xs:complexType name="CollaborativePartnerDateType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="Owner" default="Undetermined">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="HMD"/>
-							<xs:enumeration value="HSR"/>
-							<xs:enumeration value="KIE"/>
-							<xs:enumeration value="NASA"/>
-							<xs:enumeration value="NCBI"/>
-							<xs:enumeration value="NLM"/>
-							<xs:enumeration value="NOTNLM"/>
-							<xs:enumeration value="NYA"/>
-							<xs:enumeration value="PIP"/>
-							<xs:enumeration value="Undetermined"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-				<xs:attribute name="CollaborativeStatus" default="Other">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Create"/>
-							<xs:enumeration value="In-House-Review"/>
-							<xs:enumeration value="Other"/>
-							<xs:enumeration value="Released"/>
-							<xs:enumeration value="Review"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="CollectionTitle" type="xs:string"/>
-	<xs:element name="CollectiveName" type="xs:string"/>
-	<xs:element name="ContentsNote" type="xs:string"/>
-	<xs:element name="CopyrightInformation" type="xs:string"/>
-	<xs:element name="Country" type="xs:string"/>
-	<xs:element name="Coverage" type="xs:string"/>
-	<xs:complexType name="DataBankType">
-		<xs:sequence>
-			<xs:element ref="tns:DataBankName"/>
-			<xs:element name="AccessionNumberList" type="tns:AccessionNumberListType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="DataBankListType">
-		<xs:sequence>
-			<xs:element name="DataBank" type="tns:DataBankType" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="CompleteYN" default="Y">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="Y"/>
-					<xs:enumeration value="N"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:element name="DataBankName" type="xs:string"/>
-	<xs:complexType name="DateAuthorizedType">
-		<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:complexType>
-	<xs:complexType name="DateCompletedType">
-		<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:complexType>
-	<xs:complexType name="DateCreatedType">
-		<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:complexType>
-	<xs:complexType name="DateIssuedType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="ImprintType" default="Current">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Current"/>
-							<xs:enumeration value="Original"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="DateRevisedType">
-		<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:complexType>
-	<xs:complexType name="DateRevisedMajorType">
-		<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:complexType>
-	<xs:element name="DatesAssociatedWithName" type="xs:string"/>
-	<xs:element name="DatesOfSerialPublication" type="xs:string"/>
-	<xs:element name="Day" type="xs:string"/>
-	<xs:complexType name="DeleteCatalogRecordType">
-		<xs:sequence>
-			<xs:element ref="tns:NlmUniqueID" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="DescriptiveInformation" type="xs:string"/>
-	<xs:complexType name="DescriptorNameType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="MajorTopicYN" default="N">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Y"/>
-							<xs:enumeration value="N"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="Edition" type="xs:string"/>
-	<xs:complexType name="ElectronicAccessType">
-		<xs:sequence>
-			<xs:element ref="tns:ElectronicAddress" minOccurs="0"/>
-			<xs:element ref="tns:DescriptiveInformation" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ElectronicAccessListType">
-		<xs:sequence>
-			<xs:element name="ElectronicAccess" type="tns:ElectronicAccessType" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="ElectronicAddress" type="xs:string"/>
-	<xs:element name="EndPage" type="xs:string"/>
-	<xs:element name="Extent" type="xs:string"/>
-	<xs:element name="FirstName" type="xs:string"/>
-	<xs:element name="ForeName" type="xs:string"/>
-	<xs:element name="Form" type="xs:string"/>
-	<xs:complexType name="FrequencyType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="FrequencyType" default="Current">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Current"/>
-							<xs:enumeration value="Former"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="GeneralNoteType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="Owner" default="Undetermined">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="HMD"/>
-							<xs:enumeration value="HSR"/>
-							<xs:enumeration value="KIE"/>
-							<xs:enumeration value="NASA"/>
-							<xs:enumeration value="NCBI"/>
-							<xs:enumeration value="NLM"/>
-							<xs:enumeration value="NOTNLM"/>
-							<xs:enumeration value="NYA"/>
-							<xs:enumeration value="PIP"/>
-							<xs:enumeration value="Undetermined"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="Genre" type="xs:string"/>
-	<xs:complexType name="GenreListType">
-		<xs:sequence>
-			<xs:element ref="tns:Genre" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="GovDocClassNumberType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="ValidYN" default="Y">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Y"/>
-							<xs:enumeration value="N"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="GrantType">
-		<xs:sequence>
-			<xs:element ref="tns:GrantID" minOccurs="0"/>
-			<xs:element ref="tns:Acronym" minOccurs="0"/>
-			<xs:element ref="tns:Agency" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="GrantID" type="xs:string"/>
-	<xs:complexType name="GrantListType">
-		<xs:sequence>
-			<xs:element name="Grant" type="tns:GrantType" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="CompleteYN" default="Y">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="Y"/>
-					<xs:enumeration value="N"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:element name="Host" type="xs:string"/>
-	<xs:element name="Hour" type="xs:string"/>
-	<xs:complexType name="ISBNType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="ValidYN" default="Y">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Y"/>
-							<xs:enumeration value="N"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="ISOAbbreviation" type="xs:string"/>
-	<xs:complexType name="ISSNType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="IssnType" use="required">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Electronic"/>
-							<xs:enumeration value="Print"/>
-							<xs:enumeration value="Undetermined"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-				<xs:attribute name="ValidYN" default="Y">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Y"/>
-							<xs:enumeration value="N"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="ImprintType_nlmc">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="ImprintType" default="Current">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Current"/>
-							<xs:enumeration value="Original"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="IndexingSourceType">
-		<xs:sequence>
-			<xs:element name="IndexingSourceName" type="tns:IndexingSourceNameType"/>
-			<xs:element ref="tns:Coverage" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="IndexingSourceListType">
-		<xs:sequence>
-			<xs:element name="IndexingSource" type="tns:IndexingSourceType" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="IndexingSourceNameType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="IndexingTreatment" type="xs:string"/>
-				<xs:attribute name="IndexingStatus" type="xs:string"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="Initials" type="xs:string"/>
-	<xs:complexType name="InvestigatorType">
-		<xs:sequence>
-            <xs:element ref="tns:LastName"/>
-            <xs:element ref="tns:ForeName"/>
-            <xs:element ref="tns:FirstName"/>
-            <xs:element ref="tns:MiddleName" minOccurs="0"/>
-            <xs:element ref="tns:Initials" minOccurs="0"/>
-            <xs:element ref="tns:Suffix" minOccurs="0"/>
-            <xs:element ref="tns:Affiliation" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="InvestigatorListType">
-		<xs:sequence>
-			<xs:element name="Investigator" type="tns:InvestigatorType" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="Issuance" type="xs:string"/>
-	<xs:element name="Issue" type="xs:string"/>
-	<xs:complexType name="JournalType">
-		<xs:sequence>
-			<xs:element name="ISSN" type="tns:ISSNType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="JournalIssue" type="tns:JournalIssueType"/>
-			<xs:element ref="tns:Coden" minOccurs="0"/>
-			<xs:element ref="tns:Title" minOccurs="0"/>
-			<xs:element ref="tns:ISOAbbreviation" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="JournalIssueType">
-		<xs:sequence>
-			<xs:element ref="tns:Volume" minOccurs="0"/>
-			<xs:element ref="tns:Issue" minOccurs="0"/>
-			<xs:element name="PubDate" type="tns:PubDateType" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="CitedMedium" use="required">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="Internet"/>
-					<xs:enumeration value="Print"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="KeywordType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="MajorTopicYN" default="N">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Y"/>
-							<xs:enumeration value="N"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="KeywordListType">
-		<xs:sequence>
-			<xs:element name="Keyword" type="tns:KeywordType" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="Owner" default="NLM">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="HMD"/>
-					<xs:enumeration value="HSR"/>
-					<xs:enumeration value="KIE"/>
-					<xs:enumeration value="NASA"/>
-					<xs:enumeration value="NCBI"/>
-					<xs:enumeration value="NLM"/>
-					<xs:enumeration value="NOTNLM"/>
-					<xs:enumeration value="NYA"/>
-					<xs:enumeration value="PIP"/>
-					<xs:enumeration value="Undetermined"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="LCCNType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="ValidYN" default="Y">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Y"/>
-							<xs:enumeration value="N"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="Language" type="xs:string"/>
-	<xs:complexType name="LanguageAlternateType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="LangType" type="xs:string"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="LastName" type="xs:string"/>
-	<xs:complexType name="LocalNoteType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="LocalNoteType" default="Other">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="DashedOn"/>
-							<xs:enumeration value="Other"/>
-							<xs:enumeration value="PreservationAction"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="MedlineDate" type="xs:string"/>
-	<xs:complexType name="MedlineJournalInfoType">
-		<xs:sequence>
-			<xs:element ref="tns:Country" minOccurs="0"/>
-			<xs:element ref="tns:MedlineTA"/>
-			<xs:element ref="tns:NlmUniqueID" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="MedlinePgn" type="xs:string"/>
-	<xs:element name="MedlineTA" type="xs:string"/>
-	<xs:complexType name="MeshHeadingType">
-		<xs:sequence>
-			<xs:element name="DescriptorName" type="tns:DescriptorNameType"/>
-			<xs:element name="QualifierName" type="tns:QualifierNameType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="MeshHeadingListType">
-		<xs:sequence>
-			<xs:element name="MeshHeading" type="tns:MeshHeadingType" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="MiddleName" type="xs:string"/>
-	<xs:element name="Minute" type="xs:string"/>
-	<xs:element name="Month" type="xs:string"/>
-	<xs:element name="NCBIArticle">
-		<xs:complexType>
-			<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>
-	<xs:element name="NCBIIssnAlias" type="xs:string"/>
-	<xs:complexType name="NLMCatalogRecordType">
-		<xs:sequence>
-			<xs:element ref="tns:NlmUniqueID"/>
-			<xs:element name="DateCreated" type="tns:DateCreatedType"/>
-			<xs:element name="DateRevised" type="tns:DateRevisedType"/>
-			<xs:element name="DateAuthorized" type="tns:DateAuthorizedType" minOccurs="0"/>
-			<xs:element name="DateCompleted" type="tns:DateCompletedType" minOccurs="0"/>
-			<xs:element name="DateRevisedMajor" type="tns:DateRevisedMajorType" minOccurs="0"/>
-			<xs:element name="CollaborativePartnerDate" type="tns:CollaborativePartnerDateType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="TitleMain" type="tns:TitleMainType"/>
-			<xs:element ref="tns:MedlineTA" minOccurs="0"/>
-			<xs:element name="TitleOther" type="tns:TitleOtherType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="AuthorList" type="tns:AuthorListType" minOccurs="0"/>
-			<xs:element name="InvestigatorList" type="tns:InvestigatorListType" minOccurs="0"/>
-			<xs:element name="ResourceInfo" type="tns:ResourceInfoType"/>
-			<xs:element name="PublicationTypeList" type="tns:PublicationTypeListType" minOccurs="0"/>
-			<xs:element name="GenreList" type="tns:GenreListType" minOccurs="0"/>
-			<xs:element name="PublicationInfo" type="tns:PublicationInfoType"/>
-			<xs:element ref="tns:Language" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="LanguageAlternate" type="tns:LanguageAlternateType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="PhysicalDescription" type="tns:PhysicalDescriptionType" minOccurs="0"/>
-			<xs:element name="Abstract" type="tns:AbstractType" minOccurs="0"/>
-			<xs:element ref="tns:Affiliation" minOccurs="0"/>
-			<xs:element name="OtherAbstract" type="tns:OtherAbstractType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="tns:ContentsNote" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="IndexingSourceList" type="tns:IndexingSourceListType" minOccurs="0"/>
-			<xs:element ref="tns:NLMIndexNote" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="GeneralNote" type="tns:GeneralNoteType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="LocalNote" type="tns:LocalNoteType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="PersonalNameSubjectList" type="tns:PersonalNameSubjectListType" minOccurs="0"/>
-			<xs:element name="MeshHeadingList" type="tns:MeshHeadingListType" minOccurs="0"/>
-			<xs:element name="OtherSubjectList" type="tns:OtherSubjectListType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="tns:SpaceFlightMission" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="KeywordList" type="tns:KeywordListType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="BroadJournalHeadingList" type="tns:BroadJournalHeadingListType" minOccurs="0"/>
-			<xs:element name="ChemicalList" type="tns:ChemicalListType" minOccurs="0"/>
-			<xs:element name="Classification" type="tns:ClassificationType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="GovDocClassNumber" type="tns:GovDocClassNumberType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="ElectronicAccessList" type="tns:ElectronicAccessListType" minOccurs="0"/>
-			<xs:element ref="tns:Host" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="LCCN" type="tns:LCCNType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="ISBN" type="tns:ISBNType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="ISSN" type="tns:ISSNType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="tns:NCBIIssnAlias" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="tns:STRN" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="tns:Coden" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="OtherID" type="tns:OtherIDType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="AcquisitionInfoList" type="tns:AcquisitionInfoListType" minOccurs="0"/>
-			<xs:element name="ReportNumber" type="tns:ReportNumberType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="Owner" default="Undetermined">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="HMD"/>
-					<xs:enumeration value="HSR"/>
-					<xs:enumeration value="KIE"/>
-					<xs:enumeration value="NASA"/>
-					<xs:enumeration value="NCBI"/>
-					<xs:enumeration value="NLM"/>
-					<xs:enumeration value="NOTNLM"/>
-					<xs:enumeration value="NYA"/>
-					<xs:enumeration value="PIP"/>
-					<xs:enumeration value="Undetermined"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-		<xs:attribute name="Status" type="xs:string"/>
-	</xs:complexType>
-	<xs:element name="NLMCatalogRecordSet">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="NLMCatalogRecord" type="tns:NLMCatalogRecordType" maxOccurs="unbounded"/>
-				<xs:element name="DeleteCatalogRecord" type="tns:DeleteCatalogRecordType" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="NLMIndexNote" type="xs:string"/>
-	<xs:element name="NameOfSubstance" type="xs:string"/>
-	<xs:element name="NameQualifier" type="xs:string"/>
-	<xs:element name="NlmUniqueID" type="xs:string"/>
-	<xs:complexType name="OtherAbstractType">
-		<xs:sequence>
-			<xs:element ref="tns:AbstractText"/>
-			<xs:element ref="tns:CopyrightInformation" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="Type" type="xs:string"/>
-	</xs:complexType>
-	<xs:complexType name="OtherIDType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="Prefix" type="xs:string"/>
-				<xs:attribute name="Source" type="xs:string"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="OtherInformation" type="xs:string"/>
-	<xs:complexType name="OtherSubjectType">
-		<xs:sequence>
-			<xs:element name="OtherSubjectName" type="tns:OtherSubjectNameType"/>
-			<xs:element ref="tns:OtherInformation" minOccurs="0"/>
-			<xs:element ref="tns:TitleAssociatedWithName" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="OtherSubjectListType">
-		<xs:sequence>
-			<xs:element name="OtherSubject" type="tns:OtherSubjectType" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="Owner" default="Undetermined">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="HMD"/>
-					<xs:enumeration value="HSR"/>
-					<xs:enumeration value="KIE"/>
-					<xs:enumeration value="NASA"/>
-					<xs:enumeration value="NCBI"/>
-					<xs:enumeration value="NLM"/>
-					<xs:enumeration value="NOTNLM"/>
-					<xs:enumeration value="NYA"/>
-					<xs:enumeration value="PIP"/>
-					<xs:enumeration value="Undetermined"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:complexType name="OtherSubjectNameType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="MajorTopicYN" default="N">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Y"/>
-							<xs:enumeration value="N"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-				<xs:attribute name="SubjectType" type="xs:string"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="PMID" type="xs:string"/>
-	<xs:complexType name="PaginationType">
-		<xs:sequence>
-			<xs:element ref="tns:StartPage"/>
-			<xs:element ref="tns:EndPage" minOccurs="0"/>
-			<xs:element ref="tns:MedlinePgn" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="PersonalNameSubjectType">
-		<xs:sequence>
-            <xs:element ref="tns:LastName"/>
-            <xs:element ref="tns:ForeName"/>
-            <xs:element ref="tns:FirstName"/>
-            <xs:element ref="tns:MiddleName" minOccurs="0"/>
-            <xs:element ref="tns:Initials" minOccurs="0"/>
-            <xs:element ref="tns:Suffix" minOccurs="0"/>
-            <xs:element ref="tns:DatesAssociatedWithName" minOccurs="0"/>
-            <xs:element ref="tns:NameQualifier" minOccurs="0"/>
-            <xs:element ref="tns:OtherInformation" minOccurs="0"/>
-            <xs:element ref="tns:TitleAssociatedWithName" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="PersonalNameSubjectListType">
-		<xs:sequence>
-			<xs:element name="PersonalNameSubject" type="tns:PersonalNameSubjectType" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="PhysicalDescriptionType">
-		<xs:sequence>
-			<xs:element ref="tns:Form" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="tns:Extent" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="tns:Runtime" minOccurs="0"/>
-			<xs:element ref="tns:ChapterPgn" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="PlaceType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="ImprintType" default="Current">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Current"/>
-							<xs:enumeration value="Original"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="PlaceCodeType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="Authority" default="Undetermined">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="KIE"/>
-							<xs:enumeration value="MARC"/>
-							<xs:enumeration value="NLM"/>
-							<xs:enumeration value="Other"/>
-							<xs:enumeration value="Undetermined"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="ProjectedPublicationDate" type="xs:string"/>
-	<xs:complexType name="PubDateType">
-		<xs:sequence>
-            <xs:element ref="tns:Year"/>
-            <xs:element ref="tns:Month"/>
-            <xs:element ref="tns:Day" minOccurs="0"/>
-            <xs:element ref="tns:Season"/>
-            <xs:element ref="tns:MedlineDate"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="PublicationEndYear" type="xs:string"/>
-	<xs:element name="PublicationFirstYear" type="xs:string"/>
-	<xs:complexType name="PublicationInfoType">
-		<xs:sequence>
-			<xs:element ref="tns:Country" minOccurs="0"/>
-			<xs:element name="PlaceCode" type="tns:PlaceCodeType" minOccurs="0"/>
-			<xs:element name="Imprint" type="tns:ImprintType_nlmc" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Place" type="tns:PlaceType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Publisher" type="tns:PublisherType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="DateIssued" type="tns:DateIssuedType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="tns:ProjectedPublicationDate" minOccurs="0"/>
-			<xs:element ref="tns:PublicationFirstYear" minOccurs="0"/>
-			<xs:element ref="tns:PublicationEndYear" minOccurs="0"/>
-			<xs:element ref="tns:Edition" minOccurs="0"/>
-			<xs:element ref="tns:DatesOfSerialPublication" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Frequency" type="tns:FrequencyType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="PublicationType" type="xs:string"/>
-	<xs:complexType name="PublicationTypeListType">
-		<xs:sequence>
-			<xs:element ref="tns:PublicationType" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="PublisherType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="ImprintType" default="Current">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Current"/>
-							<xs:enumeration value="Original"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="QualifierNameType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="MajorTopicYN" default="N">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Y"/>
-							<xs:enumeration value="N"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="RegistryNumber" type="xs:string"/>
-	<xs:complexType name="ReportNumberType">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="ValidYN" default="Y">
-					<xs:simpleType>
-						<xs:restriction base="xs:NMTOKEN">
-							<xs:enumeration value="Y"/>
-							<xs:enumeration value="N"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:complexType name="ResourceInfoType">
-		<xs:sequence>
-			<xs:element ref="tns:TypeOfResource"/>
-			<xs:element ref="tns:Issuance"/>
-			<xs:element ref="tns:ResourceUnit" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="ResourceUnit" type="xs:string"/>
-	<xs:element name="Runtime" type="xs:string"/>
-	<xs:element name="STRN" type="xs:string"/>
-	<xs:element name="Season" type="xs:string"/>
-	<xs:element name="Second" type="xs:string"/>
-	<xs:element name="SpaceFlightMission" type="xs:string"/>
-	<xs:element name="StartPage" type="xs:string"/>
-	<xs:element name="StockNumber" type="xs:string"/>
-	<xs:element name="Suffix" type="xs:string"/>
-	<xs:element name="Title" type="xs:string"/>
-	<xs:element name="TitleAlternate" type="xs:string"/>
-	<xs:element name="TitleAssociatedWithName" type="xs:string"/>
-	<xs:complexType name="TitleMainType">
-		<xs:sequence>
-			<xs:element ref="tns:Title"/>
-			<xs:element ref="tns:OtherInformation" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="Sort" type="xs:string"/>
-	</xs:complexType>
-	<xs:complexType name="TitleOtherType">
-		<xs:sequence>
-			<xs:element ref="tns:TitleAlternate"/>
-			<xs:element ref="tns:OtherInformation" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="Sort" type="xs:string"/>
-		<xs:attribute name="Owner" default="Undetermined">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="HMD"/>
-					<xs:enumeration value="HSR"/>
-					<xs:enumeration value="KIE"/>
-					<xs:enumeration value="NASA"/>
-					<xs:enumeration value="NCBI"/>
-					<xs:enumeration value="NLM"/>
-					<xs:enumeration value="NOTNLM"/>
-					<xs:enumeration value="NYA"/>
-					<xs:enumeration value="PIP"/>
-					<xs:enumeration value="Undetermined"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-		<xs:attribute name="TitleType" default="Undetermined">
-			<xs:simpleType>
-				<xs:restriction base="xs:NMTOKEN">
-					<xs:enumeration value="Absorbed"/>
-					<xs:enumeration value="AbsorbedBy"/>
-					<xs:enumeration value="Analytic"/>
-					<xs:enumeration value="Key"/>
-					<xs:enumeration value="MergedTo"/>
-					<xs:enumeration value="MergerOf"/>
-					<xs:enumeration value="Other"/>
-					<xs:enumeration value="OtherTA"/>
-					<xs:enumeration value="Preceding"/>
-					<xs:enumeration value="Related"/>
-					<xs:enumeration value="Reversion"/>
-					<xs:enumeration value="Series"/>
-					<xs:enumeration value="SeriesAuthority"/>
-					<xs:enumeration value="SplitFrom"/>
-					<xs:enumeration value="SplitTo"/>
-					<xs:enumeration value="Succeeding"/>
-					<xs:enumeration value="SupersededBy"/>
-					<xs:enumeration value="Supersedes"/>
-					<xs:enumeration value="Translated"/>
-					<xs:enumeration value="Undetermined"/>
-					<xs:enumeration value="Uniform"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<xs:element name="TypeOfResource" type="xs:string"/>
-	<xs:element name="VernacularTitle" type="xs:string"/>
-	<xs:element name="Volume" type="xs:string"/>
-	<xs:element name="Year" type="xs:string"/>
-
-	<xs:complexType name="NLMCatalogRecordSetType">
-		<xs:sequence>
-			<xs:element name="NLMCatalogRecord" type="tns:NLMCatalogRecordType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-
-</xs:schema>



[13/28] incubator-taverna-common-activities git commit: Moved third-party test WSDLs to https://github.com/taverna-extras/wsdl-generic-test-cases

Posted by st...@apache.org.
Moved third-party test WSDLs to https://github.com/taverna-extras/wsdl-generic-test-cases


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/b29c0312
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/b29c0312
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/b29c0312

Branch: refs/heads/cwl-browse
Commit: b29c0312a0af84aa4f16abde925c06663d5791a7
Parents: f530f34
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Apr 28 15:19:07 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Apr 28 15:19:07 2016 +0100

----------------------------------------------------------------------
 .../getComplexWithInternalListResponse.xml      |    20 -
 .../src/test/resources/jws-splitter-input.xml   |    95 -
 .../TAV-744/InstrumentServiceContextTypes.xsd   |    12 -
 .../parser/TAV-744/InstrumentServiceTypes.xsd   |    12 -
 .../wsdl/parser/TAV-744/InstrumentService_.wsdl |   129 -
 .../parser/TAV-744/InstrumentService__.wsdl     |     9 -
 .../TAV-744/InstrumentService_bindings.wsdl     |    97 -
 .../wsdl/parser/TAV-744/ServiceSecurity.wsdl    |    72 -
 .../wsdl/parser/TAV-744/WS-Addressing.xsd       |   121 -
 .../wsdl/parser/TAV-744/WS-BaseFaults.wsdl      |    22 -
 .../wsdl/parser/TAV-744/WS-BaseFaults.xsd       |    47 -
 .../taverna/wsdl/parser/TAV-744/WS-BaseN.wsdl   |   298 -
 .../taverna/wsdl/parser/TAV-744/WS-BaseN.xsd    |    50 -
 .../parser/TAV-744/WS-ResourceLifetime.wsdl     |   117 -
 .../wsdl/parser/TAV-744/WS-ResourceLifetime.xsd |    26 -
 .../parser/TAV-744/WS-ResourceProperties.wsdl   |   240 -
 .../parser/TAV-744/WS-ResourceProperties.xsd    |    42 -
 .../taverna/wsdl/parser/TAV-744/security.xsd    |    78 -
 .../apache/taverna/wsdl/parser/TAV-744/xml.xsd  |   105 -
 .../wsrf/counterService/CounterService_.wsdl    |     9 -
 .../wsrf/counterService/WS-Addressing.xsd       |   121 -
 .../wsrf/counterService/WS-BaseFaults.xsd       |    47 -
 .../parser/wsrf/counterService/WS-BaseN.wsdl    |   298 -
 .../parser/wsrf/counterService/WS-BaseN.xsd     |    50 -
 .../counterService/WS-ResourceLifetime.wsdl     |   117 -
 .../wsrf/counterService/WS-ResourceLifetime.xsd |    26 -
 .../counterService/WS-ResourceProperties.wsdl   |   240 -
 .../counterService/WS-ResourceProperties.xsd    |    42 -
 .../wsrf/counterService/counter_bindings.wsdl   |   157 -
 .../wsrf/counterService/counter_flattened.wsdl  |   111 -
 .../wsdl/parser/wsrf/counterService/xml.xsd     |   105 -
 .../testwsdls/CurrencyExchangeService.wsdl      |    37 -
 .../src/test/resources/testwsdls/GoViz.wsdl     |   202 -
 .../testwsdls/MyService-rpc-literal.wsdl        |   392 -
 .../src/test/resources/testwsdls/SBWReader.wsdl |   602 -
 .../testwsdls/TestServices-rpcencoded.wsdl      |   396 -
 .../testwsdls/TestServices-unwrapped.wsdl       |   434 -
 .../src/test/resources/testwsdls/VSOi.wsdl      |   305 -
 .../src/test/resources/testwsdls/bind.wsdl      |   354 -
 .../test/resources/testwsdls/eutils/efetch.xsd  |   118 -
 .../resources/testwsdls/eutils/efetch_bio.xsd   | 18079 -----------------
 .../resources/testwsdls/eutils/efetch_nlmc.xsd  |  1021 -
 .../resources/testwsdls/eutils/efetch_pmc.xsd   |  5910 ------
 .../testwsdls/eutils/efetch_pubmed.xsd          |   359 -
 .../resources/testwsdls/eutils/efetch_taxon.xsd |   150 -
 .../test/resources/testwsdls/eutils/egquery.xsd |    60 -
 .../test/resources/testwsdls/eutils/einfo.xsd   |    95 -
 .../test/resources/testwsdls/eutils/elink.xsd   |   188 -
 .../test/resources/testwsdls/eutils/esearch.xsd |   165 -
 .../test/resources/testwsdls/eutils/espell.xsd  |    60 -
 .../resources/testwsdls/eutils/esummary.xsd     |    85 -
 .../test/resources/testwsdls/eutils/eutils.wsdl |   333 -
 .../resources/testwsdls/eutils/eutils_lite.wsdl |   289 -
 .../test/resources/testwsdls/jws-online.wsdl    |  1001 -
 .../test/resources/testwsdls/jws_online.wsdl    |  1001 -
 .../src/test/resources/testwsdls/ma.wsdl        |  1901 --
 .../testwsdls/menagerie-complex-rpc.wsdl        |   208 -
 .../src/test/resources/testwsdls/prodoric.wsdl  |   360 -
 .../src/test/resources/testwsdls/whatizit.wsdl  |   233 -
 59 files changed, 37253 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/getComplexWithInternalListResponse.xml
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/getComplexWithInternalListResponse.xml b/taverna-wsdl-generic/src/test/resources/getComplexWithInternalListResponse.xml
deleted file mode 100644
index acd38d7..0000000
--- a/taverna-wsdl-generic/src/test/resources/getComplexWithInternalListResponse.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<ns1:out xmlns:ns1="http://xfire.codehaus.org/BookService"><innerArray xmlns="http://complex.pojo.axis2.menagerie.googlecode"><ns1:string>String A</ns1:string><ns1:string>String B</ns1:string><ns1:string>String C</ns1:string><ns1:string>String D</ns1:string></innerArray><innerList xmlns="http://complex.pojo.axis2.menagerie.googlecode"><ns1:string>String A</ns1:string><ns1:string>String B</ns1:string><ns1:string>String C</ns1:string><ns1:string>String D</ns1:string></innerList><length xmlns="http://complex.pojo.axis2.menagerie.googlecode">4</length></ns1:out>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/jws-splitter-input.xml
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/jws-splitter-input.xml b/taverna-wsdl-generic/src/test/resources/jws-splitter-input.xml
deleted file mode 100644
index 996b819..0000000
--- a/taverna-wsdl-generic/src/test/resources/jws-splitter-input.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-
-<getSteadyStateTableReturn>
-    <credits xsi:type="xsd:string" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Powered by Mathematica, Wolfram Research</credits>
-    <fluxNames soapenc:arrayType="xsd:string[17]" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="soapenc:Array" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <fluxNames xsi:type="xsd:string">v[GLT]</fluxNames>
-        <fluxNames xsi:type="xsd:string">v[GLK]</fluxNames>
-        <fluxNames xsi:type="xsd:string">v[PGI]</fluxNames>
-        <fluxNames xsi:type="xsd:string">v[GLYCO]</fluxNames>
-        <fluxNames xsi:type="xsd:string">v[Treha]</fluxNames>
-        <fluxNames xsi:type="xsd:string">v[PFK]</fluxNames>
-        <fluxNames xsi:type="xsd:string">v[ALD]</fluxNames>
-        <fluxNames xsi:type="xsd:string">v[G3PDH]</fluxNames>
-        <fluxNames xsi:type="xsd:string">v[GAPDH]</fluxNames>
-        <fluxNames xsi:type="xsd:string">v[PGK]</fluxNames>
-        <fluxNames xsi:type="xsd:string">v[PGM]</fluxNames>
-        <fluxNames xsi:type="xsd:string">v[ENO]</fluxNames>
-        <fluxNames xsi:type="xsd:string">v[PYK]</fluxNames>
-        <fluxNames xsi:type="xsd:string">v[PDC]</fluxNames>
-        <fluxNames xsi:type="xsd:string">v[SUC]</fluxNames>
-        <fluxNames xsi:type="xsd:string">v[ADH]</fluxNames>
-        <fluxNames xsi:type="xsd:string">v[ATP]</fluxNames>
-    </fluxNames>
-    <fluxVals soapenc:arrayType="xsd:string[17]" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="soapenc:Array" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <fluxVals xsi:type="xsd:string">88.15049285974906</fluxVals>
-        <fluxVals xsi:type="xsd:string">88.15049285974904</fluxVals>
-        <fluxVals xsi:type="xsd:string">77.35049285974908</fluxVals>
-        <fluxVals xsi:type="xsd:string">6</fluxVals>
-        <fluxVals xsi:type="xsd:string">2.4</fluxVals>
-        <fluxVals xsi:type="xsd:string">77.3504928597491</fluxVals>
-        <fluxVals xsi:type="xsd:string">77.35049285974904</fluxVals>
-        <fluxVals xsi:type="xsd:string">18.202466703480138</fluxVals>
-        <fluxVals xsi:type="xsd:string">136.49851901601804</fluxVals>
-        <fluxVals xsi:type="xsd:string">136.4985190160183</fluxVals>
-        <fluxVals xsi:type="xsd:string">136.498519016018</fluxVals>
-        <fluxVals xsi:type="xsd:string">136.498519016018</fluxVals>
-        <fluxVals xsi:type="xsd:string">136.49851901601804</fluxVals>
-        <fluxVals xsi:type="xsd:string">136.49851901601798</fluxVals>
-        <fluxVals xsi:type="xsd:string">3.640493340696029</fluxVals>
-        <fluxVals xsi:type="xsd:string">129.21753233462553</fluxVals>
-        <fluxVals xsi:type="xsd:string">99.09605231253782</fluxVals>
-    </fluxVals>
-    <isModelMethodSupported xsi:type="xsd:boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</isModelMethodSupported>
-    <metabNames soapenc:arrayType="xsd:string[14]" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="soapenc:Array" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <metabNames xsi:type="xsd:string">ACE</metabNames>
-        <metabNames xsi:type="xsd:string">BPG</metabNames>
-        <metabNames xsi:type="xsd:string">F16P</metabNames>
-        <metabNames xsi:type="xsd:string">F6P</metabNames>
-        <metabNames xsi:type="xsd:string">G6P</metabNames>
-        <metabNames xsi:type="xsd:string">GLCi</metabNames>
-        <metabNames xsi:type="xsd:string">NAD</metabNames>
-        <metabNames xsi:type="xsd:string">P2G</metabNames>
-        <metabNames xsi:type="xsd:string">P3G</metabNames>
-        <metabNames xsi:type="xsd:string">PEP</metabNames>
-        <metabNames xsi:type="xsd:string">Prb</metabNames>
-        <metabNames xsi:type="xsd:string">PYR</metabNames>
-        <metabNames xsi:type="xsd:string">TRIO</metabNames>
-        <metabNames xsi:type="xsd:string">NADH</metabNames>
-    </metabNames>
-    <metabVals soapenc:arrayType="xsd:string[14]" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="soapenc:Array" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <metabVals xsi:type="xsd:string">0.170116511247478</metabVals>
-        <metabVals xsi:type="xsd:string">0.00032969362849256316</metabVals>
-        <metabVals xsi:type="xsd:string">0.6019547147734713</metabVals>
-        <metabVals xsi:type="xsd:string">0.11284989677951425</metabVals>
-        <metabVals xsi:type="xsd:string">1.0334604569319266</metabVals>
-        <metabVals xsi:type="xsd:string">0.09874371287268408</metabVals>
-        <metabVals xsi:type="xsd:string">1.5455601206148244</metabVals>
-        <metabVals xsi:type="xsd:string">0.04484907064065288</metabVals>
-        <metabVals xsi:type="xsd:string">0.35652004693990313</metabVals>
-        <metabVals xsi:type="xsd:string">0.07363323011128868</metabVals>
-        <metabVals xsi:type="xsd:string">6.309399270731274</metabVals>
-        <metabVals xsi:type="xsd:string">8.523412394422687</metabVals>
-        <metabVals xsi:type="xsd:string">0.7775576104829965</metabVals>
-        <metabVals xsi:type="xsd:string">0.04443987938517546</metabVals>
-    </metabVals>
-    <model xsi:type="xsd:string" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">teusink</model>
-</getSteadyStateTableReturn>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentServiceContextTypes.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentServiceContextTypes.xsd b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentServiceContextTypes.xsd
deleted file mode 100644
index bca9ad9..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentServiceContextTypes.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://InstrumentService.uniparthenope.it/InstrumentService/Context/types" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:tns="http://InstrumentService.uniparthenope.it/InstrumentService/Context/types" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:wsrbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd">
-  <import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-  <import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" schemaLocation="WS-BaseFaults.xsd"/>
-  <element name="InstrumentServiceContextReference">
-    <complexType>
-      <sequence>
-        <element ref="wsa:EndpointReference"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentServiceTypes.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentServiceTypes.xsd b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentServiceTypes.xsd
deleted file mode 100644
index 3118190..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentServiceTypes.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://InstrumentService.uniparthenope.it/InstrumentService/types" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:tns="http://InstrumentService.uniparthenope.it/InstrumentService/types" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:wsrbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd">
-  <import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-  <import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" schemaLocation="WS-BaseFaults.xsd"/>
-  <element name="InstrumentServiceReference">
-    <complexType>
-      <sequence>
-        <element ref="wsa:EndpointReference"/>
-      </sequence>
-    </complexType>
-  </element>
-</schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentService_.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentService_.wsdl b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentService_.wsdl
deleted file mode 100644
index f9c35df..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentService_.wsdl
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="InstrumentService" targetNamespace="http://InstrumentService.uniparthenope.it/InstrumentService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://InstrumentService.uniparthenope.it/InstrumentService" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:gtwsdl1="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ServiceGroup-1.2-draft-01.wsdl" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" xmlns:wsrbfw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.wsdl" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns:wns1="http://security.introduce.cagrid.nci.nih.gov/Se
 rviceSecurity" xmlns:wns0="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns:ns0="http://InstrumentService.uniparthenope.it/InstrumentService/types" xmlns:ns1="gme://caGrid.caBIG/1.0/gov.nih.nci.cagrid.metadata.security" xmlns:ns2="http://InstrumentService.uniparthenope.it/InstrumentService/Context/types">
-  <import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" location="WS-ResourceProperties.wsdl"/>
-  <import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.wsdl" location="WS-BaseFaults.wsdl"/>
-  <import namespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" location="WS-BaseN.wsdl"/>
-  <import namespace="http://security.introduce.cagrid.nci.nih.gov/ServiceSecurity" location="ServiceSecurity.wsdl"/>
-  <import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" location="WS-ResourceProperties.wsdl"/>
-  <!--============================================================
-
-                      T Y P E S
-                      
-  ============================================================-->
-  <types>
-    <schema targetNamespace="http://InstrumentService.uniparthenope.it/InstrumentService" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsrbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd">
-      <import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" schemaLocation="WS-BaseFaults.xsd"/>
-      <import namespace="http://InstrumentService.uniparthenope.it/InstrumentService/types" schemaLocation="InstrumentServiceTypes.xsd"/>
-      <import namespace="gme://caGrid.caBIG/1.0/gov.nih.nci.cagrid.metadata.security" schemaLocation="security.xsd"/>
-      <import namespace="http://InstrumentService.uniparthenope.it/InstrumentService/Context/types" schemaLocation="InstrumentServiceContextTypes.xsd"/>
-      <element name="CreateRequest">
-        <complexType>
-          <sequence>
-            <element name="instrumentName" type="xs:string" minOccurs="1" maxOccurs="1"/>
-          </sequence>
-        </complexType>
-      </element>
-      <element name="CreateResponse">
-        <complexType>
-          <sequence>
-            <element ref="ns2:InstrumentServiceContextReference" minOccurs="1" maxOccurs="1"/>
-          </sequence>
-        </complexType>
-      </element>
-      <element name="GetListRequest">
-        <complexType>
-          <sequence/>
-        </complexType>
-      </element>
-      <element name="GetListResponse">
-        <complexType>
-          <sequence>
-            <element name="response" type="xs:string" minOccurs="1" maxOccurs="unbounded"/>
-          </sequence>
-        </complexType>
-      </element>
-      <element name="GetDataRequest">
-        <complexType>
-          <sequence>
-            <element name="instrumentName" type="xs:string" minOccurs="1" maxOccurs="1"/>
-          </sequence>
-        </complexType>
-      </element>
-      <element name="GetDataResponse">
-        <complexType>
-          <sequence>
-            <element name="response" type="xs:string" minOccurs="1" maxOccurs="1"/>
-          </sequence>
-        </complexType>
-      </element>
-      <element name="InstrumentServiceResourceProperties">
-        <complexType>
-          <sequence/>
-        </complexType>
-      </element>
-    </schema>
-  </types>
-  <!--place service messages here-->
-  <message name="CreateRequest">
-    <part name="parameters" element="tns:CreateRequest"/>
-  </message>
-  <message name="CreateResponse">
-    <part name="parameters" element="tns:CreateResponse"/>
-  </message>
-  <message name="GetListRequest">
-    <part name="parameters" element="tns:GetListRequest"/>
-  </message>
-  <message name="GetListResponse">
-    <part name="parameters" element="tns:GetListResponse"/>
-  </message>
-  <message name="GetDataRequest">
-    <part name="parameters" element="tns:GetDataRequest"/>
-  </message>
-  <message name="GetDataResponse">
-    <part name="parameters" element="tns:GetDataResponse"/>
-  </message>
-  <!--============================================================
-
-                       P O R T T Y P E
-                      
-  ============================================================-->
-  <portType name="InstrumentServicePortType" wsrp:ResourceProperties="tns:InstrumentServiceResourceProperties">
-    <operation name="create">
-      <input message="tns:CreateRequest" wsa:Action="http://InstrumentService.uniparthenope.it/InstrumentService/CreateRequest"/>
-      <output message="tns:CreateResponse" wsa:Action="http://InstrumentService.uniparthenope.it/InstrumentService/CreateResponse"/>
-    </operation>
-    <operation name="getList">
-      <input message="tns:GetListRequest" wsa:Action="http://InstrumentService.uniparthenope.it/InstrumentService/GetListRequest"/>
-      <output message="tns:GetListResponse" wsa:Action="http://InstrumentService.uniparthenope.it/InstrumentService/GetListResponse"/>
-    </operation>
-    <operation name="getData">
-      <input message="tns:GetDataRequest" wsa:Action="http://InstrumentService.uniparthenope.it/InstrumentService/GetDataRequest"/>
-      <output message="tns:GetDataResponse" wsa:Action="http://InstrumentService.uniparthenope.it/InstrumentService/GetDataResponse"/>
-    </operation>
-    <wsdl:operation name="GetMultipleResourceProperties" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <wsdl:input name="GetMultipleResourcePropertiesRequest" message="wsrpw:GetMultipleResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourceProperties"/>
-      <wsdl:output name="GetMultipleResourcePropertiesResponse" message="wsrpw:GetMultipleResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourcePropertiesResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="GetResourceProperty" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <wsdl:input name="GetResourcePropertyRequest" message="wsrpw:GetResourcePropertyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:output name="GetResourcePropertyResponse" message="wsrpw:GetResourcePropertyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourcePropertyResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="QueryResourceProperties" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      <wsdl:input name="QueryResourcePropertiesRequest" message="wsrpw:QueryResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourceProperties"/>
-      <wsdl:output name="QueryResourcePropertiesResponse" message="wsrpw:QueryResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourcePropertiesResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="UnknownQueryExpressionDialectFault" message="wsrpw:UnknownQueryExpressionDialectFault"/>
-      <wsdl:fault name="InvalidQueryExpressionFault" message="wsrpw:InvalidQueryExpressionFault"/>
-      <wsdl:fault name="QueryEvaluationErrorFault" message="wsrpw:QueryEvaluationErrorFault"/>
-    </wsdl:operation>
-    <operation name="getServiceSecurityMetadata">
-      <input message="wns1:GetServiceSecurityMetadataRequest" wsa:Action="http://security.introduce.cagrid.nci.nih.gov/ServiceSecurity/GetServiceSecurityMetadataRequest"/>
-      <output message="wns1:GetServiceSecurityMetadataResponse" wsa:Action="http://security.introduce.cagrid.nci.nih.gov/ServiceSecurity/GetServiceSecurityMetadataResponse"/>
-    </operation>
-  </portType>
-</definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentService__.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentService__.wsdl b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentService__.wsdl
deleted file mode 100644
index f4cb43b..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentService__.wsdl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="InstrumentService" targetNamespace="http://InstrumentService.uniparthenope.it/InstrumentService/service" xmlns:binding="http://InstrumentService.uniparthenope.it/InstrumentService/bindings" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:import location="InstrumentService_bindings.wsdl" namespace="http://InstrumentService.uniparthenope.it/InstrumentService/bindings"/>
-  <wsdl:service name="InstrumentService">
-    <wsdl:port binding="binding:InstrumentServicePortTypeSOAPBinding" name="InstrumentServicePortTypePort">
-      <soap:address location="http://193.205.230.10:8080/wsrf/services/dsa/InstrumentService"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentService_bindings.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentService_bindings.wsdl b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentService_bindings.wsdl
deleted file mode 100644
index cf1c40c..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/InstrumentService_bindings.wsdl
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="InstrumentService" targetNamespace="http://InstrumentService.uniparthenope.it/InstrumentService/bindings" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:porttype="http://InstrumentService.uniparthenope.it/InstrumentService" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-  <wsdl:import namespace="http://InstrumentService.uniparthenope.it/InstrumentService" location="InstrumentService_.wsdl"/>
-  <wsdl:binding name="InstrumentServicePortTypeSOAPBinding" type="porttype:InstrumentServicePortType">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="create">
-      <soap:operation soapAction="http://InstrumentService.uniparthenope.it/InstrumentService/CreateRequest"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getList">
-      <soap:operation soapAction="http://InstrumentService.uniparthenope.it/InstrumentService/GetListRequest"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getData">
-      <soap:operation soapAction="http://InstrumentService.uniparthenope.it/InstrumentService/GetDataRequest"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetMultipleResourceProperties">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourceProperties"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault">
-        <soap:fault name="InvalidResourcePropertyQNameFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="GetResourceProperty">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault">
-        <soap:fault name="InvalidResourcePropertyQNameFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="QueryResourceProperties">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourceProperties"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="UnknownQueryExpressionDialectFault">
-        <soap:fault name="UnknownQueryExpressionDialectFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault">
-        <soap:fault name="InvalidResourcePropertyQNameFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="InvalidQueryExpressionFault">
-        <soap:fault name="InvalidQueryExpressionFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="QueryEvaluationErrorFault">
-        <soap:fault name="QueryEvaluationErrorFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="getServiceSecurityMetadata">
-      <soap:operation soapAction="http://security.introduce.cagrid.nci.nih.gov/ServiceSecurity/GetServiceSecurityMetadataRequest"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/ServiceSecurity.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/ServiceSecurity.wsdl b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/ServiceSecurity.wsdl
deleted file mode 100644
index 10efd53..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/ServiceSecurity.wsdl
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="ServiceSecurity" targetNamespace="http://security.introduce.cagrid.nci.nih.gov/ServiceSecurity" xmlns:tns="http://security.introduce.cagrid.nci.nih.gov/ServiceSecurity" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:gtwsdl1="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ServiceGroup-1.2-draft-01.wsdl" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" xmlns:wsrbfw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.wsdl" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" location="WS-ResourceProperties.wsdl"/>
-  <import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.wsdl" location="WS-BaseFaults.wsdl"/>
-  <!--============================================================
-
-                      T Y P E S
-                      
-  ============================================================-->
-  <types>
-    <schema targetNamespace="http://security.introduce.cagrid.nci.nih.gov/ServiceSecurity" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:ns0="gme://caGrid.caBIG/1.0/gov.nih.nci.cagrid.metadata.security" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:wsrbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd">
-      <import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" schemaLocation="WS-BaseFaults.xsd"/>
-      <import namespace="gme://caGrid.caBIG/1.0/gov.nih.nci.cagrid.metadata.security" schemaLocation="security.xsd"/>
-      <element name="GetServiceSecurityMetadataRequest">
-        <complexType>
-          <sequence/>
-        </complexType>
-      </element>
-      <element name="GetServiceSecurityMetadataResponse">
-        <complexType>
-          <sequence>
-            <element ref="ns0:ServiceSecurityMetadata" minOccurs="1" maxOccurs="1"/>
-          </sequence>
-        </complexType>
-      </element>
-      <element name="ServiceSecurityResourceProperties">
-        <complexType>
-          <sequence/>
-        </complexType>
-      </element>
-    </schema>
-  </types>
-  <!--place service messages here-->
-  <message name="GetServiceSecurityMetadataRequest">
-    <part name="parameters" element="tns:GetServiceSecurityMetadataRequest"/>
-  </message>
-  <message name="GetServiceSecurityMetadataResponse">
-    <part name="parameters" element="tns:GetServiceSecurityMetadataResponse"/>
-  </message>
-  <!--============================================================
-
-                       P O R T T Y P E
-                      
-  ============================================================-->
-  <portType name="ServiceSecurityPortType" wsrp:ResourceProperties="tns:ServiceSecurityResourceProperties">
-    <operation name="getServiceSecurityMetadata">
-      <input message="tns:GetServiceSecurityMetadataRequest" wsa:Action="http://security.introduce.cagrid.nci.nih.gov/ServiceSecurity/GetServiceSecurityMetadataRequest"/>
-      <output message="tns:GetServiceSecurityMetadataResponse" wsa:Action="http://security.introduce.cagrid.nci.nih.gov/ServiceSecurity/GetServiceSecurityMetadataResponse"/>
-    </operation>
-    <operation name="GetResourceProperty">
-      <input name="GetResourcePropertyRequest" message="wsrpw:GetResourcePropertyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <output name="GetResourcePropertyResponse" message="wsrpw:GetResourcePropertyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourcePropertyResponse"/>
-      <fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-    </operation>
-    <operation name="GetMultipleResourceProperties">
-      <input name="GetMultipleResourcePropertiesRequest" message="wsrpw:GetMultipleResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourceProperties"/>
-      <output name="GetMultipleResourcePropertiesResponse" message="wsrpw:GetMultipleResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourceProperties"/>
-      <fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-    </operation>
-    <operation name="QueryResourceProperties">
-      <input name="QueryResourcePropertiesRequest" message="wsrpw:QueryResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourceProperties"/>
-      <output name="QueryResourcePropertiesResponse" message="wsrpw:QueryResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourcePropertiesResponse"/>
-      <fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <fault name="UnknownQueryExpressionDialectFault" message="wsrpw:UnknownQueryExpressionDialectFault"/>
-      <fault name="InvalidQueryExpressionFault" message="wsrpw:InvalidQueryExpressionFault"/>
-      <fault name="QueryEvaluationErrorFault" message="wsrpw:QueryEvaluationErrorFault"/>
-    </operation>
-  </portType>
-</definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-Addressing.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-Addressing.xsd b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-Addressing.xsd
deleted file mode 100644
index 008c65e..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-Addressing.xsd
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Legal Disclaimer
-
-The presentation, distribution or other dissemination of the information 
-contained in this document is not a license, either expressly or impliedly, 
-to any intellectual property owned or controlled by BEA or IBM or Microsoft
-and\or any other third party.  BEA and IBM and Microsoft and\or any other
-third party may have patents, patent applications, trademarks, copyrights, 
-or other intellectual property rights covering subject matter in this 
-document.  The furnishing of this document does not give you any license 
-to BEA's and IBM's and Microsoft's or any other third party's patents, 
-trademarks, copyrights, or other intellectual property.
-
-This document and the information contained herein is provided on an "AS IS"
-basis and to the maximum extent permitted by applicable law, BEA and IBM 
-and Microsoft provide the document AS IS AND WITH ALL FAULTS, and hereby 
-disclaims all other warranties and conditions, either express, implied or 
-statutory, including, but not limited to, any (if any) implied warranties, 
-duties or conditions of merchantability, of fitness for a particular 
-purpose, of accuracy or completeness of responses, of results, of 
-workmanlike effort, of lack of viruses, and of lack of negligence, all with
-regard to the document. ALSO, THERE IS NO WARRANTY OR CONDITION OF 
-TITLE, QUIET ENJOYMENT, QUIET POSSESSION, CORRESPONDENCE TO DESCRIPTION OR 
-NON-INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS WITH REGARD TO THE 
-DOCUMENT.
-
-IN NO EVENT WILL BEA or IBM or MICROSOFT BE LIABLE TO ANY OTHER PARTY FOR THE
-COST OF PROCURING SUBSTITUTE GOODS OR SERVICES, LOST PROFITS, LOSS OF USE, 
-LOSS OF DATA, OR ANY INCIDENTAL, CONSEQUENTIAL, DIRECT, INDIRECT, OR SPECIAL 
-DAMAGES WHETHER UNDER CONTRACT, TORT, WARRANTY, OR OTHERWISE, ARISING IN ANY 
-WAY OUT OF THIS OR ANY OTHER AGREEMENT RELATING TO THIS DOCUMENT, WHETHER OR 
-NOT SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Copyright Notice
-
-Copyright 2003,2004 BEA Systems Inc. and IBM Corporation and Microsoft Corporation. All rights reserved.--><xs:schema targetNamespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" elementFormDefault="qualified" blockDefault="#all" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
-  <!--//////////////////// WS-Addressing ////////////////////-->
-  <!--Endpoint reference-->
-  <xs:element name="EndpointReference" type="wsa:EndpointReferenceType"/>
-  <xs:complexType name="EndpointReferenceType">
-    <xs:sequence>
-      <xs:element name="Address" type="wsa:AttributedURI"/>
-      <xs:element name="ReferenceProperties" type="wsa:ReferencePropertiesType" minOccurs="0"/>
-      <xs:element name="PortType" type="wsa:AttributedQName" minOccurs="0"/>
-      <xs:element name="ServiceName" type="wsa:ServiceNameType" minOccurs="0"/>
-      <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-        <xs:annotation>
-          <xs:documentation>If "Policy" elements from namespace "http://schemas.xmlsoap.org/ws/2002/12/policy#policy" are used, they must appear first (before any extensibility elements).</xs:documentation>
-        </xs:annotation>
-      </xs:any>
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-  </xs:complexType>
-  <xs:complexType name="ReferencePropertiesType">
-    <xs:sequence>
-      <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="ServiceNameType">
-    <xs:simpleContent>
-      <xs:extension base="xs:QName">
-        <xs:attribute name="PortName" type="xs:NCName"/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <!--Message information header blocks-->
-  <xs:element name="MessageID" type="wsa:AttributedURI"/>
-  <xs:element name="RelatesTo" type="wsa:Relationship"/>
-  <xs:element name="To" type="wsa:AttributedURI"/>
-  <xs:element name="Action" type="wsa:AttributedURI"/>
-  <xs:element name="From" type="wsa:EndpointReferenceType"/>
-  <xs:element name="ReplyTo" type="wsa:EndpointReferenceType"/>
-  <xs:element name="FaultTo" type="wsa:EndpointReferenceType"/>
-  <xs:complexType name="Relationship">
-    <xs:simpleContent>
-      <xs:extension base="xs:anyURI">
-        <xs:attribute name="RelationshipType" type="xs:QName" use="optional"/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:simpleType name="RelationshipTypeValues">
-    <xs:restriction base="xs:QName">
-      <xs:enumeration value="wsa:Reply"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:element name="ReplyAfter"/>
-  <xs:complexType name="ReplyAfterType">
-    <xs:simpleContent>
-      <xs:extension base="xs:nonNegativeInteger">
-        <xs:anyAttribute namespace="##other"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:simpleType name="FaultSubcodeValues">
-    <xs:restriction base="xs:QName">
-      <xs:enumeration value="wsa:InvalidMessageInformationHeader"/>
-      <xs:enumeration value="wsa:MessageInformationHeaderRequired"/>
-      <xs:enumeration value="wsa:DestinationUnreachable"/>
-      <xs:enumeration value="wsa:ActionNotSupported"/>
-      <xs:enumeration value="wsa:EndpointUnavailable"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:attribute name="Action" type="xs:anyURI"/>
-  <!--Common declarations and definitions-->
-  <xs:complexType name="AttributedQName">
-    <xs:simpleContent>
-      <xs:extension base="xs:QName">
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="AttributedURI">
-    <xs:simpleContent>
-      <xs:extension base="xs:anyURI">
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-</xs:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-BaseFaults.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-BaseFaults.wsdl b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-BaseFaults.wsdl
deleted file mode 100644
index 11f8683..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-BaseFaults.wsdl
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director. 
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director. 
-
-Copyright (C) OASIS Open (2004). All Rights Reserved. 
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><wsdl:definitions name="BaseFaults" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd">
-  <!--===================== Types Definitions ======================-->
-  <wsdl:types>
-    <xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified">
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" schemaLocation="WS-BaseFaults.xsd"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="BaseFaultMessage">
-    <wsdl:part name="Fault" element="wsbf:BaseFault"/>
-  </wsdl:message>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-BaseFaults.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-BaseFaults.xsd b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-BaseFaults.xsd
deleted file mode 100644
index 87d3798..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-BaseFaults.xsd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director. 
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director. 
-
-Copyright (C) OASIS Open (2004). All Rights Reserved. 
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd">
-  <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd">
-    <xsd:annotation>
-      <xsd:documentation>Get access to the xml: attribute groups for xml:lang as declared on 'schema'
-        and 'documentation' below</xsd:documentation>
-    </xsd:annotation>
-  </xsd:import>
-  <!--====================== BaseFault Types =======================-->
-  <xsd:element name="BaseFault" type="wsbf:BaseFaultType"/>
-  <xsd:complexType name="BaseFaultType">
-    <xsd:sequence>
-      <xsd:element name="Timestamp" type="xsd:dateTime" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="Originator" type="wsa:EndpointReferenceType" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="ErrorCode" minOccurs="0" maxOccurs="1">
-        <xsd:complexType>
-          <xsd:complexContent mixed="true">
-            <xsd:extension base="xsd:anyType">
-              <xsd:attribute name="dialect" type="xsd:anyURI" use="required"/>
-            </xsd:extension>
-          </xsd:complexContent>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="Description" minOccurs="0" maxOccurs="unbounded">
-        <xsd:complexType>
-          <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-              <xsd:attribute ref="xml:lang" use="optional"/>
-            </xsd:extension>
-          </xsd:simpleContent>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="FaultCause" type="wsbf:BaseFaultType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-BaseN.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-BaseN.wsdl b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-BaseN.wsdl
deleted file mode 100644
index 418e66c..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-BaseN.wsdl
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><wsdl:definitions name="WS-BaseNotification" targetNamespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2002/12/policy" xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" xmlns:wsrp="http://docs.oasi
 s-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:wsrl="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl">
-  <!--========================== Imports ===========================-->
-  <wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" location="WS-ResourceProperties.wsdl"/>
-  <wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" location="WS-ResourceLifetime.wsdl"/>
-  <!--===================== Types Definitions ======================-->
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified">
-      <xsd:include schemaLocation="WS-BaseN.xsd"/>
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" schemaLocation="WS-BaseFaults.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" schemaLocation="WS-ResourceProperties.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" schemaLocation="WS-ResourceLifetime.xsd"/>
-      <!--=============== Resource Property Related  ===================-->
-      <!--======== Resource Properties for NotificationProducer ========-->
-      <xsd:element name="NotificationProducerRP">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element ref="wsnt:Topic" minOccurs="1" maxOccurs="unbounded"/>
-            <xsd:element ref="wsnt:FixedTopicSet" minOccurs="1" maxOccurs="1"/>
-            <xsd:element ref="wsnt:TopicExpressionDialects" minOccurs="1" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--======== Resource Properties for SubscriptionManager =========-->
-      <xsd:element name="SubscriptionManagerRP">
-        <xsd:complexType>
-          <xsd:sequence>
-            <!--From WS-ResourceLifetime ScheduledResourceTermination-->
-            <xsd:element ref="wsrl:CurrentTime" minOccurs="1" maxOccurs="1"/>
-            <xsd:element ref="wsrl:TerminationTime" minOccurs="1" maxOccurs="1"/>
-            <!--SubscriptionManager specific-->
-            <xsd:element ref="wsnt:ConsumerReference" minOccurs="1" maxOccurs="1"/>
-            <xsd:element ref="wsnt:TopicExpression" minOccurs="1" maxOccurs="1"/>
-            <xsd:element ref="wsnt:UseNotify" minOccurs="1" maxOccurs="1"/>
-            <xsd:element ref="wsnt:Precondition" minOccurs="0" maxOccurs="1"/>
-            <xsd:element ref="wsnt:Selector" minOccurs="0" maxOccurs="1"/>
-            <xsd:element ref="wsnt:SubscriptionPolicy" minOccurs="0" maxOccurs="1"/>
-            <xsd:element ref="wsnt:CreationTime" minOccurs="0" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--================== Message Helper Types  =====================-->
-      <xsd:complexType name="NotificationMessageHolderType">
-        <xsd:sequence>
-          <xsd:element name="Topic" type="wsnt:TopicExpressionType" minOccurs="1" maxOccurs="1"/>
-          <xsd:element name="ProducerReference" type="wsa:EndpointReferenceType" minOccurs="0" maxOccurs="1"/>
-          <xsd:element name="Message" type="xsd:anyType" minOccurs="1" maxOccurs="1"/>
-        </xsd:sequence>
-      </xsd:complexType>
-      <!--========== Message Types for NotificationConsumer  ===========-->
-      <xsd:element name="Notify">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="NotificationMessage" type="wsnt:NotificationMessageHolderType" minOccurs="1" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--========== Message Types for NotificationProducer  ===========-->
-      <xsd:element name="SubscribeResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="SubscriptionReference" type="wsa:EndpointReferenceType" minOccurs="0" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="GetCurrentMessage">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="Topic" type="wsnt:TopicExpressionType"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="GetCurrentMessageResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:complexType name="ResourceUnknownFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResourceUnknownFault" type="wsnt:ResourceUnknownFaultType"/>
-      <xsd:complexType name="SubscribeCreationFailedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="SubscribeCreationFailedFault" type="wsnt:SubscribeCreationFailedFaultType"/>
-      <xsd:complexType name="TopicPathDialectUnknownFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="TopicPathDialectUnknownFault" type="wsnt:TopicPathDialectUnknownFaultType"/>
-      <xsd:complexType name="InvalidTopicExpressionFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="InvalidTopicExpressionFault" type="wsnt:InvalidTopicExpressionFaultType"/>
-      <xsd:complexType name="TopicNotSupportedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="TopicNotSupportedFault" type="wsnt:TopicNotSupportedFaultType"/>
-      <xsd:complexType name="NoCurrentMessageOnTopicFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="NoCurrentMessageOnTopicFault" type="wsnt:NoCurrentMessageOnTopicFaultType"/>
-      <!--========== Message Types for SubscriptionManager  ===========-->
-      <xsd:element name="PauseSubscription">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:element name="PauseSubscriptionResponse">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:element name="ResumeSubscription">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:element name="ResumeSubscriptionResponse">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:complexType name="PauseFailedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="PauseFailedFault" type="wsnt:PauseFailedFaultType"/>
-      <xsd:complexType name="ResumeFailedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResumeFailedFault" type="wsnt:ResumeFailedFaultType"/>
-    </xsd:schema>
-  </wsdl:types>
-  <!--================ NotificationConsumer::Notify ================ 
-  Notify(
-    NotificationMessage
-      (TopicExpression, ProducerReference, Message)*
-  returns: n/a (one way)-->
-  <wsdl:message name="Notify">
-    <wsdl:part name="Notify" element="wsnt:Notify"/>
-  </wsdl:message>
-  <!--============== NotificationProducer::Subscribe =============== 
-  Subscribe(
-   (ConsumerEndpointReference, TopicExpression, [UseNotify],
-   [Precondition], [Selector], [SubscriptionPolicy], 
-   [InitialTerminationTime])   
-  returns: WS-Resource qualified EPR to a Subscription-->
-  <wsdl:message name="SubscribeRequest">
-    <wsdl:part name="SubscribeRequest" element="wsnt:Subscribe"/>
-  </wsdl:message>
-  <wsdl:message name="SubscribeResponse">
-    <wsdl:part name="SubscribeResponse" element="wsnt:SubscribeResponse"/>
-  </wsdl:message>
-  <wsdl:message name="ResourceUnknownFault">
-    <part name="ResourceUnknownFault" element="wsnt:ResourceUnknownFault"/>
-  </wsdl:message>
-  <wsdl:message name="SubscribeCreationFailedFault">
-    <part name="SubscribeCreationFailedFault" element="wsnt:SubscribeCreationFailedFault"/>
-  </wsdl:message>
-  <wsdl:message name="TopicPathDialectUnknownFault">
-    <part name="TopicPathDialectUnknownFault" element="wsnt:TopicPathDialectUnknownFault"/>
-  </wsdl:message>
-  <!--========== NotificationProducer::GetCurrentMessage =========== 
-  GetCurrentMessage(topicExpression)
-  returns: a NotificationMessage (xsd:any)-->
-  <wsdl:message name="GetCurrentMessageRequest">
-    <wsdl:part name="GetCurrentMessageRequest" element="wsnt:GetCurrentMessage"/>
-  </wsdl:message>
-  <wsdl:message name="GetCurrentMessageResponse">
-    <wsdl:part name="GetCurrentMessageResponse" element="wsnt:GetCurrentMessageResponse"/>
-  </wsdl:message>
-  <wsdl:message name="InvalidTopicExpressionFault">
-    <part name="InvalidTopicExpressionFault" element="wsnt:InvalidTopicExpressionFault"/>
-  </wsdl:message>
-  <wsdl:message name="TopicNotSupportedFault">
-    <part name="TopicNotSupportedFault" element="wsnt:TopicNotSupportedFault"/>
-  </wsdl:message>
-  <wsdl:message name="NoCurrentMessageOnTopicFault">
-    <part name="NoCurrentMessageOnTopicFault" element="wsnt:NoCurrentMessageOnTopicFault"/>
-  </wsdl:message>
-  <!--========== SubscriptionManager::PauseSubscription ============
-   PauseSubscription()
-   returns: empty-->
-  <wsdl:message name="PauseSubscriptionRequest">
-    <wsdl:part name="PauseSubscriptionRequest" element="wsnt:PauseSubscription"/>
-  </wsdl:message>
-  <wsdl:message name="PauseSubscriptionResponse">
-    <wsdl:part name="PauseSubscriptionResponse" element="wsnt:PauseSubscriptionResponse"/>
-  </wsdl:message>
-  <wsdl:message name="PauseFailedFault">
-    <part name="PauseFailedFault" element="wsnt:PauseFailedFault"/>
-  </wsdl:message>
-  <!--========= SubscriptionManager::ResumeSubscription ============
-   ResumeSubscription()
-   returns: empty-->
-  <wsdl:message name="ResumeSubscriptionRequest">
-    <wsdl:part name="ResumeSubscriptionRequest" element="wsnt:ResumeSubscription"/>
-  </wsdl:message>
-  <wsdl:message name="ResumeSubscriptionResponse">
-    <wsdl:part name="ResumeSubscriptionResponse" element="wsnt:ResumeSubscriptionResponse"/>
-  </wsdl:message>
-  <wsdl:message name="ResumeFailedFault">
-    <part name="ResumeFailedFault" element="wsnt:ResumeFailedFault"/>
-  </wsdl:message>
-  <!--=================== PortType Definitions =====================-->
-  <!--========= NotificationConsumer PortType Definition ===========-->
-  <wsdl:portType name="NotificationConsumer">
-    <wsdl:operation name="Notify">
-      <wsdl:input message="wsntw:Notify" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/Notify"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <!--========= NotificationProducer PortType Definition ===========-->
-  <wsdl:portType name="NotificationProducer" wsrp:ResourceProperties="wsnt:NotificationProducerRP">
-    <!--========== extends wsrpw:ResourceProperties =============-->
-    <wsdl:operation name="GetResourceProperty">
-      <wsdl:input name="GetResourcePropertyRequest" message="wsrpw:GetResourcePropertyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:output name="GetResourcePropertyResponse" message="wsrpw:GetResourcePropertyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourcePropertyResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-    </wsdl:operation>
-    <!--=========== NotificationProducer Specific ==============-->
-    <wsdl:operation name="Subscribe">
-      <wsdl:input message="wsntw:SubscribeRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/Subscribe"/>
-      <wsdl:output message="wsntw:SubscribeResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/SubscribeResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-      <wsdl:fault name="SubscribeCreationFailedFault" message="wsntw:SubscribeCreationFailedFault"/>
-      <wsdl:fault name="TopicPathDialectUnknownFault" message="wsntw:TopicPathDialectUnknownFault"/>
-      <wsdl:fault name="InvalidTopicExpressionFault" message="wsntw:InvalidTopicExpressionFault"/>
-      <wsdl:fault name="TopicNotSupportedFault" message="wsntw:TopicNotSupportedFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="GetCurrentMessage">
-      <wsdl:input message="wsntw:GetCurrentMessageRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/GetCurrentMessage"/>
-      <wsdl:output message="wsntw:GetCurrentMessageResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/GetCurrentMessageResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidTopicExpressionFault" message="wsntw:InvalidTopicExpressionFault"/>
-      <wsdl:fault name="TopicNotSupportedFault" message="wsntw:TopicNotSupportedFault"/>
-      <wsdl:fault name="NoCurrentMessageOnTopicFault" message="wsntw:NoCurrentMessageOnTopicFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <!--========== SubscriptionManager PortType Definition ===========-->
-  <wsdl:portType name="SubscriptionManager" wsrp:ResourceProperties="wsnt:SubscriptionManagerRP">
-    <!--========== extends wsrpw:ResourceProperties =============-->
-    <wsdl:operation name="GetResourceProperty">
-      <wsdl:input name="GetResourcePropertyRequest" message="wsrpw:GetResourcePropertyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:output name="GetResourcePropertyResponse" message="wsrpw:GetResourcePropertyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourcePropertyResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-    </wsdl:operation>
-    <!--=== extends wsrlw:ImmediateResourceTermination ==========-->
-    <wsdl:operation name="Destroy">
-      <wsdl:input message="wsrlw:DestroyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/Destroy"/>
-      <wsdl:output message="wsrlw:DestroyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/DestroyResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrlw:ResourceUnknownFault"/>
-      <wsdl:fault name="ResourceNotDestroyedFault" message="wsrlw:ResourceNotDestroyedFault"/>
-    </wsdl:operation>
-    <!--=== extends wsrl:ScheduledResourceTermination ==========-->
-    <wsdl:operation name="SetTerminationTime">
-      <wsdl:input message="wsrlw:SetTerminationTimeRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTime"/>
-      <wsdl:output message="wsrlw:SetTerminationTimeResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTimeResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrlw:ResourceUnknownFault"/>
-      <wsdl:fault name="UnableToSetTerminationTimeFault" message="wsrlw:UnableToSetTerminationTimeFault"/>
-      <wsdl:fault name="TerminationTimeChangeRejectedFault" message="wsrlw:TerminationTimeChangeRejectedFault"/>
-    </wsdl:operation>
-    <!--========= SubscriptionManager specific operations ======-->
-    <wsdl:operation name="PauseSubscription">
-      <wsdl:input message="wsntw:PauseSubscriptionRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/PauseSubscription"/>
-      <wsdl:output message="wsntw:PauseSubscriptionResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/PauseSubscriptionResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-      <wsdl:fault name="PauseFailedFault" message="wsntw:PauseFailedFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="ResumeSubscription">
-      <wsdl:input message="wsntw:ResumeSubscriptionRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/ResumeSubscription"/>
-      <wsdl:output message="wsntw:ResumeSubscriptionResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/ResumeSubscriptionResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-      <wsdl:fault name="ResumeFailedFault" message="wsntw:ResumeFailedFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-BaseN.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-BaseN.xsd b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-BaseN.xsd
deleted file mode 100644
index 9bdf6ae..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/TAV-744/WS-BaseN.xsd
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><xsd:schema targetNamespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:wsnt="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd">
-  <!--======================== Imports  ============================-->
-  <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-  <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" schemaLocation="WS-ResourceProperties.xsd"/>
-  <!--========== Message Types for NotificationProducer  ===========-->
-  <xsd:element name="Subscribe">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="ConsumerReference" type="wsa:EndpointReferenceType" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="TopicExpression" type="wsnt:TopicExpressionType" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="UseNotify" type="xsd:boolean" default="true" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="Precondition" type="wsrp:QueryExpressionType" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="Selector" type="wsrp:QueryExpressionType" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="SubscriptionPolicy" type="xsd:anyType" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="InitialTerminationTime" type="xsd:dateTime" minOccurs="0" maxOccurs="1"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <!--================= Topic Expression Container =================-->
-  <xsd:complexType name="TopicExpressionType" mixed="true">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="1" processContents="lax"/>
-    </xsd:sequence>
-    <xsd:attribute name="Dialect" type="xsd:anyURI"/>
-  </xsd:complexType>
-  <xsd:element name="TopicExpression" type="wsnt:TopicExpressionType"/>
-  <!--=============== Resource Property Related  ===================-->
-  <!--======== Resource Properties for NotificationProducer ========-->
-  <xsd:element name="Topic" type="wsnt:TopicExpressionType"/>
-  <xsd:element name="FixedTopicSet" type="xsd:boolean"/>
-  <xsd:element name="TopicExpressionDialects" type="xsd:anyURI"/>
-  <!--======== Resource Properties for SubscriptionManager =========-->
-  <xsd:element name="ConsumerReference" type="wsa:EndpointReferenceType"/>
-  <xsd:element name="UseNotify" type="xsd:boolean"/>
-  <xsd:element name="Precondition" type="wsrp:QueryExpressionType"/>
-  <xsd:element name="Selector" type="wsrp:QueryExpressionType"/>
-  <xsd:element name="SubscriptionPolicy" type="xsd:anyType"/>
-  <xsd:element name="CreationTime" type="xsd:dateTime"/>
-</xsd:schema>
\ No newline at end of file


[02/28] incubator-taverna-common-activities git commit: ASF header

Posted by st...@apache.org.
ASF header


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/f530f342
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/f530f342
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/f530f342

Branch: refs/heads/cwl-browse
Commit: f530f34238ddc62797685f771fbb140044297549
Parents: a114b74
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Apr 28 14:59:07 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Apr 28 14:59:07 2016 +0100

----------------------------------------------------------------------
 .travis.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/f530f342/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index dff5f3a..0b741c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1 +1,16 @@
+##    Licensed to the Apache Software Foundation (ASF) under one or more
+##    contributor license agreements.  See the NOTICE file distributed with
+##    this work for additional information regarding copyright ownership.
+##    The ASF licenses this file to You under the Apache License, Version 2.0
+##    (the "License"); you may not use this file except in compliance with
+##    the License.  You may obtain a copy of the License at
+##
+##    http://www.apache.org/licenses/LICENSE-2.0
+##
+##    Unless required by applicable law or agreed to in writing, software
+##    distributed under the License is distributed on an "AS IS" BASIS,
+##    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##    See the License for the specific language governing permissions and
+##    limitations under the License.
+
 language: java


[22/28] incubator-taverna-common-activities git commit: ASF headers in Velocity templates

Posted by st...@apache.org.
ASF headers in Velocity templates


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/24351fd6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/24351fd6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/24351fd6

Branch: refs/heads/cwl-browse
Commit: 24351fd69a05c1f2a1c31b523ad9dd5f82603d6a
Parents: 08c302d
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Apr 28 16:52:04 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Apr 28 16:52:04 2016 +0100

----------------------------------------------------------------------
 .../src/main/resources/Authorize.vm                | 17 +++++++++++++++++
 .../src/main/resources/MasterPassword.vm           | 17 +++++++++++++++++
 .../src/main/resources/TrustedCertificate.vm       | 17 +++++++++++++++++
 .../src/main/resources/TruststorePassword.vm       | 17 +++++++++++++++++
 .../src/main/resources/UsernamePassword.vm         | 17 +++++++++++++++++
 .../src/main/resources/ask.vm                      | 17 +++++++++++++++++
 .../src/main/resources/choose.vm                   | 17 +++++++++++++++++
 .../src/main/resources/interaction.vm              | 17 +++++++++++++++++
 .../src/main/resources/notify.vm                   | 17 +++++++++++++++++
 .../src/main/resources/select.vm                   | 17 +++++++++++++++++
 .../src/main/resources/tell.vm                     | 17 +++++++++++++++++
 .../src/main/resources/warn.vm                     | 17 +++++++++++++++++
 12 files changed, 204 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/24351fd6/taverna-interaction-activity/src/main/resources/Authorize.vm
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/Authorize.vm b/taverna-interaction-activity/src/main/resources/Authorize.vm
index ac9a387..c48b9b9 100644
--- a/taverna-interaction-activity/src/main/resources/Authorize.vm
+++ b/taverna-interaction-activity/src/main/resources/Authorize.vm
@@ -1,3 +1,20 @@
+#*    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*#
+
 #produce("answer")
 <!doctype html>
 <html>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/24351fd6/taverna-interaction-activity/src/main/resources/MasterPassword.vm
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/MasterPassword.vm b/taverna-interaction-activity/src/main/resources/MasterPassword.vm
index 94e7859..7495357 100644
--- a/taverna-interaction-activity/src/main/resources/MasterPassword.vm
+++ b/taverna-interaction-activity/src/main/resources/MasterPassword.vm
@@ -1,3 +1,20 @@
+#*    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*#
+
 #produce("password")
 <!doctype html>
 <html>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/24351fd6/taverna-interaction-activity/src/main/resources/TrustedCertificate.vm
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/TrustedCertificate.vm b/taverna-interaction-activity/src/main/resources/TrustedCertificate.vm
index 44a5359..26c7ef8 100644
--- a/taverna-interaction-activity/src/main/resources/TrustedCertificate.vm
+++ b/taverna-interaction-activity/src/main/resources/TrustedCertificate.vm
@@ -1,3 +1,20 @@
+#*    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*#
+
 #require("serviceURI")
 #require("requestingPrompt")
 #produce("username")

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/24351fd6/taverna-interaction-activity/src/main/resources/TruststorePassword.vm
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/TruststorePassword.vm b/taverna-interaction-activity/src/main/resources/TruststorePassword.vm
index 6106115..6f266d5 100644
--- a/taverna-interaction-activity/src/main/resources/TruststorePassword.vm
+++ b/taverna-interaction-activity/src/main/resources/TruststorePassword.vm
@@ -1,3 +1,20 @@
+#*    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*#
+
 #produce("password")
 <!doctype html>
 <html>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/24351fd6/taverna-interaction-activity/src/main/resources/UsernamePassword.vm
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/UsernamePassword.vm b/taverna-interaction-activity/src/main/resources/UsernamePassword.vm
index 671c3ee..5306546 100644
--- a/taverna-interaction-activity/src/main/resources/UsernamePassword.vm
+++ b/taverna-interaction-activity/src/main/resources/UsernamePassword.vm
@@ -1,3 +1,20 @@
+#*    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*#
+
 #require("serviceURI")
 #require("requestingPrompt")
 #produce("username")

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/24351fd6/taverna-interaction-activity/src/main/resources/ask.vm
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/ask.vm b/taverna-interaction-activity/src/main/resources/ask.vm
index 92ce145..b07a3ec 100644
--- a/taverna-interaction-activity/src/main/resources/ask.vm
+++ b/taverna-interaction-activity/src/main/resources/ask.vm
@@ -1,3 +1,20 @@
+#*    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*#
+
 #require("message")
 #require("title")
 #produce("answer")

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/24351fd6/taverna-interaction-activity/src/main/resources/choose.vm
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/choose.vm b/taverna-interaction-activity/src/main/resources/choose.vm
index f594beb..38510a8 100644
--- a/taverna-interaction-activity/src/main/resources/choose.vm
+++ b/taverna-interaction-activity/src/main/resources/choose.vm
@@ -1,3 +1,20 @@
+#*    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*#
+
 #require("selectionValues",1)
 #require("message")
 #require("title")

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/24351fd6/taverna-interaction-activity/src/main/resources/interaction.vm
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/interaction.vm b/taverna-interaction-activity/src/main/resources/interaction.vm
index b2d71e1..e3e9458 100644
--- a/taverna-interaction-activity/src/main/resources/interaction.vm
+++ b/taverna-interaction-activity/src/main/resources/interaction.vm
@@ -1,3 +1,20 @@
+#*    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*#
+
 <!doctype html>
 <html>
   <head>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/24351fd6/taverna-interaction-activity/src/main/resources/notify.vm
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/notify.vm b/taverna-interaction-activity/src/main/resources/notify.vm
index a144ccc..6525b62 100644
--- a/taverna-interaction-activity/src/main/resources/notify.vm
+++ b/taverna-interaction-activity/src/main/resources/notify.vm
@@ -1,3 +1,20 @@
+#*    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*#
+
 #require("message")
 #require("title")
 #notify

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/24351fd6/taverna-interaction-activity/src/main/resources/select.vm
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/select.vm b/taverna-interaction-activity/src/main/resources/select.vm
index 6fe5764..93be6dc 100644
--- a/taverna-interaction-activity/src/main/resources/select.vm
+++ b/taverna-interaction-activity/src/main/resources/select.vm
@@ -1,3 +1,20 @@
+#*    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*#
+
 #require("valueList",1)
 #require("message")
 #require("title")

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/24351fd6/taverna-interaction-activity/src/main/resources/tell.vm
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/tell.vm b/taverna-interaction-activity/src/main/resources/tell.vm
index 948c023..7e69de4 100644
--- a/taverna-interaction-activity/src/main/resources/tell.vm
+++ b/taverna-interaction-activity/src/main/resources/tell.vm
@@ -1,3 +1,20 @@
+#*    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*#
+
 #require("message")
 #require("title")
 #produce("answer")

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/24351fd6/taverna-interaction-activity/src/main/resources/warn.vm
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/resources/warn.vm b/taverna-interaction-activity/src/main/resources/warn.vm
index ae9f573..fae1f0a 100644
--- a/taverna-interaction-activity/src/main/resources/warn.vm
+++ b/taverna-interaction-activity/src/main/resources/warn.vm
@@ -1,3 +1,20 @@
+#*    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*#
+
 #require("message")
 #require("title")
 #produce("answer")


[23/28] incubator-taverna-common-activities git commit: Don't rat-check test-resources

Posted by st...@apache.org.
Don't rat-check test-resources


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/bb25b367
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/bb25b367
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/bb25b367

Branch: refs/heads/cwl-browse
Commit: bb25b367db2363faad77c2d95aa11be153c22a9f
Parents: 24351fd
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Apr 28 16:52:15 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Apr 28 16:52:15 2016 +0100

----------------------------------------------------------------------
 pom.xml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/bb25b367/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b498875..ea4a527 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,7 @@
 				<configuration>
 					<excludes combine.children="append">
 						<exclude>**/src/main/resources/META-INF/soap-encoding.xsd</exclude> <!-- W3C Software License (See NOTICE) -->
+						<exclude>**/src/test/resources/test-spreadsheet*</exclude> <!--  Our own test spreadsheets -->
 					</excludes>
 				</configuration>
 			</plugin>


[04/28] incubator-taverna-common-activities git commit: Moved third-party test WSDLs to https://github.com/taverna-extras/wsdl-generic-test-cases

Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/ma.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/ma.wsdl b/taverna-wsdl-generic/src/test/resources/testwsdls/ma.wsdl
deleted file mode 100644
index e522366..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/ma.wsdl
+++ /dev/null
@@ -1,1901 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="urn:hgu.webservice.services" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="urn:hgu.webservice.services" xmlns:intf="urn:hgu.webservice.services" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns1="http://mdb.WSDLGenerated.hgu" xmlns:tns2="http://CommonSubmission.WSDLGenerated.hgu" xmlns:tns3="http://SubmissionQuery.WSDLGenerated.hgu" xmlns:tns4="http://data.util.webservice.hgu" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<!--WSDL created by Apache Axis version: 1.3
-Built on Oct 05, 2005 (05:23:37 EDT)-->
- <wsdl:types>
-  <schema targetNamespace="http://mdb.WSDLGenerated.hgu" xmlns="http://www.w3.org/2001/XMLSchema">
-   <import namespace="http://SubmissionQuery.WSDLGenerated.hgu"/>
-   <import namespace="urn:hgu.webservice.services"/>
-   <import namespace="http://CommonSubmission.WSDLGenerated.hgu"/>
-   <import namespace="http://data.util.webservice.hgu"/>
-   <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-
-   <complexType name="QueryDetails">
-    <sequence>
-     <element name="substring" nillable="true" type="soapenc:string"/>
-     <element name="startEmbryoStage" nillable="true" type="soapenc:string"/>
-     <element name="stopEmbryoStage" nillable="true" type="soapenc:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="SearchResult">
-    <sequence>
-
-     <element name="name" nillable="true" type="soapenc:string"/>
-     <element name="id" nillable="true" type="soapenc:string"/>
-     <element name="path" nillable="true" type="soapenc:string"/>
-     <element name="stage" nillable="true" type="soapenc:string"/>
-     <element name="match" nillable="true" type="soapenc:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="ComponentDetails">
-    <sequence>
-
-     <element name="componentNode" type="xsd:boolean"/>
-     <element name="name" nillable="true" type="soapenc:string"/>
-     <element name="id" nillable="true" type="soapenc:string"/>
-     <element name="fullName" nillable="true" type="soapenc:string"/>
-     <element name="childrenId" nillable="true" type="impl:ArrayOf_soapenc_string"/>
-    </sequence>
-   </complexType>
-   <complexType name="SliceDefinition">
-    <sequence>
-
-     <element name="name" nillable="true" type="soapenc:string"/>
-     <element name="x" type="xsd:double"/>
-     <element name="y" type="xsd:double"/>
-     <element name="z" type="xsd:double"/>
-     <element name="theta" type="xsd:double"/>
-     <element name="phi" type="xsd:double"/>
-     <element name="distance" type="xsd:double"/>
-    </sequence>
-   </complexType>
-
-   <complexType name="SliceDetails">
-    <sequence>
-     <element name="slice" nillable="true" type="xsd:base64Binary"/>
-     <element name="width" type="xsd:int"/>
-     <element name="height" type="xsd:int"/>
-     <element name="x_offset" type="xsd:int"/>
-     <element name="y_offset" type="xsd:int"/>
-    </sequence>
-   </complexType>
-
-   <complexType name="SliceTranslationItem">
-    <sequence>
-     <element name="id" nillable="true" type="soapenc:string"/>
-     <element name="name" nillable="true" type="soapenc:string"/>
-     <element name="patchID" nillable="true" type="impl:ArrayOf_soapenc_string"/>
-     <element name="slicePosition" nillable="true" type="tns1:SliceDefinition"/>
-    </sequence>
-   </complexType>
-   <complexType name="FileByteArray">
-
-    <sequence>
-     <element name="type" nillable="true" type="soapenc:string"/>
-     <element name="name" nillable="true" type="soapenc:string"/>
-     <element name="width" type="xsd:int"/>
-     <element name="height" type="xsd:int"/>
-     <element name="fileInByte" nillable="true" type="xsd:base64Binary"/>
-    </sequence>
-   </complexType>
-   <complexType name="SpeciesInfo">
-
-    <sequence>
-     <element name="species" nillable="true" type="soapenc:string"/>
-     <element name="defaultStageType" nillable="true" type="soapenc:string"/>
-     <element name="IDPrefix" nillable="true" type="soapenc:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="ComponentFullDetails">
-    <sequence>
-     <element name="componentNode" type="xsd:boolean"/>
-
-     <element name="name" nillable="true" type="soapenc:string"/>
-     <element name="id" nillable="true" type="soapenc:string"/>
-     <element name="fullName" nillable="true" type="soapenc:string"/>
-     <element name="parentId" nillable="true" type="impl:ArrayOf_soapenc_string"/>
-     <element name="childrenId" nillable="true" type="impl:ArrayOf_soapenc_string"/>
-     <element name="synonyms" nillable="true" type="impl:ArrayOf_soapenc_string"/>
-     <element name="startEmbryoStage" nillable="true" type="soapenc:string"/>
-     <element name="stopEmbryoStage" nillable="true" type="soapenc:string"/>
-     <element name="embryoStage" nillable="true" type="soapenc:string"/>
-
-     <element name="abbreviation" nillable="true" type="soapenc:string"/>
-     <element name="deleted" type="xsd:boolean"/>
-     <element name="printFlag" type="xsd:boolean"/>
-     <element name="printName" nillable="true" type="soapenc:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="Region2DDetails">
-    <sequence>
-     <element name="viewID" nillable="true" type="soapenc:string"/>
-
-     <element name="slicePosition" nillable="true" type="tns1:SliceDefinition"/>
-     <element name="region" nillable="true" type="tns1:SliceDetails"/>
-    </sequence>
-   </complexType>
-  </schema>
-  <schema targetNamespace="urn:hgu.webservice.services" xmlns="http://www.w3.org/2001/XMLSchema">
-   <import namespace="http://SubmissionQuery.WSDLGenerated.hgu"/>
-   <import namespace="http://CommonSubmission.WSDLGenerated.hgu"/>
-   <import namespace="http://data.util.webservice.hgu"/>
-
-   <import namespace="http://mdb.WSDLGenerated.hgu"/>
-   <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-   <complexType name="ArrayOf_tns2_SearchResult">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns1:SearchResult[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-
-   <complexType name="ArrayOf_soapenc_string">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="xsd:string[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="ArrayOf_tns2_ComponentDetails">
-    <complexContent>
-
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns1:ComponentDetails[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="ArrayOf_tns2_SliceTranslationItem">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns1:SliceTranslationItem[]"/>
-
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="ArrayOf_tns3_GeneDetails">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns2:GeneDetails[]"/>
-     </restriction>
-    </complexContent>
-
-   </complexType>
-   <complexType name="ArrayOf_tns3_MutantDetails">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns2:MutantDetails[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="ArrayOf_tns3_LinkedSubmissionItem">
-
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns2:LinkedSubmissionItem[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="ArrayOf_tns3_PublicationDetails">
-    <complexContent>
-     <restriction base="soapenc:Array">
-
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns2:PublicationDetails[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="ArrayOf_tns3_ExpressionInComponentDetails">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns2:ExpressionInComponentDetails[]"/>
-     </restriction>
-
-    </complexContent>
-   </complexType>
-   <complexType name="ArrayOf_tns3_OriginalImageDetails">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns2:OriginalImageDetails[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-
-   <complexType name="ArrayOf_tns2_SliceDefinition">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns1:SliceDefinition[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="ArrayOf_tns3_DomainImageDetails">
-    <complexContent>
-
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns2:DomainImageDetails[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="ArrayOf_tns3_AcknowledgementGroupDetails">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns2:AcknowledgementGroupDetails[]"/>
-
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="ArrayOf_tns3_SubmissionShortDetails">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns2:SubmissionShortDetails[]"/>
-     </restriction>
-    </complexContent>
-
-   </complexType>
-   <complexType name="ArrayOf_tns3_SubmissionCoreDetails">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns2:SubmissionCoreDetails[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="ArrayOf_tns4_SubmissionSearchDetails">
-
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns3:SubmissionSearchDetails[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="ArrayOf_tns4_GeneExpressedQueryShortDetails">
-    <complexContent>
-     <restriction base="soapenc:Array">
-
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns3:GeneExpressedQueryShortDetails[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="ArrayOf_tns2_FileByteArray">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns1:FileByteArray[]"/>
-     </restriction>
-
-    </complexContent>
-   </complexType>
-   <complexType name="ArrayOf_tns4_ComponentExpressQueryShortDetails">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns3:ComponentExpressQueryShortDetails[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-
-   <complexType name="ArrayOf_tns4_Region2DExpressQueryShortDetails">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns3:Region2DExpressQueryShortDetails[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="ArrayOf_tns5_Assay">
-    <complexContent>
-
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="tns4:Assay[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-  </schema>
-  <schema targetNamespace="http://CommonSubmission.WSDLGenerated.hgu" xmlns="http://www.w3.org/2001/XMLSchema">
-   <import namespace="http://SubmissionQuery.WSDLGenerated.hgu"/>
-   <import namespace="urn:hgu.webservice.services"/>
-
-   <import namespace="http://data.util.webservice.hgu"/>
-   <import namespace="http://mdb.WSDLGenerated.hgu"/>
-   <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-   <complexType name="DBInfo">
-    <sequence>
-     <element name="DBName" nillable="true" type="soapenc:string"/>
-     <element name="Version" nillable="true" type="soapenc:string"/>
-     <element name="IDPrefix" nillable="true" type="soapenc:string"/>
-    </sequence>
-
-   </complexType>
-   <complexType name="GeneDetails">
-    <sequence>
-     <element name="symbol" nillable="true" type="soapenc:string"/>
-     <element name="name" nillable="true" type="soapenc:string"/>
-     <element name="ID" nillable="true" type="soapenc:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="PersonDetails">
-
-    <sequence>
-     <element name="name" nillable="true" type="soapenc:string"/>
-     <element name="lab" nillable="true" type="soapenc:string"/>
-     <element name="address" nillable="true" type="soapenc:string"/>
-     <element name="city" nillable="true" type="soapenc:string"/>
-     <element name="postcode" nillable="true" type="soapenc:string"/>
-     <element name="country" nillable="true" type="soapenc:string"/>
-     <element name="phoneNumber" nillable="true" type="soapenc:string"/>
-     <element name="faxNumber" nillable="true" type="soapenc:string"/>
-
-     <element name="email" nillable="true" type="soapenc:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="MutantDetails">
-    <sequence>
-     <element name="gene" nillable="true" type="soapenc:string"/>
-     <element name="father" nillable="true" type="soapenc:string"/>
-     <element name="mother" nillable="true" type="soapenc:string"/>
-    </sequence>
-
-   </complexType>
-   <complexType name="SpecimenDetails">
-    <sequence>
-     <element name="species" nillable="true" type="soapenc:string"/>
-     <element name="strain" nillable="true" type="soapenc:string"/>
-     <element name="sex" nillable="true" type="soapenc:string"/>
-     <element name="wildType" type="xsd:boolean"/>
-     <element name="mutants" nillable="true" type="impl:ArrayOf_tns3_MutantDetails"/>
-     <element name="stageFormat" nillable="true" type="soapenc:string"/>
-
-     <element name="stage" nillable="true" type="soapenc:string"/>
-     <element name="assayType" nillable="true" type="soapenc:string"/>
-     <element name="fixationMethod" nillable="true" type="soapenc:string"/>
-     <element name="embedding" nillable="true" type="soapenc:string"/>
-     <element name="notes" nillable="true" type="soapenc:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="LinkedSubmissionItem">
-    <sequence>
-
-     <element name="type" nillable="true" type="soapenc:string"/>
-     <element name="submissionID" nillable="true" type="soapenc:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="PublicationDetails">
-    <sequence>
-     <element name="authors" nillable="true" type="soapenc:string"/>
-     <element name="journal" nillable="true" type="soapenc:string"/>
-     <element name="title" nillable="true" type="soapenc:string"/>
-
-     <element name="volume" nillable="true" type="soapenc:string"/>
-     <element name="issue" nillable="true" type="soapenc:string"/>
-     <element name="year" type="xsd:short"/>
-     <element name="pages" nillable="true" type="soapenc:string"/>
-     <element name="DB" nillable="true" type="soapenc:string"/>
-     <element name="accessionNo" nillable="true" type="soapenc:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="LinkDetails">
-
-    <sequence>
-     <element name="linkedSubmission" nillable="true" type="impl:ArrayOf_tns3_LinkedSubmissionItem"/>
-     <element name="linkedPublication" nillable="true" type="impl:ArrayOf_tns3_PublicationDetails"/>
-    </sequence>
-   </complexType>
-   <complexType name="ProbeDetails">
-    <sequence>
-     <element name="probeName" nillable="true" type="soapenc:string"/>
-     <element name="cloneName" nillable="true" type="soapenc:string"/>
-
-     <element name="type" nillable="true" type="soapenc:string"/>
-     <element name="gene" nillable="true" type="tns2:GeneDetails"/>
-     <element name="nucleotide" nillable="true" type="soapenc:string"/>
-     <element name="accessionNumber" nillable="true" type="impl:ArrayOf_soapenc_string"/>
-     <element name="db1" nillable="true" type="soapenc:string"/>
-     <element name="source" nillable="true" type="soapenc:string"/>
-     <element name="coveredRegion" nillable="true" type="soapenc:string"/>
-     <element name="startLoc" type="xsd:int"/>
-     <element name="endLoc" type="xsd:int"/>
-
-     <element name="descriptionNotes" nillable="true" type="soapenc:string"/>
-     <element name="originType" nillable="true" type="soapenc:string"/>
-     <element name="strain" nillable="true" type="soapenc:string"/>
-     <element name="stageFormat" nillable="true" type="soapenc:string"/>
-     <element name="stage" nillable="true" type="soapenc:string"/>
-     <element name="tissue" nillable="true" type="soapenc:string"/>
-     <element name="cellLineDatabase" nillable="true" type="soapenc:string"/>
-     <element name="cellLineAccessionNo" nillable="true" type="soapenc:string"/>
-     <element name="cellLineNote" nillable="true" type="soapenc:string"/>
-
-     <element name="probeType" nillable="true" type="soapenc:string"/>
-     <element name="geneType" nillable="true" type="soapenc:string"/>
-     <element name="labelProduct" nillable="true" type="soapenc:string"/>
-     <element name="visualizationMethod" nillable="true" type="soapenc:string"/>
-     <element name="raisedIn" nillable="true" type="soapenc:string"/>
-     <element name="supplier" nillable="true" type="soapenc:string"/>
-     <element name="catalogueNo" nillable="true" type="soapenc:string"/>
-     <element name="sandwich" nillable="true" type="impl:ArrayOf_soapenc_string"/>
-    </sequence>
-
-   </complexType>
-   <complexType name="ExpressionInfoDetails">
-    <sequence>
-     <element name="patternID" nillable="true" type="soapenc:string"/>
-     <element name="strengthID" nillable="true" type="soapenc:string"/>
-     <element name="notes" nillable="true" type="soapenc:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="ExpressionInComponentDetails">
-
-    <sequence>
-     <element name="compID" nillable="true" type="soapenc:string"/>
-     <element name="expressionInfo" nillable="true" type="tns2:ExpressionInfoDetails"/>
-    </sequence>
-   </complexType>
-   <complexType name="OriginalImageDetails">
-    <sequence>
-     <element name="position" nillable="true" type="tns1:SliceDefinition"/>
-     <element name="ImageFileByteArray" nillable="true" type="tns1:FileByteArray"/>
-
-     <element name="category" type="xsd:int"/>
-     <element name="notes" nillable="true" type="soapenc:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="DomainImageDetails">
-    <sequence>
-     <element name="WlzFileByteArray" nillable="true" type="tns1:FileByteArray"/>
-     <element name="expressionInfo" nillable="true" type="tns2:ExpressionInfoDetails"/>
-     <element name="method" nillable="true" type="soapenc:string"/>
-
-     <element name="sectionPositions" nillable="true" type="impl:ArrayOf_tns2_SliceDefinition"/>
-    </sequence>
-   </complexType>
-   <complexType name="GeneExpressionDetails">
-    <sequence>
-     <element name="embryoStage" nillable="true" type="soapenc:string"/>
-     <element name="stagingQuality" nillable="true" type="soapenc:string"/>
-     <element name="assayQuality" nillable="true" type="soapenc:string"/>
-     <element name="result" nillable="true" type="impl:ArrayOf_tns3_ExpressionInComponentDetails"/>
-
-     <element name="originalImages" nillable="true" type="impl:ArrayOf_tns3_OriginalImageDetails"/>
-     <element name="associatedImages" nillable="true" type="impl:ArrayOf_tns3_OriginalImageDetails"/>
-     <element name="domainImages" nillable="true" type="impl:ArrayOf_tns3_DomainImageDetails"/>
-     <element name="wholemountImages" nillable="true" type="impl:ArrayOf_tns3_DomainImageDetails"/>
-    </sequence>
-   </complexType>
-   <complexType name="AcknowledgementGroupDetails">
-    <sequence>
-     <element name="name" nillable="true" type="soapenc:string"/>
-
-     <element name="address" nillable="true" type="soapenc:string"/>
-     <element name="city" nillable="true" type="soapenc:string"/>
-     <element name="country" nillable="true" type="soapenc:string"/>
-     <element name="URL" nillable="true" type="soapenc:string"/>
-     <element name="reason" nillable="true" type="soapenc:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="AcknowledgementDetails">
-    <sequence>
-
-     <element name="projectName" nillable="true" type="soapenc:string"/>
-     <element name="groups" nillable="true" type="impl:ArrayOf_tns3_AcknowledgementGroupDetails"/>
-    </sequence>
-   </complexType>
-   <complexType name="SubmissionDetails">
-    <sequence>
-     <element name="ID" nillable="true" type="soapenc:string"/>
-     <element name="status" nillable="true" type="soapenc:string"/>
-     <element name="source" nillable="true" type="soapenc:string"/>
-
-     <element name="validation" nillable="true" type="soapenc:string"/>
-     <element name="lastModificationTime" nillable="true" type="soapenc:string"/>
-     <element name="assayType" nillable="true" type="soapenc:string"/>
-     <element name="authors" nillable="true" type="soapenc:string"/>
-     <element name="contact" nillable="true" type="tns2:PersonDetails"/>
-     <element name="editor" nillable="true" type="tns2:PersonDetails"/>
-     <element name="specimen" nillable="true" type="tns2:SpecimenDetails"/>
-     <element name="reference" nillable="true" type="tns2:LinkDetails"/>
-     <element name="probe" nillable="true" type="tns2:ProbeDetails"/>
-
-     <element name="results" nillable="true" type="tns2:GeneExpressionDetails"/>
-     <element name="notes" nillable="true" type="soapenc:string"/>
-     <element name="acknowledgement" nillable="true" type="tns2:AcknowledgementDetails"/>
-    </sequence>
-   </complexType>
-   <complexType name="SubmissionCoreDetails">
-    <sequence>
-     <element name="ID" nillable="true" type="soapenc:string"/>
-     <element name="status" nillable="true" type="soapenc:string"/>
-
-     <element name="source" nillable="true" type="soapenc:string"/>
-     <element name="validation" nillable="true" type="soapenc:string"/>
-     <element name="lastModificationTime" nillable="true" type="soapenc:string"/>
-     <element name="assayType" nillable="true" type="soapenc:string"/>
-     <element name="authors" nillable="true" type="soapenc:string"/>
-     <element name="contact" nillable="true" type="tns2:PersonDetails"/>
-     <element name="editor" nillable="true" type="tns2:PersonDetails"/>
-     <element name="specimen" nillable="true" type="tns2:SpecimenDetails"/>
-     <element name="reference" nillable="true" type="tns2:LinkDetails"/>
-
-     <element name="probe" nillable="true" type="tns2:ProbeDetails"/>
-     <element name="embryoStage" nillable="true" type="soapenc:string"/>
-     <element name="stagingQuality" nillable="true" type="soapenc:string"/>
-     <element name="assayQuality" nillable="true" type="soapenc:string"/>
-     <element name="notes" nillable="true" type="soapenc:string"/>
-     <element name="acknowledgement" nillable="true" type="tns2:AcknowledgementDetails"/>
-    </sequence>
-   </complexType>
-   <complexType name="SubmissionShortDetails">
-
-    <sequence>
-     <element name="ID" nillable="true" type="soapenc:string"/>
-     <element name="geneSymbol" nillable="true" type="soapenc:string"/>
-     <element name="contactName" nillable="true" type="soapenc:string"/>
-     <element name="embryoStage" nillable="true" type="soapenc:string"/>
-    </sequence>
-   </complexType>
-  </schema>
-  <schema targetNamespace="http://SubmissionQuery.WSDLGenerated.hgu" xmlns="http://www.w3.org/2001/XMLSchema">
-
-   <import namespace="urn:hgu.webservice.services"/>
-   <import namespace="http://CommonSubmission.WSDLGenerated.hgu"/>
-   <import namespace="http://data.util.webservice.hgu"/>
-   <import namespace="http://mdb.WSDLGenerated.hgu"/>
-   <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-   <complexType name="SubmissionSearchDetails">
-    <sequence>
-     <element name="rank" type="xsd:double"/>
-     <element name="submission" nillable="true" type="tns2:SubmissionShortDetails"/>
-
-    </sequence>
-   </complexType>
-   <complexType name="GeneExpressedQueryShortDetails">
-    <sequence>
-     <element name="geneSymbol" nillable="true" type="soapenc:string"/>
-     <element name="submissions" nillable="true" type="impl:ArrayOf_tns4_SubmissionSearchDetails"/>
-    </sequence>
-   </complexType>
-   <complexType name="ComponentExpressQueryShortDetails">
-
-    <sequence>
-     <element name="componentID" nillable="true" type="soapenc:string"/>
-     <element name="submissions" nillable="true" type="impl:ArrayOf_tns3_SubmissionShortDetails"/>
-    </sequence>
-   </complexType>
-   <complexType name="Region2DExpressQueryShortDetails">
-    <sequence>
-     <element name="expressionRegion" nillable="true" type="tns1:Region2DDetails"/>
-     <element name="submissions" nillable="true" type="impl:ArrayOf_tns3_SubmissionShortDetails"/>
-
-    </sequence>
-   </complexType>
-   <complexType name="RegionExpressQueryShortDetails">
-    <sequence>
-     <element name="wlzFile" nillable="true" type="tns1:FileByteArray"/>
-     <element name="submissions" nillable="true" type="impl:ArrayOf_tns3_SubmissionShortDetails"/>
-    </sequence>
-   </complexType>
-  </schema>
-
-  <schema targetNamespace="http://data.util.webservice.hgu" xmlns="http://www.w3.org/2001/XMLSchema">
-   <import namespace="http://SubmissionQuery.WSDLGenerated.hgu"/>
-   <import namespace="urn:hgu.webservice.services"/>
-   <import namespace="http://CommonSubmission.WSDLGenerated.hgu"/>
-   <import namespace="http://mdb.WSDLGenerated.hgu"/>
-   <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-   <complexType name="Assay">
-    <sequence>
-     <element name="description" nillable="true" type="soapenc:string"/>
-
-     <element name="url" nillable="true" type="soapenc:string"/>
-    </sequence>
-   </complexType>
-  </schema>
- </wsdl:types>
-
-   <wsdl:message name="whatGeneInStageResponse">
-
-      <wsdl:part name="whatGeneInStageReturn" type="impl:ArrayOf_tns4_GeneExpressedQueryShortDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getComponentTreeResponse1">
-
-      <wsdl:part name="getComponentTreeReturn" type="impl:ArrayOf_tns2_ComponentDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAbstractNodesRequest">
-
-      <wsdl:part name="in0" type="impl:ArrayOf_soapenc_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getRootComponentsRequest">
-
-      <wsdl:part name="in0" type="soapenc:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getComponentTreeRequest">
-
-      <wsdl:part name="in0" type="soapenc:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="queryResponse">
-
-      <wsdl:part name="queryReturn" type="impl:ArrayOf_tns2_SearchResult"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getRegionGivenComponentResponse">
-
-      <wsdl:part name="getRegionGivenComponentReturn" type="tns1:FileByteArray"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="whatEntryGivenGeneResponse">
-
-      <wsdl:part name="whatEntryGivenGeneReturn" type="impl:ArrayOf_tns4_GeneExpressedQueryShortDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getWholemount2DRequest">
-
-      <wsdl:part name="in0" type="soapenc:string"/>
-
-      <wsdl:part name="in1" type="tns1:SliceDefinition"/>
-
-      <wsdl:part name="in2" type="xsd:boolean"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAssayResponse">
-
-      <wsdl:part name="getAssayReturn" type="impl:ArrayOf_tns5_Assay"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getWholemount2DInfoResponse">
-
-      <wsdl:part name="getWholemount2DInfoReturn" type="impl:ArrayOf_tns2_SliceTranslationItem"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getRegionGivenComponentRequest">
-
-      <wsdl:part name="in0" type="xsd:boolean"/>
-
-      <wsdl:part name="in1" type="impl:ArrayOf_soapenc_string"/>
-
-      <wsdl:part name="in2" type="soapenc:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getComponentTreeResponse">
-
-      <wsdl:part name="getComponentTreeReturn" type="impl:ArrayOf_tns2_ComponentDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="existResponse">
-
-      <wsdl:part name="existReturn" type="xsd:boolean"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getComponentFullDetailsRequest">
-
-      <wsdl:part name="in0" type="soapenc:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getStagesRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="getComponentFullDetailsResponse">
-
-      <wsdl:part name="getComponentFullDetailsReturn" type="tns1:ComponentFullDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getSpeciesInfoResponse">
-
-      <wsdl:part name="getSpeciesInfoReturn" type="tns1:SpeciesInfo"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="whatComponentExpressGeneResponse">
-
-      <wsdl:part name="whatComponentExpressGeneReturn" type="impl:ArrayOf_tns4_ComponentExpressQueryShortDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getWholemount2DResponse">
-
-      <wsdl:part name="getWholemount2DReturn" type="tns1:SliceDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getComponentTreeRequest1">
-
-   </wsdl:message>
-
-   <wsdl:message name="getSliceRequest">
-
-      <wsdl:part name="in0" type="soapenc:string"/>
-
-      <wsdl:part name="in1" type="soapenc:string"/>
-
-      <wsdl:part name="in2" type="tns1:SliceDefinition"/>
-
-      <wsdl:part name="in3" type="xsd:boolean"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getSubmissionCoreRequest">
-
-      <wsdl:part name="in0" type="soapenc:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="whatWholemountRegionExpressGeneRequest">
-
-      <wsdl:part name="in0" type="impl:ArrayOf_soapenc_string"/>
-
-      <wsdl:part name="in1" type="soapenc:string"/>
-
-      <wsdl:part name="in2" type="xsd:boolean"/>
-
-      <wsdl:part name="in3" type="xsd:int"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="queryRequest">
-
-      <wsdl:part name="in0" type="tns1:QueryDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getStagesWithReconstructionResponse">
-
-      <wsdl:part name="getStagesWithReconstructionReturn" type="impl:ArrayOf_soapenc_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="logResponse">
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllCoreSubmissionsRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="whatGeneInStageRequest">
-
-      <wsdl:part name="in0" type="soapenc:string"/>
-
-      <wsdl:part name="in1" type="soapenc:string"/>
-
-      <wsdl:part name="in2" type="xsd:int"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="logRequest">
-
-      <wsdl:part name="in0" type="soapenc:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="whatComponentExpressGeneRequest">
-
-      <wsdl:part name="in0" type="impl:ArrayOf_soapenc_string"/>
-
-      <wsdl:part name="in1" type="soapenc:string"/>
-
-      <wsdl:part name="in2" type="soapenc:string"/>
-
-      <wsdl:part name="in3" type="xsd:boolean"/>
-
-      <wsdl:part name="in4" type="xsd:int"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getStagesResponse">
-
-      <wsdl:part name="getStagesReturn" type="impl:ArrayOf_soapenc_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="whatGeneGivenRegionResponse">
-
-      <wsdl:part name="whatGeneGivenRegionReturn" type="impl:ArrayOf_tns4_GeneExpressedQueryShortDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getSliceResponse">
-
-      <wsdl:part name="getSliceReturn" type="tns1:SliceDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getSubmissionAssayImageRequest">
-
-      <wsdl:part name="in0" type="soapenc:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getDBInfoResponse">
-
-      <wsdl:part name="getDBInfoReturn" type="tns2:DBInfo"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getWholemount2DInfoRequest">
-
-      <wsdl:part name="in0" type="soapenc:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getGeneRequest">
-
-      <wsdl:part name="in0" type="soapenc:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getGeneResponse">
-
-      <wsdl:part name="getGeneReturn" type="tns2:GeneDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllSubmissionsRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="getTimedNodesResponse">
-
-      <wsdl:part name="getTimedNodesReturn" type="impl:ArrayOf_soapenc_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getSpeciesInfoRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="whatGeneGivenRegionRequest">
-
-      <wsdl:part name="in0" type="impl:ArrayOf_tns2_FileByteArray"/>
-
-      <wsdl:part name="in1" type="soapenc:string"/>
-
-      <wsdl:part name="in2" type="xsd:boolean"/>
-
-      <wsdl:part name="in3" type="xsd:int"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getDBInfoRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="getSubmissionRequest">
-
-      <wsdl:part name="in0" type="soapenc:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="whatVoxelRegionExpressGeneResponse">
-
-      <wsdl:part name="whatVoxelRegionExpressGeneReturn" type="tns3:RegionExpressQueryShortDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="whatWholemountRegionExpressGeneResponse">
-
-      <wsdl:part name="whatWholemountRegionExpressGeneReturn" type="impl:ArrayOf_tns4_Region2DExpressQueryShortDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllGeneResponse">
-
-      <wsdl:part name="getAllGeneReturn" type="impl:ArrayOf_tns3_GeneDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getStagesWithReconstructionRequest">
-
-      <wsdl:part name="in0" type="xsd:boolean"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getRootComponentsRequest1">
-
-   </wsdl:message>
-
-   <wsdl:message name="getSubmissionAssayImageResponse">
-
-      <wsdl:part name="getSubmissionAssayImageReturn" type="impl:ArrayOf_tns3_OriginalImageDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getSubmissionCoreResponse">
-
-      <wsdl:part name="getSubmissionCoreReturn" type="tns2:SubmissionCoreDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllCoreSubmissionsResponse">
-
-      <wsdl:part name="getAllCoreSubmissionsReturn" type="impl:ArrayOf_tns3_SubmissionCoreDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="existRequest">
-
-      <wsdl:part name="in0" type="soapenc:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="whatEntryGivenGeneRequest">
-
-      <wsdl:part name="in0" type="impl:ArrayOf_soapenc_string"/>
-
-      <wsdl:part name="in1" type="soapenc:string"/>
-
-      <wsdl:part name="in2" type="soapenc:string"/>
-
-      <wsdl:part name="in3" type="xsd:int"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllSubmissionsResponse">
-
-      <wsdl:part name="getAllSubmissionsReturn" type="impl:ArrayOf_tns3_SubmissionShortDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAssayRequest">
-
-      <wsdl:part name="in0" type="soapenc:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="whatVoxelRegionExpressGeneRequest">
-
-      <wsdl:part name="in0" type="impl:ArrayOf_soapenc_string"/>
-
-      <wsdl:part name="in1" type="soapenc:string"/>
-
-      <wsdl:part name="in2" type="xsd:boolean"/>
-
-      <wsdl:part name="in3" type="xsd:int"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getRootComponentsResponse1">
-
-      <wsdl:part name="getRootComponentsReturn" type="tns1:ComponentDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllGeneRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="getRootComponentsResponse">
-
-      <wsdl:part name="getRootComponentsReturn" type="tns1:ComponentDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getSubmissionResponse">
-
-      <wsdl:part name="getSubmissionReturn" type="tns2:SubmissionDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="whatGeneGivenComponentRequest">
-
-      <wsdl:part name="in0" type="impl:ArrayOf_soapenc_string"/>
-
-      <wsdl:part name="in1" type="soapenc:string"/>
-
-      <wsdl:part name="in2" type="xsd:boolean"/>
-
-      <wsdl:part name="in3" type="xsd:int"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAbstractNodesResponse">
-
-      <wsdl:part name="getAbstractNodesReturn" type="impl:ArrayOf_soapenc_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="whatGeneGivenComponentResponse">
-
-      <wsdl:part name="whatGeneGivenComponentReturn" type="impl:ArrayOf_tns4_GeneExpressedQueryShortDetails"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getTimedNodesRequest">
-
-      <wsdl:part name="in0" type="impl:ArrayOf_soapenc_string"/>
-
-   </wsdl:message>
-
-   <wsdl:portType name="WebService">
-
-      <wsdl:operation name="log" parameterOrder="in0">
-
-         <wsdl:input message="impl:logRequest" name="logRequest"/>
-
-         <wsdl:output message="impl:logResponse" name="logResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="query" parameterOrder="in0">
-
-         <wsdl:input message="impl:queryRequest" name="queryRequest"/>
-
-         <wsdl:output message="impl:queryResponse" name="queryResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getRootComponents" parameterOrder="in0">
-
-         <wsdl:input message="impl:getRootComponentsRequest" name="getRootComponentsRequest"/>
-
-         <wsdl:output message="impl:getRootComponentsResponse" name="getRootComponentsResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getRootComponents">
-
-         <wsdl:input message="impl:getRootComponentsRequest1" name="getRootComponentsRequest1"/>
-
-         <wsdl:output message="impl:getRootComponentsResponse1" name="getRootComponentsResponse1"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getComponentTree" parameterOrder="in0">
-
-         <wsdl:input message="impl:getComponentTreeRequest" name="getComponentTreeRequest"/>
-
-         <wsdl:output message="impl:getComponentTreeResponse" name="getComponentTreeResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getComponentTree">
-
-         <wsdl:input message="impl:getComponentTreeRequest1" name="getComponentTreeRequest1"/>
-
-         <wsdl:output message="impl:getComponentTreeResponse1" name="getComponentTreeResponse1"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getTimedNodes" parameterOrder="in0">
-
-         <wsdl:input message="impl:getTimedNodesRequest" name="getTimedNodesRequest"/>
-
-         <wsdl:output message="impl:getTimedNodesResponse" name="getTimedNodesResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAbstractNodes" parameterOrder="in0">
-
-         <wsdl:input message="impl:getAbstractNodesRequest" name="getAbstractNodesRequest"/>
-
-         <wsdl:output message="impl:getAbstractNodesResponse" name="getAbstractNodesResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getSlice" parameterOrder="in0 in1 in2 in3">
-
-         <wsdl:input message="impl:getSliceRequest" name="getSliceRequest"/>
-
-         <wsdl:output message="impl:getSliceResponse" name="getSliceResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getWholemount2DInfo" parameterOrder="in0">
-
-         <wsdl:input message="impl:getWholemount2DInfoRequest" name="getWholemount2DInfoRequest"/>
-
-         <wsdl:output message="impl:getWholemount2DInfoResponse" name="getWholemount2DInfoResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getWholemount2D" parameterOrder="in0 in1 in2">
-
-         <wsdl:input message="impl:getWholemount2DRequest" name="getWholemount2DRequest"/>
-
-         <wsdl:output message="impl:getWholemount2DResponse" name="getWholemount2DResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getStagesWithReconstruction" parameterOrder="in0">
-
-         <wsdl:input message="impl:getStagesWithReconstructionRequest" name="getStagesWithReconstructionRequest"/>
-
-         <wsdl:output message="impl:getStagesWithReconstructionResponse" name="getStagesWithReconstructionResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getRegionGivenComponent" parameterOrder="in0 in1 in2">
-
-         <wsdl:input message="impl:getRegionGivenComponentRequest" name="getRegionGivenComponentRequest"/>
-
-         <wsdl:output message="impl:getRegionGivenComponentResponse" name="getRegionGivenComponentResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getSpeciesInfo">
-
-         <wsdl:input message="impl:getSpeciesInfoRequest" name="getSpeciesInfoRequest"/>
-
-         <wsdl:output message="impl:getSpeciesInfoResponse" name="getSpeciesInfoResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getComponentFullDetails" parameterOrder="in0">
-
-         <wsdl:input message="impl:getComponentFullDetailsRequest" name="getComponentFullDetailsRequest"/>
-
-         <wsdl:output message="impl:getComponentFullDetailsResponse" name="getComponentFullDetailsResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getStages">
-
-         <wsdl:input message="impl:getStagesRequest" name="getStagesRequest"/>
-
-         <wsdl:output message="impl:getStagesResponse" name="getStagesResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getDBInfo">
-
-         <wsdl:input message="impl:getDBInfoRequest" name="getDBInfoRequest"/>
-
-         <wsdl:output message="impl:getDBInfoResponse" name="getDBInfoResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getGene" parameterOrder="in0">
-
-         <wsdl:input message="impl:getGeneRequest" name="getGeneRequest"/>
-
-         <wsdl:output message="impl:getGeneResponse" name="getGeneResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllGene">
-
-         <wsdl:input message="impl:getAllGeneRequest" name="getAllGeneRequest"/>
-
-         <wsdl:output message="impl:getAllGeneResponse" name="getAllGeneResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getSubmission" parameterOrder="in0">
-
-         <wsdl:input message="impl:getSubmissionRequest" name="getSubmissionRequest"/>
-
-         <wsdl:output message="impl:getSubmissionResponse" name="getSubmissionResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getSubmissionCore" parameterOrder="in0">
-
-         <wsdl:input message="impl:getSubmissionCoreRequest" name="getSubmissionCoreRequest"/>
-
-         <wsdl:output message="impl:getSubmissionCoreResponse" name="getSubmissionCoreResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllSubmissions">
-
-         <wsdl:input message="impl:getAllSubmissionsRequest" name="getAllSubmissionsRequest"/>
-
-         <wsdl:output message="impl:getAllSubmissionsResponse" name="getAllSubmissionsResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllCoreSubmissions">
-
-         <wsdl:input message="impl:getAllCoreSubmissionsRequest" name="getAllCoreSubmissionsRequest"/>
-
-         <wsdl:output message="impl:getAllCoreSubmissionsResponse" name="getAllCoreSubmissionsResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getSubmissionAssayImage" parameterOrder="in0">
-
-         <wsdl:input message="impl:getSubmissionAssayImageRequest" name="getSubmissionAssayImageRequest"/>
-
-         <wsdl:output message="impl:getSubmissionAssayImageResponse" name="getSubmissionAssayImageResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="exist" parameterOrder="in0">
-
-         <wsdl:input message="impl:existRequest" name="existRequest"/>
-
-         <wsdl:output message="impl:existResponse" name="existResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="whatGeneInStage" parameterOrder="in0 in1 in2">
-
-         <wsdl:input message="impl:whatGeneInStageRequest" name="whatGeneInStageRequest"/>
-
-         <wsdl:output message="impl:whatGeneInStageResponse" name="whatGeneInStageResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="whatEntryGivenGene" parameterOrder="in0 in1 in2 in3">
-
-         <wsdl:input message="impl:whatEntryGivenGeneRequest" name="whatEntryGivenGeneRequest"/>
-
-         <wsdl:output message="impl:whatEntryGivenGeneResponse" name="whatEntryGivenGeneResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="whatGeneGivenRegion" parameterOrder="in0 in1 in2 in3">
-
-         <wsdl:input message="impl:whatGeneGivenRegionRequest" name="whatGeneGivenRegionRequest"/>
-
-         <wsdl:output message="impl:whatGeneGivenRegionResponse" name="whatGeneGivenRegionResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="whatGeneGivenComponent" parameterOrder="in0 in1 in2 in3">
-
-         <wsdl:input message="impl:whatGeneGivenComponentRequest" name="whatGeneGivenComponentRequest"/>
-
-         <wsdl:output message="impl:whatGeneGivenComponentResponse" name="whatGeneGivenComponentResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="whatComponentExpressGene" parameterOrder="in0 in1 in2 in3 in4">
-
-         <wsdl:input message="impl:whatComponentExpressGeneRequest" name="whatComponentExpressGeneRequest"/>
-
-         <wsdl:output message="impl:whatComponentExpressGeneResponse" name="whatComponentExpressGeneResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="whatWholemountRegionExpressGene" parameterOrder="in0 in1 in2 in3">
-
-         <wsdl:input message="impl:whatWholemountRegionExpressGeneRequest" name="whatWholemountRegionExpressGeneRequest"/>
-
-         <wsdl:output message="impl:whatWholemountRegionExpressGeneResponse" name="whatWholemountRegionExpressGeneResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="whatVoxelRegionExpressGene" parameterOrder="in0 in1 in2 in3">
-
-         <wsdl:input message="impl:whatVoxelRegionExpressGeneRequest" name="whatVoxelRegionExpressGeneRequest"/>
-
-         <wsdl:output message="impl:whatVoxelRegionExpressGeneResponse" name="whatVoxelRegionExpressGeneResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAssay" parameterOrder="in0">
-
-         <wsdl:input message="impl:getAssayRequest" name="getAssayRequest"/>
-
-         <wsdl:output message="impl:getAssayResponse" name="getAssayResponse"/>
-
-      </wsdl:operation>
-
-   </wsdl:portType>
-
-   <wsdl:binding name="maSoapBinding" type="impl:WebService">
-
-      <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-      <wsdl:operation name="log">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="logRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="logResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="query">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="queryRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="queryResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getRootComponents">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getRootComponentsRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getRootComponentsResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getRootComponents">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getRootComponentsRequest1">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getRootComponentsResponse1">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getComponentTree">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getComponentTreeRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getComponentTreeResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getComponentTree">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getComponentTreeRequest1">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getComponentTreeResponse1">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getTimedNodes">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getTimedNodesRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getTimedNodesResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAbstractNodes">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getAbstractNodesRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getAbstractNodesResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getSlice">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getSliceRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getSliceResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getWholemount2DInfo">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getWholemount2DInfoRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getWholemount2DInfoResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getWholemount2D">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getWholemount2DRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getWholemount2DResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getStagesWithReconstruction">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getStagesWithReconstructionRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getStagesWithReconstructionResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getRegionGivenComponent">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getRegionGivenComponentRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getRegionGivenComponentResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getSpeciesInfo">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getSpeciesInfoRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getSpeciesInfoResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getComponentFullDetails">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getComponentFullDetailsRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getComponentFullDetailsResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getStages">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getStagesRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getStagesResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getDBInfo">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getDBInfoRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getDBInfoResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getGene">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getGeneRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getGeneResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllGene">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getAllGeneRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getAllGeneResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getSubmission">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getSubmissionRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getSubmissionResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getSubmissionCore">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getSubmissionCoreRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getSubmissionCoreResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllSubmissions">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getAllSubmissionsRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getAllSubmissionsResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllCoreSubmissions">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getAllCoreSubmissionsRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getAllCoreSubmissionsResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getSubmissionAssayImage">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getSubmissionAssayImageRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getSubmissionAssayImageResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="exist">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="existRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="existResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="whatGeneInStage">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="whatGeneInStageRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="whatGeneInStageResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="whatEntryGivenGene">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="whatEntryGivenGeneRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="whatEntryGivenGeneResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="whatGeneGivenRegion">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="whatGeneGivenRegionRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="whatGeneGivenRegionResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="whatGeneGivenComponent">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="whatGeneGivenComponentRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="whatGeneGivenComponentResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="whatComponentExpressGene">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="whatComponentExpressGeneRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="whatComponentExpressGeneResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="whatWholemountRegionExpressGene">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="whatWholemountRegionExpressGeneRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="whatWholemountRegionExpressGeneResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="whatVoxelRegionExpressGene">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="whatVoxelRegionExpressGeneRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="whatVoxelRegionExpressGeneResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAssay">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getAssayRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getAssayResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:hgu.webservice.services" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-   </wsdl:binding>
-
-   <wsdl:service name="WebServiceService">
-
-      <wsdl:port binding="impl:maSoapBinding" name="ma">
-
-         <wsdlsoap:address location="http://genex.hgu.mrc.ac.uk/axis/services/ma"/>
-
-      </wsdl:port>
-
-   </wsdl:service>
-
-</wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/menagerie-complex-rpc.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/menagerie-complex-rpc.wsdl b/taverna-wsdl-generic/src/test/resources/testwsdls/menagerie-complex-rpc.wsdl
deleted file mode 100644
index 58b74b7..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/menagerie-complex-rpc.wsdl
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://xfire.codehaus.org/BookService" xmlns:tns="http://xfire.codehaus.org/BookService" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://www.w3.org/2003/05/soap-envelope" xmlns:ns1="http://complex.pojo.axis2.menagerie.googlecode" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc11="http://schemas.xmlsoap.org/soap/encoding/" xmlns:soapenc12="http://www.w3.org/2003/05/soap-encoding" xmlns:soap11="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://complex.pojo.axis2.menagerie.googlecode">
-<xsd:complexType name="Person">
-<xsd:sequence>
-<xsd:element minOccurs="0" name="address" nillable="true" type="ns1:Address"/>
-<xsd:element minOccurs="0" name="age" type="xsd:int"/>
-<xsd:element minOccurs="0" name="firstName" nillable="true" type="xsd:string"/>
-<xsd:element minOccurs="0" name="lastName" nillable="true" type="xsd:string"/>
-</xsd:sequence>
-</xsd:complexType>
-<xsd:complexType name="Address">
-<xsd:sequence>
-<xsd:element minOccurs="0" name="city" nillable="true" type="xsd:string"/>
-<xsd:element minOccurs="0" name="road" nillable="true" type="xsd:string"/>
-<xsd:element minOccurs="0" name="roadNumber" type="xsd:int"/>
-</xsd:sequence>
-</xsd:complexType>
-<xsd:complexType name="ArrayOfPerson">
-<xsd:sequence>
-<xsd:element maxOccurs="unbounded" minOccurs="0" name="Person" nillable="true" type="ns1:Person"/>
-</xsd:sequence>
-</xsd:complexType>
-<xsd:complexType name="ComplexWithInternalList">
-<xsd:sequence>
-<xsd:element minOccurs="0" name="innerArray" nillable="true" type="tns:ArrayOfString"/>
-<xsd:element minOccurs="0" name="innerList" nillable="true" type="tns:ArrayOfString"/>
-<xsd:element minOccurs="0" name="length" type="xsd:int"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:schema>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://xfire.codehaus.org/BookService">
-<xsd:complexType name="ArrayOfString">
-<xsd:sequence>
-<xsd:element maxOccurs="unbounded" minOccurs="0" name="string" nillable="true" type="xsd:string"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="countPeopleListRequest">
-    <wsdl:part name="people" type="ns1:ArrayOfPerson">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="getPersonArrayResponse">
-    <wsdl:part name="out" type="ns1:ArrayOfPerson">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="getPersonListResponse">
-    <wsdl:part name="out" type="ns1:ArrayOfPerson">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="personToStringRequest">
-    <wsdl:part name="person" type="ns1:Person">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="getComplexWithInternalListResponse">
-    <wsdl:part name="out" type="ns1:ComplexWithInternalList">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="createPersonRequest">
-  </wsdl:message>
-  <wsdl:message name="countPeopleArrayResponse">
-    <wsdl:part name="out" type="xsd:int">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="getComplexWithInternalListRequest">
-  </wsdl:message>
-  <wsdl:message name="createPersonResponse">
-    <wsdl:part name="out" type="ns1:Person">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="getPersonListRequest">
-    <wsdl:part name="size" type="xsd:int">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="countPeopleArrayRequest">
-    <wsdl:part name="people" type="ns1:ArrayOfPerson">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="personToStringResponse">
-    <wsdl:part name="out" type="xsd:string">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="countPeopleListResponse">
-    <wsdl:part name="out" type="xsd:int">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="getPersonArrayRequest">
-    <wsdl:part name="size" type="xsd:int">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="Complex-rePortType">
-    <wsdl:operation name="personToString">
-      <wsdl:input name="personToStringRequest" message="tns:personToStringRequest">
-    </wsdl:input>
-      <wsdl:output name="personToStringResponse" message="tns:personToStringResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="countPeopleList">
-      <wsdl:input name="countPeopleListRequest" message="tns:countPeopleListRequest">
-    </wsdl:input>
-      <wsdl:output name="countPeopleListResponse" message="tns:countPeopleListResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getPersonList">
-      <wsdl:input name="getPersonListRequest" message="tns:getPersonListRequest">
-    </wsdl:input>
-      <wsdl:output name="getPersonListResponse" message="tns:getPersonListResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="countPeopleArray">
-      <wsdl:input name="countPeopleArrayRequest" message="tns:countPeopleArrayRequest">
-    </wsdl:input>
-      <wsdl:output name="countPeopleArrayResponse" message="tns:countPeopleArrayResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="createPerson">
-      <wsdl:input name="createPersonRequest" message="tns:createPersonRequest">
-    </wsdl:input>
-      <wsdl:output name="createPersonResponse" message="tns:createPersonResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getPersonArray">
-      <wsdl:input name="getPersonArrayRequest" message="tns:getPersonArrayRequest">
-    </wsdl:input>
-      <wsdl:output name="getPersonArrayResponse" message="tns:getPersonArrayResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getComplexWithInternalList">
-      <wsdl:input name="getComplexWithInternalListRequest" message="tns:getComplexWithInternalListRequest">
-    </wsdl:input>
-      <wsdl:output name="getComplexWithInternalListResponse" message="tns:getComplexWithInternalListResponse">
-    </wsdl:output>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="Complex-reHttpBinding" type="tns:Complex-rePortType">
-    <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="personToString">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="personToStringRequest">
-        <wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xfire.codehaus.org/BookService"/>
-      </wsdl:input>
-      <wsdl:output name="personToStringResponse">
-        <wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xfire.codehaus.org/BookService"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="countPeopleList">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="countPeopleListRequest">
-        <wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xfire.codehaus.org/BookService"/>
-      </wsdl:input>
-      <wsdl:output name="countPeopleListResponse">
-        <wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xfire.codehaus.org/BookService"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getPersonList">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="getPersonListRequest">
-        <wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xfire.codehaus.org/BookService"/>
-      </wsdl:input>
-      <wsdl:output name="getPersonListResponse">
-        <wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xfire.codehaus.org/BookService"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="countPeopleArray">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="countPeopleArrayRequest">
-        <wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xfire.codehaus.org/BookService"/>
-      </wsdl:input>
-      <wsdl:output name="countPeopleArrayResponse">
-        <wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xfire.codehaus.org/BookService"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="createPerson">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="createPersonRequest">
-        <wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xfire.codehaus.org/BookService"/>
-      </wsdl:input>
-      <wsdl:output name="createPersonResponse">
-        <wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xfire.codehaus.org/BookService"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getPersonArray">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="getPersonArrayRequest">
-        <wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xfire.codehaus.org/BookService"/>
-      </wsdl:input>
-      <wsdl:output name="getPersonArrayResponse">
-        <wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xfire.codehaus.org/BookService"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getComplexWithInternalList">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="getComplexWithInternalListRequest">
-        <wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xfire.codehaus.org/BookService"/>
-      </wsdl:input>
-      <wsdl:output name="getComplexWithInternalListResponse">
-        <wsdlsoap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://xfire.codehaus.org/BookService"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="Complex-re">
-    <wsdl:port name="Complex-reHttpPort" binding="tns:Complex-reHttpBinding">
-      <wsdlsoap:address location="http://www.mygrid.org.uk/menagerie/xfire/Complex-re"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file


[05/28] incubator-taverna-common-activities git commit: Moved third-party test WSDLs to https://github.com/taverna-extras/wsdl-generic-test-cases

Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/jws-online.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/jws-online.wsdl b/taverna-wsdl-generic/src/test/resources/testwsdls/jws-online.wsdl
deleted file mode 100644
index 49b94ee..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/jws-online.wsdl
+++ /dev/null
@@ -1,1001 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://jjj.biochem.sun.ac.za/qjws" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://jjj.biochem.sun.ac.za/qjws" xmlns:intf="http://jjj.biochem.sun.ac.za/qjws" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<!--WSDL created by Apache Axis version: 1.4
-Built on Apr 22, 2006 (06:55:48 PDT)-->
- <wsdl:types>
-  <schema targetNamespace="http://jjj.biochem.sun.ac.za/qjws" xmlns="http://www.w3.org/2001/XMLSchema">
-   <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-   <complexType name="ArrayOf_xsd_string">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="xsd:string[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="VectorType">
-    <sequence>
-     <element name="credits" nillable="true" type="xsd:string"/>
-     <element name="isModelMethodSupported" type="xsd:boolean"/>
-     <element name="model" nillable="true" type="xsd:string"/>
-     <element name="vect" nillable="true" type="impl:ArrayOf_xsd_string"/>
-    </sequence>
-   </complexType>
-   <complexType name="ArrayOfArrayOf_xsd_string">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="xsd:string[][]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="NmatType">
-    <sequence>
-     <element name="credits" nillable="true" type="xsd:string"/>
-     <element name="isModelMethodSupported" type="xsd:boolean"/>
-     <element name="model" nillable="true" type="xsd:string"/>
-     <element name="rates" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="stochMat" nillable="true" type="impl:ArrayOfArrayOf_xsd_string"/>
-     <element name="vars" nillable="true" type="impl:ArrayOf_xsd_string"/>
-    </sequence>
-   </complexType>
-   <complexType name="KmatType">
-    <sequence>
-     <element name="SSFlux" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="credits" nillable="true" type="xsd:string"/>
-     <element name="indFlux" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="isModelMethodSupported" type="xsd:boolean"/>
-     <element name="kernel" nillable="true" type="impl:ArrayOfArrayOf_xsd_string"/>
-     <element name="model" nillable="true" type="xsd:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="LmatType">
-    <sequence>
-     <element name="credits" nillable="true" type="xsd:string"/>
-     <element name="indMetabs" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="isModelMethodSupported" type="xsd:boolean"/>
-     <element name="linkMat" nillable="true" type="impl:ArrayOfArrayOf_xsd_string"/>
-     <element name="metabs" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="model" nillable="true" type="xsd:string"/>
-     <element name="moieties" nillable="true" type="impl:ArrayOf_xsd_string"/>
-    </sequence>
-   </complexType>
-   <complexType name="StStTableType">
-    <sequence>
-     <element name="credits" nillable="true" type="xsd:string"/>
-     <element name="fluxNames" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="fluxVals" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="isModelMethodSupported" type="xsd:boolean"/>
-     <element name="metabNames" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="metabVals" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="model" nillable="true" type="xsd:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="TimecourseType">
-    <sequence>
-     <element name="credits" nillable="true" type="xsd:string"/>
-     <element name="isModelMethodSupported" type="xsd:boolean"/>
-     <element name="mat" nillable="true" type="impl:ArrayOfArrayOf_xsd_string"/>
-     <element name="model" nillable="true" type="xsd:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="MatrixType">
-    <sequence>
-     <element name="credits" nillable="true" type="xsd:string"/>
-     <element name="isModelMethodSupported" type="xsd:boolean"/>
-     <element name="mat" nillable="true" type="impl:ArrayOfArrayOf_xsd_string"/>
-     <element name="model" nillable="true" type="xsd:string"/>
-     <element name="numRows" type="xsd:int"/>
-     <element maxOccurs="unbounded" name="row" nillable="true" type="impl:ArrayOf_xsd_string"/>
-    </sequence>
-   </complexType>
-   <complexType name="ArrayOfArrayOfArrayOf_xsd_string">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="xsd:string[][][]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="MCATypeString">
-    <sequence>
-     <element name="credits" nillable="true" type="xsd:string"/>
-     <element name="isModelMethodSupported" type="xsd:boolean"/>
-     <element name="mat" nillable="true" type="impl:ArrayOfArrayOfArrayOf_xsd_string"/>
-     <element name="model" nillable="true" type="xsd:string"/>
-     <element maxOccurs="unbounded" name="numCols" type="xsd:int"/>
-     <element name="numRows" type="xsd:int"/>
-     <element maxOccurs="unbounded" name="row" nillable="true" type="impl:ArrayOfArrayOf_xsd_string"/>
-    </sequence>
-   </complexType>
-  </schema>
- </wsdl:types>
-
-   <wsdl:message name="getRatesResponse">
-
-      <wsdl:part name="getRatesReturn" type="impl:VectorType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getRateEquationFormulaeRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getTimecourseRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getRateEquationsResponse">
-
-      <wsdl:part name="getRateEquationsReturn" type="impl:VectorType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllBiomodelsIdsResponse">
-
-      <wsdl:part name="getAllBiomodelsIdsReturn" type="impl:ArrayOf_xsd_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllBiomodelsIdsRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="getParamValuesResponse">
-
-      <wsdl:part name="getParamValuesReturn" type="impl:VectorType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getExtVarRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getCmatResponse">
-
-      <wsdl:part name="getCmatReturn" type="impl:MCATypeString"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getParamValuesRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getExtVarResponse">
-
-      <wsdl:part name="getExtVarReturn" type="impl:VectorType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="hasFunctionResponse">
-
-      <wsdl:part name="hasFunctionReturn" type="xsd:boolean"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getKmatRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllModelsRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="getRateEquationFormulaeResponse">
-
-      <wsdl:part name="getRateEquationFormulaeReturn" type="impl:VectorType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getEigenvRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getSteadyStateTableRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getModelInfoResponse">
-
-      <wsdl:part name="getModelInfoReturn" type="impl:ArrayOf_xsd_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getNmatRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getExternalMetabValuesResponse">
-
-      <wsdl:part name="getExternalMetabValuesReturn" type="impl:VectorType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getEmatRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getModelsByOrganismRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getModelsByOrganismResponse">
-
-      <wsdl:part name="getModelsByOrganismReturn" type="impl:ArrayOf_xsd_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getSteadyStateTableResponse">
-
-      <wsdl:part name="getSteadyStateTableReturn" type="impl:StStTableType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getJacobRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getModelsByCategoryResponse">
-
-      <wsdl:part name="getModelsByCategoryReturn" type="impl:ArrayOf_xsd_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getInitMetabValuesResponse">
-
-      <wsdl:part name="getInitMetabValuesReturn" type="impl:VectorType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getLmatRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getCmatRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getLmatResponse">
-
-      <wsdl:part name="getLmatReturn" type="impl:LmatType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="hasFunctionRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-      <wsdl:part name="in1" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getRateEquationsRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getJacobResponse">
-
-      <wsdl:part name="getJacobReturn" type="impl:MatrixType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getExternalMetabValuesRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllModelsResponse">
-
-      <wsdl:part name="getAllModelsReturn" type="impl:ArrayOf_xsd_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getNmatResponse">
-
-      <wsdl:part name="getNmatReturn" type="impl:NmatType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getInitMetabValuesRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getModelsByCategoryRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getRatesRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getKmatResponse">
-
-      <wsdl:part name="getKmatReturn" type="impl:KmatType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getEigenvResponse">
-
-      <wsdl:part name="getEigenvReturn" type="impl:VectorType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getEmatResponse">
-
-      <wsdl:part name="getEmatReturn" type="impl:MCATypeString"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getTimecourseResponse">
-
-      <wsdl:part name="getTimecourseReturn" type="impl:TimecourseType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getModelInfoRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllBiomodelsResponse">
-
-      <wsdl:part name="getAllBiomodelsReturn" type="impl:ArrayOf_xsd_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllBiomodelsRequest">
-
-   </wsdl:message>
-
-   <wsdl:portType name="QueryJWS">
-
-      <wsdl:operation name="getRates" parameterOrder="in0">
-
-         <wsdl:input message="impl:getRatesRequest" name="getRatesRequest"/>
-
-         <wsdl:output message="impl:getRatesResponse" name="getRatesResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllModels">
-
-         <wsdl:input message="impl:getAllModelsRequest" name="getAllModelsRequest"/>
-
-         <wsdl:output message="impl:getAllModelsResponse" name="getAllModelsResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllBiomodels">
-
-         <wsdl:input message="impl:getAllBiomodelsRequest" name="getAllBiomodelsRequest"/>
-
-         <wsdl:output message="impl:getAllBiomodelsResponse" name="getAllBiomodelsResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllBiomodelsIds">
-
-         <wsdl:input message="impl:getAllBiomodelsIdsRequest" name="getAllBiomodelsIdsRequest"/>
-
-         <wsdl:output message="impl:getAllBiomodelsIdsResponse" name="getAllBiomodelsIdsResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getModelsByOrganism" parameterOrder="in0">
-
-         <wsdl:input message="impl:getModelsByOrganismRequest" name="getModelsByOrganismRequest"/>
-
-         <wsdl:output message="impl:getModelsByOrganismResponse" name="getModelsByOrganismResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getModelsByCategory" parameterOrder="in0">
-
-         <wsdl:input message="impl:getModelsByCategoryRequest" name="getModelsByCategoryRequest"/>
-
-         <wsdl:output message="impl:getModelsByCategoryResponse" name="getModelsByCategoryResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getModelInfo" parameterOrder="in0">
-
-         <wsdl:input message="impl:getModelInfoRequest" name="getModelInfoRequest"/>
-
-         <wsdl:output message="impl:getModelInfoResponse" name="getModelInfoResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getNmat" parameterOrder="in0">
-
-         <wsdl:input message="impl:getNmatRequest" name="getNmatRequest"/>
-
-         <wsdl:output message="impl:getNmatResponse" name="getNmatResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getKmat" parameterOrder="in0">
-
-         <wsdl:input message="impl:getKmatRequest" name="getKmatRequest"/>
-
-         <wsdl:output message="impl:getKmatResponse" name="getKmatResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getLmat" parameterOrder="in0">
-
-         <wsdl:input message="impl:getLmatRequest" name="getLmatRequest"/>
-
-         <wsdl:output message="impl:getLmatResponse" name="getLmatResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getSteadyStateTable" parameterOrder="in0">
-
-         <wsdl:input message="impl:getSteadyStateTableRequest" name="getSteadyStateTableRequest"/>
-
-         <wsdl:output message="impl:getSteadyStateTableResponse" name="getSteadyStateTableResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getTimecourse" parameterOrder="in0">
-
-         <wsdl:input message="impl:getTimecourseRequest" name="getTimecourseRequest"/>
-
-         <wsdl:output message="impl:getTimecourseResponse" name="getTimecourseResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getJacob" parameterOrder="in0">
-
-         <wsdl:input message="impl:getJacobRequest" name="getJacobRequest"/>
-
-         <wsdl:output message="impl:getJacobResponse" name="getJacobResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getEigenv" parameterOrder="in0">
-
-         <wsdl:input message="impl:getEigenvRequest" name="getEigenvRequest"/>
-
-         <wsdl:output message="impl:getEigenvResponse" name="getEigenvResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getCmat" parameterOrder="in0">
-
-         <wsdl:input message="impl:getCmatRequest" name="getCmatRequest"/>
-
-         <wsdl:output message="impl:getCmatResponse" name="getCmatResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getEmat" parameterOrder="in0">
-
-         <wsdl:input message="impl:getEmatRequest" name="getEmatRequest"/>
-
-         <wsdl:output message="impl:getEmatResponse" name="getEmatResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getRateEquations" parameterOrder="in0">
-
-         <wsdl:input message="impl:getRateEquationsRequest" name="getRateEquationsRequest"/>
-
-         <wsdl:output message="impl:getRateEquationsResponse" name="getRateEquationsResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getRateEquationFormulae" parameterOrder="in0">
-
-         <wsdl:input message="impl:getRateEquationFormulaeRequest" name="getRateEquationFormulaeRequest"/>
-
-         <wsdl:output message="impl:getRateEquationFormulaeResponse" name="getRateEquationFormulaeResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getExtVar" parameterOrder="in0">
-
-         <wsdl:input message="impl:getExtVarRequest" name="getExtVarRequest"/>
-
-         <wsdl:output message="impl:getExtVarResponse" name="getExtVarResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getExternalMetabValues" parameterOrder="in0">
-
-         <wsdl:input message="impl:getExternalMetabValuesRequest" name="getExternalMetabValuesRequest"/>
-
-         <wsdl:output message="impl:getExternalMetabValuesResponse" name="getExternalMetabValuesResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getInitMetabValues" parameterOrder="in0">
-
-         <wsdl:input message="impl:getInitMetabValuesRequest" name="getInitMetabValuesRequest"/>
-
-         <wsdl:output message="impl:getInitMetabValuesResponse" name="getInitMetabValuesResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getParamValues" parameterOrder="in0">
-
-         <wsdl:input message="impl:getParamValuesRequest" name="getParamValuesRequest"/>
-
-         <wsdl:output message="impl:getParamValuesResponse" name="getParamValuesResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="hasFunction" parameterOrder="in0 in1">
-
-         <wsdl:input message="impl:hasFunctionRequest" name="hasFunctionRequest"/>
-
-         <wsdl:output message="impl:hasFunctionResponse" name="hasFunctionResponse"/>
-
-      </wsdl:operation>
-
-   </wsdl:portType>
-
-   <wsdl:binding name="QueryJWSSoapBinding" type="impl:QueryJWS">
-
-      <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-      <wsdl:operation name="getRates">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getRatesRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getRatesResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllModels">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getAllModelsRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getAllModelsResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllBiomodels">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getAllBiomodelsRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getAllBiomodelsResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllBiomodelsIds">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getAllBiomodelsIdsRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getAllBiomodelsIdsResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getModelsByOrganism">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getModelsByOrganismRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getModelsByOrganismResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getModelsByCategory">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getModelsByCategoryRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getModelsByCategoryResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getModelInfo">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getModelInfoRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getModelInfoResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getNmat">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getNmatRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getNmatResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getKmat">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getKmatRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getKmatResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getLmat">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getLmatRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getLmatResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getSteadyStateTable">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getSteadyStateTableRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getSteadyStateTableResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getTimecourse">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getTimecourseRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getTimecourseResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getJacob">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getJacobRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getJacobResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getEigenv">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getEigenvRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getEigenvResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getCmat">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getCmatRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getCmatResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getEmat">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getEmatRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getEmatResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getRateEquations">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getRateEquationsRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getRateEquationsResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getRateEquationFormulae">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getRateEquationFormulaeRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getRateEquationFormulaeResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getExtVar">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getExtVarRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getExtVarResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getExternalMetabValues">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getExternalMetabValuesRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getExternalMetabValuesResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getInitMetabValues">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getInitMetabValuesRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getInitMetabValuesResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getParamValues">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getParamValuesRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getParamValuesResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="hasFunction">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="hasFunctionRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="hasFunctionResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-   </wsdl:binding>
-
-   <wsdl:service name="QueryJWSService">
-
-      <wsdl:port binding="impl:QueryJWSSoapBinding" name="QueryJWS">
-
-         <wsdlsoap:address location="http://jjj.mib.ac.uk/axis/services/QueryJWS"/>
-
-      </wsdl:port>
-
-   </wsdl:service>
-
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/jws_online.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/jws_online.wsdl b/taverna-wsdl-generic/src/test/resources/testwsdls/jws_online.wsdl
deleted file mode 100644
index 49b94ee..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/jws_online.wsdl
+++ /dev/null
@@ -1,1001 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://jjj.biochem.sun.ac.za/qjws" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://jjj.biochem.sun.ac.za/qjws" xmlns:intf="http://jjj.biochem.sun.ac.za/qjws" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<!--WSDL created by Apache Axis version: 1.4
-Built on Apr 22, 2006 (06:55:48 PDT)-->
- <wsdl:types>
-  <schema targetNamespace="http://jjj.biochem.sun.ac.za/qjws" xmlns="http://www.w3.org/2001/XMLSchema">
-   <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-   <complexType name="ArrayOf_xsd_string">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="xsd:string[]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="VectorType">
-    <sequence>
-     <element name="credits" nillable="true" type="xsd:string"/>
-     <element name="isModelMethodSupported" type="xsd:boolean"/>
-     <element name="model" nillable="true" type="xsd:string"/>
-     <element name="vect" nillable="true" type="impl:ArrayOf_xsd_string"/>
-    </sequence>
-   </complexType>
-   <complexType name="ArrayOfArrayOf_xsd_string">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="xsd:string[][]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="NmatType">
-    <sequence>
-     <element name="credits" nillable="true" type="xsd:string"/>
-     <element name="isModelMethodSupported" type="xsd:boolean"/>
-     <element name="model" nillable="true" type="xsd:string"/>
-     <element name="rates" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="stochMat" nillable="true" type="impl:ArrayOfArrayOf_xsd_string"/>
-     <element name="vars" nillable="true" type="impl:ArrayOf_xsd_string"/>
-    </sequence>
-   </complexType>
-   <complexType name="KmatType">
-    <sequence>
-     <element name="SSFlux" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="credits" nillable="true" type="xsd:string"/>
-     <element name="indFlux" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="isModelMethodSupported" type="xsd:boolean"/>
-     <element name="kernel" nillable="true" type="impl:ArrayOfArrayOf_xsd_string"/>
-     <element name="model" nillable="true" type="xsd:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="LmatType">
-    <sequence>
-     <element name="credits" nillable="true" type="xsd:string"/>
-     <element name="indMetabs" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="isModelMethodSupported" type="xsd:boolean"/>
-     <element name="linkMat" nillable="true" type="impl:ArrayOfArrayOf_xsd_string"/>
-     <element name="metabs" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="model" nillable="true" type="xsd:string"/>
-     <element name="moieties" nillable="true" type="impl:ArrayOf_xsd_string"/>
-    </sequence>
-   </complexType>
-   <complexType name="StStTableType">
-    <sequence>
-     <element name="credits" nillable="true" type="xsd:string"/>
-     <element name="fluxNames" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="fluxVals" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="isModelMethodSupported" type="xsd:boolean"/>
-     <element name="metabNames" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="metabVals" nillable="true" type="impl:ArrayOf_xsd_string"/>
-     <element name="model" nillable="true" type="xsd:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="TimecourseType">
-    <sequence>
-     <element name="credits" nillable="true" type="xsd:string"/>
-     <element name="isModelMethodSupported" type="xsd:boolean"/>
-     <element name="mat" nillable="true" type="impl:ArrayOfArrayOf_xsd_string"/>
-     <element name="model" nillable="true" type="xsd:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="MatrixType">
-    <sequence>
-     <element name="credits" nillable="true" type="xsd:string"/>
-     <element name="isModelMethodSupported" type="xsd:boolean"/>
-     <element name="mat" nillable="true" type="impl:ArrayOfArrayOf_xsd_string"/>
-     <element name="model" nillable="true" type="xsd:string"/>
-     <element name="numRows" type="xsd:int"/>
-     <element maxOccurs="unbounded" name="row" nillable="true" type="impl:ArrayOf_xsd_string"/>
-    </sequence>
-   </complexType>
-   <complexType name="ArrayOfArrayOfArrayOf_xsd_string">
-    <complexContent>
-     <restriction base="soapenc:Array">
-      <attribute ref="soapenc:arrayType" wsdl:arrayType="xsd:string[][][]"/>
-     </restriction>
-    </complexContent>
-   </complexType>
-   <complexType name="MCATypeString">
-    <sequence>
-     <element name="credits" nillable="true" type="xsd:string"/>
-     <element name="isModelMethodSupported" type="xsd:boolean"/>
-     <element name="mat" nillable="true" type="impl:ArrayOfArrayOfArrayOf_xsd_string"/>
-     <element name="model" nillable="true" type="xsd:string"/>
-     <element maxOccurs="unbounded" name="numCols" type="xsd:int"/>
-     <element name="numRows" type="xsd:int"/>
-     <element maxOccurs="unbounded" name="row" nillable="true" type="impl:ArrayOfArrayOf_xsd_string"/>
-    </sequence>
-   </complexType>
-  </schema>
- </wsdl:types>
-
-   <wsdl:message name="getRatesResponse">
-
-      <wsdl:part name="getRatesReturn" type="impl:VectorType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getRateEquationFormulaeRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getTimecourseRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getRateEquationsResponse">
-
-      <wsdl:part name="getRateEquationsReturn" type="impl:VectorType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllBiomodelsIdsResponse">
-
-      <wsdl:part name="getAllBiomodelsIdsReturn" type="impl:ArrayOf_xsd_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllBiomodelsIdsRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="getParamValuesResponse">
-
-      <wsdl:part name="getParamValuesReturn" type="impl:VectorType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getExtVarRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getCmatResponse">
-
-      <wsdl:part name="getCmatReturn" type="impl:MCATypeString"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getParamValuesRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getExtVarResponse">
-
-      <wsdl:part name="getExtVarReturn" type="impl:VectorType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="hasFunctionResponse">
-
-      <wsdl:part name="hasFunctionReturn" type="xsd:boolean"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getKmatRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllModelsRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="getRateEquationFormulaeResponse">
-
-      <wsdl:part name="getRateEquationFormulaeReturn" type="impl:VectorType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getEigenvRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getSteadyStateTableRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getModelInfoResponse">
-
-      <wsdl:part name="getModelInfoReturn" type="impl:ArrayOf_xsd_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getNmatRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getExternalMetabValuesResponse">
-
-      <wsdl:part name="getExternalMetabValuesReturn" type="impl:VectorType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getEmatRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getModelsByOrganismRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getModelsByOrganismResponse">
-
-      <wsdl:part name="getModelsByOrganismReturn" type="impl:ArrayOf_xsd_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getSteadyStateTableResponse">
-
-      <wsdl:part name="getSteadyStateTableReturn" type="impl:StStTableType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getJacobRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getModelsByCategoryResponse">
-
-      <wsdl:part name="getModelsByCategoryReturn" type="impl:ArrayOf_xsd_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getInitMetabValuesResponse">
-
-      <wsdl:part name="getInitMetabValuesReturn" type="impl:VectorType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getLmatRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getCmatRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getLmatResponse">
-
-      <wsdl:part name="getLmatReturn" type="impl:LmatType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="hasFunctionRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-      <wsdl:part name="in1" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getRateEquationsRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getJacobResponse">
-
-      <wsdl:part name="getJacobReturn" type="impl:MatrixType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getExternalMetabValuesRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllModelsResponse">
-
-      <wsdl:part name="getAllModelsReturn" type="impl:ArrayOf_xsd_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getNmatResponse">
-
-      <wsdl:part name="getNmatReturn" type="impl:NmatType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getInitMetabValuesRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getModelsByCategoryRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getRatesRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getKmatResponse">
-
-      <wsdl:part name="getKmatReturn" type="impl:KmatType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getEigenvResponse">
-
-      <wsdl:part name="getEigenvReturn" type="impl:VectorType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getEmatResponse">
-
-      <wsdl:part name="getEmatReturn" type="impl:MCATypeString"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getTimecourseResponse">
-
-      <wsdl:part name="getTimecourseReturn" type="impl:TimecourseType"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getModelInfoRequest">
-
-      <wsdl:part name="in0" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllBiomodelsResponse">
-
-      <wsdl:part name="getAllBiomodelsReturn" type="impl:ArrayOf_xsd_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getAllBiomodelsRequest">
-
-   </wsdl:message>
-
-   <wsdl:portType name="QueryJWS">
-
-      <wsdl:operation name="getRates" parameterOrder="in0">
-
-         <wsdl:input message="impl:getRatesRequest" name="getRatesRequest"/>
-
-         <wsdl:output message="impl:getRatesResponse" name="getRatesResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllModels">
-
-         <wsdl:input message="impl:getAllModelsRequest" name="getAllModelsRequest"/>
-
-         <wsdl:output message="impl:getAllModelsResponse" name="getAllModelsResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllBiomodels">
-
-         <wsdl:input message="impl:getAllBiomodelsRequest" name="getAllBiomodelsRequest"/>
-
-         <wsdl:output message="impl:getAllBiomodelsResponse" name="getAllBiomodelsResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllBiomodelsIds">
-
-         <wsdl:input message="impl:getAllBiomodelsIdsRequest" name="getAllBiomodelsIdsRequest"/>
-
-         <wsdl:output message="impl:getAllBiomodelsIdsResponse" name="getAllBiomodelsIdsResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getModelsByOrganism" parameterOrder="in0">
-
-         <wsdl:input message="impl:getModelsByOrganismRequest" name="getModelsByOrganismRequest"/>
-
-         <wsdl:output message="impl:getModelsByOrganismResponse" name="getModelsByOrganismResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getModelsByCategory" parameterOrder="in0">
-
-         <wsdl:input message="impl:getModelsByCategoryRequest" name="getModelsByCategoryRequest"/>
-
-         <wsdl:output message="impl:getModelsByCategoryResponse" name="getModelsByCategoryResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getModelInfo" parameterOrder="in0">
-
-         <wsdl:input message="impl:getModelInfoRequest" name="getModelInfoRequest"/>
-
-         <wsdl:output message="impl:getModelInfoResponse" name="getModelInfoResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getNmat" parameterOrder="in0">
-
-         <wsdl:input message="impl:getNmatRequest" name="getNmatRequest"/>
-
-         <wsdl:output message="impl:getNmatResponse" name="getNmatResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getKmat" parameterOrder="in0">
-
-         <wsdl:input message="impl:getKmatRequest" name="getKmatRequest"/>
-
-         <wsdl:output message="impl:getKmatResponse" name="getKmatResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getLmat" parameterOrder="in0">
-
-         <wsdl:input message="impl:getLmatRequest" name="getLmatRequest"/>
-
-         <wsdl:output message="impl:getLmatResponse" name="getLmatResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getSteadyStateTable" parameterOrder="in0">
-
-         <wsdl:input message="impl:getSteadyStateTableRequest" name="getSteadyStateTableRequest"/>
-
-         <wsdl:output message="impl:getSteadyStateTableResponse" name="getSteadyStateTableResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getTimecourse" parameterOrder="in0">
-
-         <wsdl:input message="impl:getTimecourseRequest" name="getTimecourseRequest"/>
-
-         <wsdl:output message="impl:getTimecourseResponse" name="getTimecourseResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getJacob" parameterOrder="in0">
-
-         <wsdl:input message="impl:getJacobRequest" name="getJacobRequest"/>
-
-         <wsdl:output message="impl:getJacobResponse" name="getJacobResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getEigenv" parameterOrder="in0">
-
-         <wsdl:input message="impl:getEigenvRequest" name="getEigenvRequest"/>
-
-         <wsdl:output message="impl:getEigenvResponse" name="getEigenvResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getCmat" parameterOrder="in0">
-
-         <wsdl:input message="impl:getCmatRequest" name="getCmatRequest"/>
-
-         <wsdl:output message="impl:getCmatResponse" name="getCmatResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getEmat" parameterOrder="in0">
-
-         <wsdl:input message="impl:getEmatRequest" name="getEmatRequest"/>
-
-         <wsdl:output message="impl:getEmatResponse" name="getEmatResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getRateEquations" parameterOrder="in0">
-
-         <wsdl:input message="impl:getRateEquationsRequest" name="getRateEquationsRequest"/>
-
-         <wsdl:output message="impl:getRateEquationsResponse" name="getRateEquationsResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getRateEquationFormulae" parameterOrder="in0">
-
-         <wsdl:input message="impl:getRateEquationFormulaeRequest" name="getRateEquationFormulaeRequest"/>
-
-         <wsdl:output message="impl:getRateEquationFormulaeResponse" name="getRateEquationFormulaeResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getExtVar" parameterOrder="in0">
-
-         <wsdl:input message="impl:getExtVarRequest" name="getExtVarRequest"/>
-
-         <wsdl:output message="impl:getExtVarResponse" name="getExtVarResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getExternalMetabValues" parameterOrder="in0">
-
-         <wsdl:input message="impl:getExternalMetabValuesRequest" name="getExternalMetabValuesRequest"/>
-
-         <wsdl:output message="impl:getExternalMetabValuesResponse" name="getExternalMetabValuesResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getInitMetabValues" parameterOrder="in0">
-
-         <wsdl:input message="impl:getInitMetabValuesRequest" name="getInitMetabValuesRequest"/>
-
-         <wsdl:output message="impl:getInitMetabValuesResponse" name="getInitMetabValuesResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getParamValues" parameterOrder="in0">
-
-         <wsdl:input message="impl:getParamValuesRequest" name="getParamValuesRequest"/>
-
-         <wsdl:output message="impl:getParamValuesResponse" name="getParamValuesResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="hasFunction" parameterOrder="in0 in1">
-
-         <wsdl:input message="impl:hasFunctionRequest" name="hasFunctionRequest"/>
-
-         <wsdl:output message="impl:hasFunctionResponse" name="hasFunctionResponse"/>
-
-      </wsdl:operation>
-
-   </wsdl:portType>
-
-   <wsdl:binding name="QueryJWSSoapBinding" type="impl:QueryJWS">
-
-      <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-      <wsdl:operation name="getRates">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getRatesRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getRatesResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllModels">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getAllModelsRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getAllModelsResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllBiomodels">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getAllBiomodelsRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getAllBiomodelsResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getAllBiomodelsIds">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getAllBiomodelsIdsRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getAllBiomodelsIdsResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getModelsByOrganism">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getModelsByOrganismRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getModelsByOrganismResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getModelsByCategory">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getModelsByCategoryRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getModelsByCategoryResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getModelInfo">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getModelInfoRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getModelInfoResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getNmat">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getNmatRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getNmatResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getKmat">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getKmatRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getKmatResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getLmat">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getLmatRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getLmatResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getSteadyStateTable">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getSteadyStateTableRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getSteadyStateTableResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getTimecourse">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getTimecourseRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getTimecourseResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getJacob">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getJacobRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getJacobResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getEigenv">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getEigenvRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getEigenvResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getCmat">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getCmatRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getCmatResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getEmat">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getEmatRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getEmatResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getRateEquations">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getRateEquationsRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getRateEquationsResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getRateEquationFormulae">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getRateEquationFormulaeRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getRateEquationFormulaeResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getExtVar">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getExtVarRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getExtVarResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getExternalMetabValues">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getExternalMetabValuesRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getExternalMetabValuesResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getInitMetabValues">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getInitMetabValuesRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getInitMetabValuesResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getParamValues">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getParamValuesRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getParamValuesResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="hasFunction">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="hasFunctionRequest">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="hasFunctionResponse">
-
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://jjj.biochem.sun.ac.za/qjws" use="encoded"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-   </wsdl:binding>
-
-   <wsdl:service name="QueryJWSService">
-
-      <wsdl:port binding="impl:QueryJWSSoapBinding" name="QueryJWS">
-
-         <wsdlsoap:address location="http://jjj.mib.ac.uk/axis/services/QueryJWS"/>
-
-      </wsdl:port>
-
-   </wsdl:service>
-
-</wsdl:definitions>
\ No newline at end of file


[11/28] incubator-taverna-common-activities git commit: Moved third-party test WSDLs to https://github.com/taverna-extras/wsdl-generic-test-cases

Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-ResourceLifetime.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-ResourceLifetime.wsdl b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-ResourceLifetime.wsdl
deleted file mode 100644
index 3d81ce5..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-ResourceLifetime.wsdl
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><wsdl:definitions name="WS-ResourceLifetime" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsrl="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addr
 essing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema">
-      <xsd:include schemaLocation="WS-ResourceLifetime.xsd"/>
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" schemaLocation="WS-BaseFaults.xsd"/>
-      <!--==== Resource Properties for ScheduledResourceTermination ====-->
-      <xsd:element name="ScheduledResourceTerminationRP">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="wsrl:CurrentTime"/>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="wsrl:TerminationTime"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--====== Message Types for ImmediateResourceTermination  =======-->
-      <xsd:element name="Destroy">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:element name="DestroyResponse">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:complexType name="ResourceUnknownFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResourceUnknownFault" type="wsrl:ResourceUnknownFaultType"/>
-      <xsd:complexType name="ResourceNotDestroyedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResourceNotDestroyedFault" type="wsrl:ResourceNotDestroyedFaultType"/>
-      <!--====== Message Types for ScheduledResourceTermination  =======-->
-      <xsd:element name="SetTerminationTime">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="RequestedTerminationTime" nillable="true" type="xsd:dateTime"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="SetTerminationTimeResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="NewTerminationTime" nillable="true" type="xsd:dateTime"/>
-            <xsd:element name="CurrentTime" type="xsd:dateTime"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:complexType name="UnableToSetTerminationTimeFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="UnableToSetTerminationTimeFault" type="wsrl:UnableToSetTerminationTimeFaultType"/>
-      <xsd:complexType name="TerminationTimeChangeRejectedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="TerminationTimeChangeRejectedFault" type="wsrl:TerminationTimeChangeRejectedFaultType"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="DestroyResponse">
-    <wsdl:part element="wsrl:DestroyResponse" name="DestroyResponse"/>
-  </wsdl:message>
-  <wsdl:message name="SetTerminationTimeRequest">
-    <wsdl:part element="wsrl:SetTerminationTime" name="SetTerminationTimeRequest"/>
-  </wsdl:message>
-  <wsdl:message name="ResourceUnknownFault">
-    <wsdl:part element="wsrl:ResourceUnknownFault" name="ResourceUnknownFault"/>
-  </wsdl:message>
-  <wsdl:message name="DestroyRequest">
-    <wsdl:part element="wsrl:Destroy" name="DestroyRequest"/>
-  </wsdl:message>
-  <wsdl:message name="UnableToSetTerminationTimeFault">
-    <wsdl:part element="wsrl:UnableToSetTerminationTimeFault" name="UnableToSetTerminationTimeFault"/>
-  </wsdl:message>
-  <wsdl:message name="SetTerminationTimeResponse">
-    <wsdl:part element="wsrl:SetTerminationTimeResponse" name="SetTerminationTimeResponse"/>
-  </wsdl:message>
-  <wsdl:message name="ResourceNotDestroyedFault">
-    <wsdl:part element="wsrl:ResourceNotDestroyedFault" name="ResourceNotDestroyedFault"/>
-  </wsdl:message>
-  <wsdl:message name="TerminationTimeChangeRejectedFault">
-    <wsdl:part element="wsrl:TerminationTimeChangeRejectedFault" name="TerminationTimeChangeRejectedFault"/>
-  </wsdl:message>
-  <wsdl:portType name="ScheduledResourceTermination" wsrp:ResourceProperties="wsrl:ScheduledResourceTerminationRP">
-    <wsdl:operation name="SetTerminationTime">
-      <wsdl:input message="wsrlw:SetTerminationTimeRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTime"/>
-      <wsdl:output message="wsrlw:SetTerminationTimeResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTimeResponse"/>
-      <wsdl:fault message="wsrlw:UnableToSetTerminationTimeFault" name="UnableToSetTerminationTimeFault"/>
-      <wsdl:fault message="wsrlw:ResourceUnknownFault" name="ResourceUnknownFault"/>
-      <wsdl:fault message="wsrlw:TerminationTimeChangeRejectedFault" name="TerminationTimeChangeRejectedFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="ImmediateResourceTermination">
-    <wsdl:operation name="Destroy">
-      <wsdl:input message="wsrlw:DestroyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/Destroy"/>
-      <wsdl:output message="wsrlw:DestroyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/DestroyResponse"/>
-      <wsdl:fault message="wsrlw:ResourceNotDestroyedFault" name="ResourceNotDestroyedFault"/>
-      <wsdl:fault message="wsrlw:ResourceUnknownFault" name="ResourceUnknownFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-ResourceLifetime.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-ResourceLifetime.xsd b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-ResourceLifetime.xsd
deleted file mode 100644
index a6dbef7..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-ResourceLifetime.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsrl="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd">
-  <!--=============== Resource Property Related  ===================-->
-  <!--==== Resource Properties for ScheduledResourceTermination ====-->
-  <xsd:element name="CurrentTime" type="xsd:dateTime"/>
-  <xsd:element name="TerminationTime" nillable="true" type="xsd:dateTime"/>
-  <!--============= Notification Message Related  ==================-->
-  <xsd:element name="TerminationNotification">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="TerminationTime" type="xsd:dateTime" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="TerminationReason" type="xsd:anyType" minOccurs="0" maxOccurs="1"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-ResourceProperties.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-ResourceProperties.wsdl b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-ResourceProperties.wsdl
deleted file mode 100644
index 267066a..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-ResourceProperties.wsdl
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><wsdl:definitions name="WS-ResourceProperties" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl">
-  <!--===================== Types Definitions ======================-->
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified">
-      <xsd:include schemaLocation="WS-ResourceProperties.xsd"/>
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd" schemaLocation="WS-BaseFaults.xsd"/>
-      <!--========== Message Types for GetResourceProperty  ============-->
-      <xsd:element name="GetResourceProperty" type="xsd:QName"/>
-      <xsd:element name="GetResourcePropertyResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any minOccurs="0" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:complexType name="ResourceUnknownFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="ResourceUnknownFault" type="wsrp:ResourceUnknownFaultType"/>
-      <xsd:complexType name="InvalidResourcePropertyQNameFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="InvalidResourcePropertyQNameFault" type="wsrp:InvalidResourcePropertyQNameFaultType"/>
-      <!--====== Message Types for GetMultipleResourceProperties =======-->
-      <xsd:element name="GetMultipleResourceProperties">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="ResourceProperty" type="xsd:QName" minOccurs="1" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="GetMultipleResourcePropertiesResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any minOccurs="0" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <!--========= Message Types for SetResourceProperties ===========-->
-      <xsd:complexType name="InsertType">
-        <xsd:sequence>
-          <xsd:any processContents="lax" minOccurs="1" maxOccurs="unbounded"/>
-        </xsd:sequence>
-      </xsd:complexType>
-      <xsd:element name="Insert" type="wsrp:InsertType"/>
-      <xsd:complexType name="UpdateType">
-        <xsd:sequence>
-          <xsd:any processContents="lax" minOccurs="1" maxOccurs="unbounded"/>
-        </xsd:sequence>
-      </xsd:complexType>
-      <xsd:element name="Update" type="wsrp:UpdateType"/>
-      <xsd:complexType name="DeleteType">
-        <xsd:attribute name="ResourceProperty" type="xsd:QName" use="required"/>
-      </xsd:complexType>
-      <xsd:element name="Delete" type="wsrp:DeleteType"/>
-      <xsd:element name="SetResourceProperties">
-        <xsd:complexType>
-          <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element ref="wsrp:Insert"/>
-            <xsd:element ref="wsrp:Update"/>
-            <xsd:element ref="wsrp:Delete"/>
-          </xsd:choice>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="SetResourcePropertiesResponse">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:complexType name="InvalidSetResourcePropertiesRequestContentFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="InvalidSetResourcePropertiesRequestContentFault" type="wsrp:InvalidSetResourcePropertiesRequestContentFaultType"/>
-      <xsd:complexType name="UnableToModifyResourcePropertyFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="UnableToModifyResourcePropertyFault" type="wsrp:UnableToModifyResourcePropertyFaultType"/>
-      <xsd:complexType name="SetResourcePropertyRequestFailedFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="SetResourcePropertyRequestFailedFault" type="wsrp:SetResourcePropertyRequestFailedFaultType"/>
-      <!--========= Message Types for QueryResourceProperties ==========-->
-      <xsd:element name="QueryResourceProperties">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element ref="wsrp:QueryExpression" minOccurs="1" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="QueryResourcePropertiesResponse">
-        <xsd:complexType mixed="true">
-          <xsd:sequence>
-            <xsd:any processContents="lax" minOccurs="1" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:complexType name="UnknownQueryExpressionDialectFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="UnknownQueryExpressionDialectFault" type="wsrp:UnknownQueryExpressionDialectFaultType"/>
-      <xsd:complexType name="InvalidQueryExpressionFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="InvalidQueryExpressionFault" type="wsrp:InvalidQueryExpressionFaultType"/>
-      <xsd:complexType name="QueryEvaluationErrorFaultType">
-        <xsd:complexContent>
-          <xsd:extension base="wsbf:BaseFaultType"/>
-        </xsd:complexContent>
-      </xsd:complexType>
-      <xsd:element name="QueryEvaluationErrorFault" type="wsrp:QueryEvaluationErrorFaultType"/>
-    </xsd:schema>
-  </wsdl:types>
-  <!--===================== GetResourceProperty ==================== 
-  GetResourceProperty(QName)
-  returns: any-->
-  <wsdl:message name="GetResourcePropertyRequest">
-    <wsdl:part name="GetResourcePropertyRequest" element="wsrp:GetResourceProperty"/>
-  </wsdl:message>
-  <wsdl:message name="GetResourcePropertyResponse">
-    <wsdl:part name="GetResourcePropertyResponse" element="wsrp:GetResourcePropertyResponse"/>
-  </wsdl:message>
-  <wsdl:message name="ResourceUnknownFault">
-    <part name="ResourceUnknownFault" element="wsrp:ResourceUnknownFault"/>
-  </wsdl:message>
-  <wsdl:message name="InvalidResourcePropertyQNameFault">
-    <part name="InvalidResourcePropertyQNameFault" element="wsrp:InvalidResourcePropertyQNameFault"/>
-  </wsdl:message>
-  <!--==============GetMultipleResourceProperties ================== 
-  GetMultipleResourceProperties(list of QName)
-  returns: sequence of any-->
-  <wsdl:message name="GetMultipleResourcePropertiesRequest">
-    <wsdl:part name="GetMultipleResourcePropertiesRequest" element="wsrp:GetMultipleResourceProperties"/>
-  </wsdl:message>
-  <wsdl:message name="GetMultipleResourcePropertiesResponse">
-    <wsdl:part name="GetMultipleResourcePropertiesResponse" element="wsrp:GetMultipleResourcePropertiesResponse"/>
-  </wsdl:message>
-  <!--================= SetResourceProperties ====================== 
-  SetResourceProperties(
-  { insert (any)* |
-    update (any)* |
-    delete@QName } + 
-  )
-  returns: empty-->
-  <wsdl:message name="SetResourcePropertiesRequest">
-    <wsdl:part name="SetResourcePropertiesRequest" element="wsrp:SetResourceProperties"/>
-  </wsdl:message>
-  <wsdl:message name="SetResourcePropertiesResponse">
-    <wsdl:part name="SetResourcePropertiesResponse" element="wsrp:SetResourcePropertiesResponse"/>
-  </wsdl:message>
-  <wsdl:message name="InvalidSetResourcePropertiesRequestContentFault">
-    <part name="InvalidSetResourcePropertiesRequestContentFault" element="wsrp:InvalidSetResourcePropertiesRequestContentFault"/>
-  </wsdl:message>
-  <wsdl:message name="UnableToModifyResourcePropertyFault">
-    <part name="UnableToModifyResourcePropertyFault" element="wsrp:UnableToModifyResourcePropertyFault"/>
-  </wsdl:message>
-  <wsdl:message name="SetResourcePropertyRequestFailedFault">
-    <part name="SetResourcePropertyRequestFailedFault" element="wsrp:SetResourcePropertyRequestFailedFault"/>
-  </wsdl:message>
-  <!--================ QueryResourceProperties ===================== 
-  QueryResourceProperties(QueryExpression)
-  returns: any-->
-  <wsdl:message name="QueryResourcePropertiesRequest">
-    <wsdl:part name="QueryResourcePropertiesRequest" element="wsrp:QueryResourceProperties"/>
-  </wsdl:message>
-  <wsdl:message name="QueryResourcePropertiesResponse">
-    <wsdl:part name="QueryResourcePropertiesResponse" element="wsrp:QueryResourcePropertiesResponse"/>
-  </wsdl:message>
-  <wsdl:message name="UnknownQueryExpressionDialectFault">
-    <part name="UnknownQueryExpressionDialectFault" element="wsrp:UnknownQueryExpressionDialectFault"/>
-  </wsdl:message>
-  <wsdl:message name="InvalidQueryExpressionFault">
-    <part name="InvalidQueryExpressionFault" element="wsrp:InvalidQueryExpressionFault"/>
-  </wsdl:message>
-  <wsdl:message name="QueryEvaluationErrorFault">
-    <part name="QueryEvaluationErrorFault" element="wsrp:QueryEvaluationErrorFault"/>
-  </wsdl:message>
-  <!--=================== PortType Definitions =====================-->
-  <wsdl:portType name="GetResourceProperty">
-    <wsdl:operation name="GetResourceProperty">
-      <wsdl:input name="GetResourcePropertyRequest" message="wsrpw:GetResourcePropertyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:output name="GetResourcePropertyResponse" message="wsrpw:GetResourcePropertyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourcePropertyResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="GetMultipleResourceProperties">
-    <wsdl:operation name="GetMultipleResourceProperties">
-      <wsdl:input name="GetMultipleResourcePropertiesRequest" message="wsrpw:GetMultipleResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourceProperties"/>
-      <wsdl:output name="GetMultipleResourcePropertiesResponse" message="wsrpw:GetMultipleResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourcePropertiesResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="SetResourceProperties">
-    <wsdl:operation name="SetResourceProperties">
-      <wsdl:input name="SetResourcePropertiesRequest" message="wsrpw:SetResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/SetResourceProperties"/>
-      <wsdl:output name="SetResourcePropertiesResponse" message="wsrpw:SetResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/SetResourcePropertiesResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidSetResourcePropertiesRequestContentFault" message="wsrpw:InvalidSetResourcePropertiesRequestContentFault"/>
-      <wsdl:fault name="UnableToModifyResourcePropertyFault" message="wsrpw:UnableToModifyResourcePropertyFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="SetResourcePropertyRequestFailedFault" message="wsrpw:SetResourcePropertyRequestFailedFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="QueryResourceProperties">
-    <wsdl:operation name="QueryResourceProperties">
-      <wsdl:input name="QueryResourcePropertiesRequest" message="wsrpw:QueryResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourceProperties"/>
-      <wsdl:output name="QueryResourcePropertiesResponse" message="wsrpw:QueryResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourcePropertiesResponse"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="UnknownQueryExpressionDialectFault" message="wsrpw:UnknownQueryExpressionDialectFault"/>
-      <wsdl:fault name="InvalidQueryExpressionFault" message="wsrpw:InvalidQueryExpressionFault"/>
-      <wsdl:fault name="QueryEvaluationErrorFault" message="wsrpw:QueryEvaluationErrorFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-ResourceProperties.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-ResourceProperties.xsd b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-ResourceProperties.xsd
deleted file mode 100644
index 1527149..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/WS-ResourceProperties.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
-
-OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
-
-Copyright (C) OASIS Open (2004). All Rights Reserved.
-
-This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself may not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. 
-
-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. 
-
-This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.--><xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <!--======= Global Attribute Declaration for WSDL 1.1 portType====-->
-  <xsd:attribute name="ResourceProperties" type="xsd:QName"/>
-  <!--= Notification Message for ResourceProperties value change ===-->
-  <xsd:complexType name="ResourcePropertyValueChangeNotificationType">
-    <xsd:sequence>
-      <xsd:element name="OldValue" nillable="true" minOccurs="0" maxOccurs="1">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any minOccurs="1" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="NewValue" nillable="true" minOccurs="1" maxOccurs="1">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any minOccurs="1" maxOccurs="1"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:element name="ResourcePropertyValueChangeNotification" type="wsrp:ResourcePropertyValueChangeNotificationType"/>
-  <xsd:complexType name="QueryExpressionType" mixed="true">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="1" processContents="lax"/>
-    </xsd:sequence>
-    <xsd:attribute name="Dialect" type="xsd:anyURI"/>
-  </xsd:complexType>
-  <xsd:element name="QueryExpression" type="wsrp:QueryExpressionType"/>
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/counter_bindings.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/counter_bindings.wsdl b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/counter_bindings.wsdl
deleted file mode 100644
index 8acf07f..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/counter_bindings.wsdl
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="Counter" targetNamespace="http://counter.com/bindings" xmlns:porttype="http://counter.com" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:import namespace="http://counter.com" location="counter_flattened.wsdl"/>
-  <wsdl:binding name="CounterPortTypeSOAPBinding" type="porttype:CounterPortType">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="createCounter">
-      <soap:operation soapAction="http://counter.com/CounterPortType/createCounterRequest"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="add">
-      <soap:operation soapAction="http://counter.com/CounterPortType/addRequest"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="SetTerminationTime">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTime"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="UnableToSetTerminationTimeFault">
-        <soap:fault name="UnableToSetTerminationTimeFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="TerminationTimeChangeRejectedFault">
-        <soap:fault name="TerminationTimeChangeRejectedFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="Destroy">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/Destroy"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="ResourceNotDestroyedFault">
-        <soap:fault name="ResourceNotDestroyedFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="QueryResourceProperties">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourceProperties"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault">
-        <soap:fault name="InvalidResourcePropertyQNameFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="InvalidQueryExpressionFault">
-        <soap:fault name="InvalidQueryExpressionFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="QueryEvaluationErrorFault">
-        <soap:fault name="QueryEvaluationErrorFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="UnknownQueryExpressionDialectFault">
-        <soap:fault name="UnknownQueryExpressionDialectFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="GetMultipleResourceProperties">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourceProperties"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault">
-        <soap:fault name="InvalidResourcePropertyQNameFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="GetResourceProperty">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault">
-        <soap:fault name="InvalidResourcePropertyQNameFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="Subscribe">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/Subscribe"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="TopicNotSupportedFault">
-        <soap:fault name="TopicNotSupportedFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="InvalidTopicExpressionFault">
-        <soap:fault name="InvalidTopicExpressionFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="SubscribeCreationFailedFault">
-        <soap:fault name="SubscribeCreationFailedFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="TopicPathDialectUnknownFault">
-        <soap:fault name="TopicPathDialectUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="GetCurrentMessage">
-      <soap:operation soapAction="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/GetCurrentMessage"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="TopicNotSupportedFault">
-        <soap:fault name="TopicNotSupportedFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="InvalidTopicExpressionFault">
-        <soap:fault name="InvalidTopicExpressionFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="NoCurrentMessageOnTopicFault">
-        <soap:fault name="NoCurrentMessageOnTopicFault" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="ResourceUnknownFault">
-        <soap:fault name="ResourceUnknownFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:binding>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/counter_flattened.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/counter_flattened.wsdl b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/counter_flattened.wsdl
deleted file mode 100644
index cd5de52..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/counter_flattened.wsdl
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="Counter" targetNamespace="http://counter.com" xmlns:wsrp="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd" xmlns:tns="http://counter.com" xmlns:wsrpw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsntw="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" location="WS-ResourceLifetime.wsdl"/>
-  <wsdl:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl" location="WS-ResourceProperties.wsdl"/>
-  <wsdl:import namespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.wsdl" location="WS-BaseN.wsdl"/>
-  <wsdl:types>
-    <xsd:schema elementFormDefault="qualified" targetNamespace="http://counter.com" xmlns:rpns0="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" xmlns:rpns1="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd">
-      <xsd:import namespace="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.xsd" schemaLocation="WS-ResourceLifetime.xsd"/>
-      <xsd:import namespace="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd" schemaLocation="WS-BaseN.xsd"/>
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/03/addressing" schemaLocation="WS-Addressing.xsd"/>
-      <xsd:element name="createCounter">
-        <xsd:complexType/>
-      </xsd:element>
-      <xsd:element name="createCounterResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element ref="wsa:EndpointReference"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="add" type="xsd:int"/>
-      <xsd:element name="addResponse" type="xsd:int"/>
-      <xsd:element name="Value" type="xsd:int"/>
-      <xsd:element name="CounterRP">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="tns:Value"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="1" ref="rpns0:Topic"/>
-            <xsd:element maxOccurs="unbounded" minOccurs="1" ref="rpns0:TopicExpressionDialects"/>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="rpns1:TerminationTime"/>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="rpns1:CurrentTime"/>
-            <xsd:element maxOccurs="1" minOccurs="1" ref="rpns0:FixedTopicSet"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="AddInputMessage">
-    <wsdl:part name="parameters" element="tns:add"/>
-  </wsdl:message>
-  <wsdl:message name="AddOutputMessage">
-    <wsdl:part name="parameters" element="tns:addResponse"/>
-  </wsdl:message>
-  <wsdl:message name="CreateCounterResponse">
-    <wsdl:part name="response" element="tns:createCounterResponse"/>
-  </wsdl:message>
-  <wsdl:message name="CreateCounterRequest">
-    <wsdl:part name="request" element="tns:createCounter"/>
-  </wsdl:message>
-  <wsdl:portType name="CounterPortType" wsrp:ResourceProperties="tns:CounterRP">
-    <wsdl:operation name="createCounter">
-      <wsdl:input message="tns:CreateCounterRequest"/>
-      <wsdl:output message="tns:CreateCounterResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="add">
-      <wsdl:input message="tns:AddInputMessage"/>
-      <wsdl:output message="tns:AddOutputMessage"/>
-    </wsdl:operation>
-    <wsdl:operation name="SetTerminationTime">
-      <wsdl:input message="wsrlw:SetTerminationTimeRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTime"/>
-      <wsdl:output message="wsrlw:SetTerminationTimeResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/SetTerminationTimeResponse"/>
-      <wsdl:fault name="UnableToSetTerminationTimeFault" message="wsrlw:UnableToSetTerminationTimeFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrlw:ResourceUnknownFault"/>
-      <wsdl:fault name="TerminationTimeChangeRejectedFault" message="wsrlw:TerminationTimeChangeRejectedFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="Destroy">
-      <wsdl:input message="wsrlw:DestroyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/Destroy"/>
-      <wsdl:output message="wsrlw:DestroyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime/DestroyResponse"/>
-      <wsdl:fault name="ResourceNotDestroyedFault" message="wsrlw:ResourceNotDestroyedFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrlw:ResourceUnknownFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="QueryResourceProperties">
-      <wsdl:input name="QueryResourcePropertiesRequest" message="wsrpw:QueryResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourceProperties"/>
-      <wsdl:output name="QueryResourcePropertiesResponse" message="wsrpw:QueryResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/QueryResourcePropertiesResponse"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="InvalidQueryExpressionFault" message="wsrpw:InvalidQueryExpressionFault"/>
-      <wsdl:fault name="QueryEvaluationErrorFault" message="wsrpw:QueryEvaluationErrorFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-      <wsdl:fault name="UnknownQueryExpressionDialectFault" message="wsrpw:UnknownQueryExpressionDialectFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="GetMultipleResourceProperties">
-      <wsdl:input name="GetMultipleResourcePropertiesRequest" message="wsrpw:GetMultipleResourcePropertiesRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourceProperties"/>
-      <wsdl:output name="GetMultipleResourcePropertiesResponse" message="wsrpw:GetMultipleResourcePropertiesResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetMultipleResourcePropertiesResponse"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="GetResourceProperty">
-      <wsdl:input name="GetResourcePropertyRequest" message="wsrpw:GetResourcePropertyRequest" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourceProperty"/>
-      <wsdl:output name="GetResourcePropertyResponse" message="wsrpw:GetResourcePropertyResponse" wsa:Action="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties/GetResourcePropertyResponse"/>
-      <wsdl:fault name="InvalidResourcePropertyQNameFault" message="wsrpw:InvalidResourcePropertyQNameFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsrpw:ResourceUnknownFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="Subscribe">
-      <wsdl:input message="wsntw:SubscribeRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/Subscribe"/>
-      <wsdl:output message="wsntw:SubscribeResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/SubscribeResponse"/>
-      <wsdl:fault name="TopicNotSupportedFault" message="wsntw:TopicNotSupportedFault"/>
-      <wsdl:fault name="InvalidTopicExpressionFault" message="wsntw:InvalidTopicExpressionFault"/>
-      <wsdl:fault name="SubscribeCreationFailedFault" message="wsntw:SubscribeCreationFailedFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-      <wsdl:fault name="TopicPathDialectUnknownFault" message="wsntw:TopicPathDialectUnknownFault"/>
-    </wsdl:operation>
-    <wsdl:operation name="GetCurrentMessage">
-      <wsdl:input message="wsntw:GetCurrentMessageRequest" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/GetCurrentMessage"/>
-      <wsdl:output message="wsntw:GetCurrentMessageResponse" wsa:Action="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification/GetCurrentMessageResponse"/>
-      <wsdl:fault name="TopicNotSupportedFault" message="wsntw:TopicNotSupportedFault"/>
-      <wsdl:fault name="InvalidTopicExpressionFault" message="wsntw:InvalidTopicExpressionFault"/>
-      <wsdl:fault name="NoCurrentMessageOnTopicFault" message="wsntw:NoCurrentMessageOnTopicFault"/>
-      <wsdl:fault name="ResourceUnknownFault" message="wsntw:ResourceUnknownFault"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/xml.xsd
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/xml.xsd b/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/xml.xsd
deleted file mode 100644
index 730b4c9..0000000
--- a/taverna-wsdl-generic/src/test/resources/org/apache/taverna/wsdl/parser/wsrf/counterService/xml.xsd
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xml:lang="en" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:annotation>
-    <xs:documentation>See http://www.w3.org/XML/1998/namespace.html and
-   http://www.w3.org/TR/REC-xml for information about this namespace.
-
-    This schema document describes the XML namespace, in a form
-    suitable for import by other schema documents.  
-
-    Note that local names in this namespace are intended to be defined
-    only by the World Wide Web Consortium or its subgroups.  The
-    following names are currently defined in this namespace and should
-    not be used with conflicting semantics by any Working Group,
-    specification, or document instance:
-
-    base (as an attribute name): denotes an attribute whose value
-         provides a URI to be used as the base for interpreting any
-         relative URIs in the scope of the element on which it
-         appears; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML Base specification.
-
-    lang (as an attribute name): denotes an attribute whose value
-         is a language code for the natural language of the content of
-         any element; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML specification.
-  
-    space (as an attribute name): denotes an attribute whose
-         value is a keyword indicating what whitespace processing
-         discipline is intended for the content of the element; its
-         value is inherited.  This name is reserved by virtue of its
-         definition in the XML specification.
-
-    Father (in any context at all): denotes Jon Bosak, the chair of 
-         the original XML Working Group.  This name is reserved by 
-         the following decision of the W3C XML Plenary and 
-         XML Coordination groups:
-
-             In appreciation for his vision, leadership and dedication
-             the W3C XML Plenary on this 10th day of February, 2000
-             reserves for Jon Bosak in perpetuity the XML name
-             xml:Father</xs:documentation>
-  </xs:annotation>
-  <xs:annotation>
-    <xs:documentation>This schema defines attributes and an attribute group
-        suitable for use by
-        schemas wishing to allow xml:base, xml:lang or xml:space attributes
-        on elements they define.
-
-        To enable this, such a schema must import this schema
-        for the XML namespace, e.g. as follows:
-        &lt;schema . . .>
-         . . .
-         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
-
-        Subsequently, qualified reference to any of the attributes
-        or the group defined below will have the desired effect, e.g.
-
-        &lt;type . . .>
-         . . .
-         &lt;attributeGroup ref="xml:specialAttrs"/>
- 
-         will define a type which will schema-validate an instance
-         element with any of those attributes</xs:documentation>
-  </xs:annotation>
-  <xs:annotation>
-    <xs:documentation>In keeping with the XML Schema WG's standard versioning
-   policy, this schema document will persist at
-   http://www.w3.org/2001/03/xml.xsd.
-   At the date of issue it can also be found at
-   http://www.w3.org/2001/xml.xsd.
-   The schema document at that URI may however change in the future,
-   in order to remain compatible with the latest version of XML Schema
-   itself.  In other words, if the XML Schema namespace changes, the version
-   of this document at
-   http://www.w3.org/2001/xml.xsd will change
-   accordingly; the version at
-   http://www.w3.org/2001/03/xml.xsd will not change.</xs:documentation>
-  </xs:annotation>
-  <xs:attribute name="lang" type="xs:language">
-    <xs:annotation>
-      <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
-         codes as the enumerated possible values . . .</xs:documentation>
-    </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="space" default="preserve">
-    <xs:simpleType>
-      <xs:restriction base="xs:NCName">
-        <xs:enumeration value="default"/>
-        <xs:enumeration value="preserve"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:attribute>
-  <xs:attribute name="base" type="xs:anyURI">
-    <xs:annotation>
-      <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
-                     information about this attribute.</xs:documentation>
-    </xs:annotation>
-  </xs:attribute>
-  <xs:attributeGroup name="specialAttrs">
-    <xs:attribute ref="xml:base"/>
-    <xs:attribute ref="xml:lang"/>
-    <xs:attribute ref="xml:space"/>
-  </xs:attributeGroup>
-</xs:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/CurrencyExchangeService.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/CurrencyExchangeService.wsdl b/taverna-wsdl-generic/src/test/resources/testwsdls/CurrencyExchangeService.wsdl
deleted file mode 100644
index 4206474..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/CurrencyExchangeService.wsdl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<definitions name="CurrencyExchangeService" targetNamespace="http://www.xmethods.net/sd/CurrencyExchangeService.wsdl" xmlns:tns="http://www.xmethods.net/sd/CurrencyExchangeService.wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/">
-	<message name="getRateRequest">
-		<part name="country1" type="xsd:string"/>
-		<part name="country2" type="xsd:string"/>
-	</message>
-	<message name="getRateResponse">
-		<part name="Result" type="xsd:float"/>
-	</message>
-	<portType name="CurrencyExchangePortType">
-
-		<operation name="getRate">
-			<input message="tns:getRateRequest" />
-			<output message="tns:getRateResponse" />
-		</operation>
-	</portType>
-	<binding name="CurrencyExchangeBinding" type="tns:CurrencyExchangePortType">
-		<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="getRate">
-			<soap:operation soapAction=""/>
-
-			<input >
-				<soap:body use="encoded" namespace="urn:xmethods-CurrencyExchange" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</input>
-			<output >
-				<soap:body use="encoded" namespace="urn:xmethods-CurrencyExchange" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-			</output>
-		</operation>
-	</binding>
-	<service name="CurrencyExchangeService">
-
-		<documentation>Returns the exchange rate between the two currencies</documentation>
-		<port name="CurrencyExchangePort" binding="tns:CurrencyExchangeBinding">
-			<soap:address location="http://services.xmethods.net:80/soap"/>
-		</port>
-	</service>
-</definitions>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/GoViz.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/GoViz.wsdl b/taverna-wsdl-generic/src/test/resources/testwsdls/GoViz.wsdl
deleted file mode 100644
index 57e1c06..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/GoViz.wsdl
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://www.ebi.ac.uk/collab/mygrid/service1/goviz/GoViz.jws" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://www.ebi.ac.uk/collab/mygrid/service1/goviz/GoViz.jws" xmlns:intf="http://www.ebi.ac.uk/collab/mygrid/service1/goviz/GoViz.jws" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><wsdl:types><schema targetNamespace="http://www.ebi.ac.uk/collab/mygrid/service1/goviz/GoViz.jws" xmlns="http://www.w3.org/2001/XMLSchema"><import namespace="http://schemas.xmlsoap.org/soap/encoding/"/><complexType name="ArrayOf_xsd_string"><complexContent><restriction base="soapenc:Array"><attribute ref="soapenc:arrayType" wsdl:arrayType="xsd:string[]"/></restriction></complexContent></complexType></schema></wsdl:types>
-  <wsdl:message name="clearColoursRequest">
-    <wsdl:part name="sessionID" type="xsd:string"/>
-  </wsdl:message>
-  <wsdl:message name="markTermRequest">
-    <wsdl:part name="sessionID" type="xsd:string"/>
-    <wsdl:part name="geneOntologyID" type="xsd:string"/>
-    <wsdl:part name="colour" type="xsd:string"/>
-  </wsdl:message>
-
-  <wsdl:message name="getChildrenResponse">
-    <wsdl:part name="getChildrenReturn" type="impl:ArrayOf_xsd_string"/>
-  </wsdl:message>
-  <wsdl:message name="getDotRequest">
-    <wsdl:part name="sessionID" type="xsd:string"/>
-  </wsdl:message>
-  <wsdl:message name="createSessionRequest">
-  </wsdl:message>
-  <wsdl:message name="getParentsRequest">
-
-    <wsdl:part name="geneOntologyID" type="xsd:string"/>
-  </wsdl:message>
-  <wsdl:message name="addTermRequest">
-    <wsdl:part name="sessionID" type="xsd:string"/>
-    <wsdl:part name="geneOntologyID" type="xsd:string"/>
-  </wsdl:message>
-  <wsdl:message name="clearColoursResponse">
-  </wsdl:message>
-  <wsdl:message name="createSessionResponse">
-
-    <wsdl:part name="createSessionReturn" type="xsd:string"/>
-  </wsdl:message>
-  <wsdl:message name="getAncestorsRequest">
-    <wsdl:part name="geneOntologyID" type="xsd:string"/>
-  </wsdl:message>
-  <wsdl:message name="destroySessionResponse">
-  </wsdl:message>
-  <wsdl:message name="addTermResponse">
-  </wsdl:message>
-
-  <wsdl:message name="getParentsResponse">
-    <wsdl:part name="getParentsReturn" type="impl:ArrayOf_xsd_string"/>
-  </wsdl:message>
-  <wsdl:message name="markTermResponse">
-  </wsdl:message>
-  <wsdl:message name="getDotResponse">
-    <wsdl:part name="getDotReturn" type="xsd:string"/>
-  </wsdl:message>
-  <wsdl:message name="destroySessionRequest">
-
-    <wsdl:part name="sessionID" type="xsd:string"/>
-  </wsdl:message>
-  <wsdl:message name="getChildrenRequest">
-    <wsdl:part name="geneOntologyID" type="xsd:string"/>
-  </wsdl:message>
-  <wsdl:message name="getAncestorsResponse">
-    <wsdl:part name="getAncestorsReturn" type="impl:ArrayOf_xsd_string"/>
-  </wsdl:message>
-  <wsdl:portType name="GoViz">
-
-    <wsdl:operation name="createSession">
-      <wsdl:input message="impl:createSessionRequest" name="createSessionRequest"/>
-      <wsdl:output message="impl:createSessionResponse" name="createSessionResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="destroySession" parameterOrder="sessionID">
-      <wsdl:input message="impl:destroySessionRequest" name="destroySessionRequest"/>
-      <wsdl:output message="impl:destroySessionResponse" name="destroySessionResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="getChildren" parameterOrder="geneOntologyID">
-
-      <wsdl:input message="impl:getChildrenRequest" name="getChildrenRequest"/>
-      <wsdl:output message="impl:getChildrenResponse" name="getChildrenResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="addTerm" parameterOrder="sessionID geneOntologyID">
-      <wsdl:input message="impl:addTermRequest" name="addTermRequest"/>
-      <wsdl:output message="impl:addTermResponse" name="addTermResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="clearColours" parameterOrder="sessionID">
-      <wsdl:input message="impl:clearColoursRequest" name="clearColoursRequest"/>
-
-      <wsdl:output message="impl:clearColoursResponse" name="clearColoursResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="getAncestors" parameterOrder="geneOntologyID">
-      <wsdl:input message="impl:getAncestorsRequest" name="getAncestorsRequest"/>
-      <wsdl:output message="impl:getAncestorsResponse" name="getAncestorsResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="getDot" parameterOrder="sessionID">
-      <wsdl:input message="impl:getDotRequest" name="getDotRequest"/>
-      <wsdl:output message="impl:getDotResponse" name="getDotResponse"/>
-
-    </wsdl:operation>
-    <wsdl:operation name="getParents" parameterOrder="geneOntologyID">
-      <wsdl:input message="impl:getParentsRequest" name="getParentsRequest"/>
-      <wsdl:output message="impl:getParentsResponse" name="getParentsResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="markTerm" parameterOrder="sessionID geneOntologyID colour">
-      <wsdl:input message="impl:markTermRequest" name="markTermRequest"/>
-      <wsdl:output message="impl:markTermResponse" name="markTermResponse"/>
-    </wsdl:operation>
-
-  </wsdl:portType>
-  <wsdl:binding name="GoVizSoapBinding" type="impl:GoViz">
-    <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="createSession">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="createSessionRequest">
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://DefaultNamespace" use="encoded"/>
-      </wsdl:input>
-      <wsdl:output name="createSessionResponse">
-
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.ebi.ac.uk/collab/mygrid/service1/goviz/GoViz.jws" use="encoded"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="destroySession">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="destroySessionRequest">
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://DefaultNamespace" use="encoded"/>
-      </wsdl:input>
-      <wsdl:output name="destroySessionResponse">
-
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.ebi.ac.uk/collab/mygrid/service1/goviz/GoViz.jws" use="encoded"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getChildren">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="getChildrenRequest">
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://DefaultNamespace" use="encoded"/>
-      </wsdl:input>
-      <wsdl:output name="getChildrenResponse">
-
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.ebi.ac.uk/collab/mygrid/service1/goviz/GoViz.jws" use="encoded"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="addTerm">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="addTermRequest">
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://DefaultNamespace" use="encoded"/>
-      </wsdl:input>
-      <wsdl:output name="addTermResponse">
-
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.ebi.ac.uk/collab/mygrid/service1/goviz/GoViz.jws" use="encoded"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="clearColours">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="clearColoursRequest">
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://DefaultNamespace" use="encoded"/>
-      </wsdl:input>
-      <wsdl:output name="clearColoursResponse">
-
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.ebi.ac.uk/collab/mygrid/service1/goviz/GoViz.jws" use="encoded"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getAncestors">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="getAncestorsRequest">
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://DefaultNamespace" use="encoded"/>
-      </wsdl:input>
-      <wsdl:output name="getAncestorsResponse">
-
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.ebi.ac.uk/collab/mygrid/service1/goviz/GoViz.jws" use="encoded"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getDot">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="getDotRequest">
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://DefaultNamespace" use="encoded"/>
-      </wsdl:input>
-      <wsdl:output name="getDotResponse">
-
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.ebi.ac.uk/collab/mygrid/service1/goviz/GoViz.jws" use="encoded"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="getParents">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="getParentsRequest">
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://DefaultNamespace" use="encoded"/>
-      </wsdl:input>
-      <wsdl:output name="getParentsResponse">
-
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.ebi.ac.uk/collab/mygrid/service1/goviz/GoViz.jws" use="encoded"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="markTerm">
-      <wsdlsoap:operation soapAction=""/>
-      <wsdl:input name="markTermRequest">
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://DefaultNamespace" use="encoded"/>
-      </wsdl:input>
-      <wsdl:output name="markTermResponse">
-
-        <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://www.ebi.ac.uk/collab/mygrid/service1/goviz/GoViz.jws" use="encoded"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="GoVizService">
-    <wsdl:port binding="impl:GoVizSoapBinding" name="GoViz">
-      <wsdlsoap:address location="http://www.ebi.ac.uk/collab/mygrid/service1/goviz/GoViz.jws"/>
-    </wsdl:port>
-  </wsdl:service>
-
-</wsdl:definitions>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/MyService-rpc-literal.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/MyService-rpc-literal.wsdl b/taverna-wsdl-generic/src/test/resources/testwsdls/MyService-rpc-literal.wsdl
deleted file mode 100644
index 31fe705..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/MyService-rpc-literal.wsdl
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://localhost:9090/axis/services/MyService" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://localhost:9090/axis/services/MyService" xmlns:intf="http://localhost:9090/axis/services/MyService" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-<!--WSDL created by Apache Axis version: 1.4
-Built on Apr 22, 2006 (06:55:48 PDT)-->
- <wsdl:types>
-  <schema targetNamespace="http://localhost:9090/axis/services/MyService" xmlns="http://www.w3.org/2001/XMLSchema">
-   <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-   <complexType name="Address">
-    <sequence>
-     <element name="city" nillable="true" type="xsd:string"/>
-     <element name="number" type="xsd:int"/>
-
-     <element name="road" nillable="true" type="xsd:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="Person">
-    <sequence>
-     <element name="address" nillable="true" type="impl:Address"/>
-     <element name="age" type="xsd:int"/>
-     <element name="name" nillable="true" type="xsd:string"/>
-    </sequence>
-
-   </complexType>
-   <complexType name="ArrayOf_xsd_string">
-    <sequence>
-     <element maxOccurs="unbounded" minOccurs="0" name="item" type="xsd:string"/>
-    </sequence>
-   </complexType>
-   <complexType name="ArrayOfPerson">
-    <sequence>
-     <element maxOccurs="unbounded" minOccurs="0" name="item" type="impl:Person"/>
-
-    </sequence>
-   </complexType>
-  </schema>
- </wsdl:types>
-
-   <wsdl:message name="personArrayToStringRequest">
-
-      <wsdl:part name="array" type="impl:ArrayOfPerson"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getPersonResponse">
-
-      <wsdl:part name="getPersonReturn" type="impl:Person"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="countStringArrayRequest">
-
-      <wsdl:part name="array" type="impl:ArrayOf_xsd_string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getBinaryDataRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="countBytesRequest">
-
-      <wsdl:part name="bytes" type="xsd:base64Binary"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="personToStringResponse">
-
-      <wsdl:part name="personToStringReturn" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getStringRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="getStringResponse">
-
-      <wsdl:part name="getStringReturn" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="personArrayToStringResponse">
-
-      <wsdl:part name="personArrayToStringReturn" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="countStringRequest">
-
-      <wsdl:part name="str" type="xsd:string"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="countStringResponse">
-
-      <wsdl:part name="countStringReturn" type="xsd:int"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getBinaryDataResponse">
-
-      <wsdl:part name="getBinaryDataReturn" type="xsd:base64Binary"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getPersonRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="personToStringRequest">
-
-      <wsdl:part name="p" type="impl:Person"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="countStringArrayResponse">
-
-      <wsdl:part name="countStringArrayReturn" type="xsd:int"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getStringArrayRequest">
-
-   </wsdl:message>
-
-   <wsdl:message name="countBytesResponse">
-
-      <wsdl:part name="countBytesReturn" type="xsd:int"/>
-
-   </wsdl:message>
-
-   <wsdl:message name="getStringArrayResponse">
-
-      <wsdl:part name="getStringArrayReturn" type="impl:ArrayOf_xsd_string"/>
-
-   </wsdl:message>
-
-   <wsdl:portType name="TestServices">
-
-      <wsdl:operation name="getPerson">
-
-         <wsdl:input message="impl:getPersonRequest" name="getPersonRequest"/>
-
-         <wsdl:output message="impl:getPersonResponse" name="getPersonResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="personToString" parameterOrder="p">
-
-         <wsdl:input message="impl:personToStringRequest" name="personToStringRequest"/>
-
-         <wsdl:output message="impl:personToStringResponse" name="personToStringResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countString" parameterOrder="str">
-
-         <wsdl:input message="impl:countStringRequest" name="countStringRequest"/>
-
-         <wsdl:output message="impl:countStringResponse" name="countStringResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countStringArray" parameterOrder="array">
-
-         <wsdl:input message="impl:countStringArrayRequest" name="countStringArrayRequest"/>
-
-         <wsdl:output message="impl:countStringArrayResponse" name="countStringArrayResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="personArrayToString" parameterOrder="array">
-
-         <wsdl:input message="impl:personArrayToStringRequest" name="personArrayToStringRequest"/>
-
-         <wsdl:output message="impl:personArrayToStringResponse" name="personArrayToStringResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getBinaryData">
-
-         <wsdl:input message="impl:getBinaryDataRequest" name="getBinaryDataRequest"/>
-
-         <wsdl:output message="impl:getBinaryDataResponse" name="getBinaryDataResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countBytes" parameterOrder="bytes">
-
-         <wsdl:input message="impl:countBytesRequest" name="countBytesRequest"/>
-
-         <wsdl:output message="impl:countBytesResponse" name="countBytesResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getString">
-
-         <wsdl:input message="impl:getStringRequest" name="getStringRequest"/>
-
-         <wsdl:output message="impl:getStringResponse" name="getStringResponse"/>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getStringArray">
-
-         <wsdl:input message="impl:getStringArrayRequest" name="getStringArrayRequest"/>
-
-         <wsdl:output message="impl:getStringArrayResponse" name="getStringArrayResponse"/>
-
-      </wsdl:operation>
-
-   </wsdl:portType>
-
-   <wsdl:binding name="MyServiceSoapBinding" type="impl:TestServices">
-
-      <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-      <wsdl:operation name="getPerson">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getPersonRequest">
-
-            <wsdlsoap:body namespace="http://testing.org" use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getPersonResponse">
-
-            <wsdlsoap:body namespace="http://localhost:9090/axis/services/MyService" use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="personToString">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="personToStringRequest">
-
-            <wsdlsoap:body namespace="http://testing.org" use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="personToStringResponse">
-
-            <wsdlsoap:body namespace="http://localhost:9090/axis/services/MyService" use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countString">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="countStringRequest">
-
-            <wsdlsoap:body namespace="http://testing.org" use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="countStringResponse">
-
-            <wsdlsoap:body namespace="http://localhost:9090/axis/services/MyService" use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countStringArray">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="countStringArrayRequest">
-
-            <wsdlsoap:body namespace="http://testing.org" use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="countStringArrayResponse">
-
-            <wsdlsoap:body namespace="http://localhost:9090/axis/services/MyService" use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="personArrayToString">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="personArrayToStringRequest">
-
-            <wsdlsoap:body namespace="http://testing.org" use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="personArrayToStringResponse">
-
-            <wsdlsoap:body namespace="http://localhost:9090/axis/services/MyService" use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getBinaryData">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getBinaryDataRequest">
-
-            <wsdlsoap:body namespace="http://testing.org" use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getBinaryDataResponse">
-
-            <wsdlsoap:body namespace="http://localhost:9090/axis/services/MyService" use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="countBytes">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="countBytesRequest">
-
-            <wsdlsoap:body namespace="http://testing.org" use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="countBytesResponse">
-
-            <wsdlsoap:body namespace="http://localhost:9090/axis/services/MyService" use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getString">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getStringRequest">
-
-            <wsdlsoap:body namespace="http://testing.org" use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getStringResponse">
-
-            <wsdlsoap:body namespace="http://localhost:9090/axis/services/MyService" use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-      <wsdl:operation name="getStringArray">
-
-         <wsdlsoap:operation soapAction=""/>
-
-         <wsdl:input name="getStringArrayRequest">
-
-            <wsdlsoap:body namespace="http://testing.org" use="literal"/>
-
-         </wsdl:input>
-
-         <wsdl:output name="getStringArrayResponse">
-
-            <wsdlsoap:body namespace="http://localhost:9090/axis/services/MyService" use="literal"/>
-
-         </wsdl:output>
-
-      </wsdl:operation>
-
-   </wsdl:binding>
-
-   <wsdl:service name="TestServicesService">
-
-      <wsdl:port binding="impl:MyServiceSoapBinding" name="MyService">
-
-         <wsdlsoap:address location="http://localhost:9090/axis/services/MyService"/>
-
-      </wsdl:port>
-
-   </wsdl:service>
-
-</wsdl:definitions>
\ No newline at end of file


[15/28] incubator-taverna-common-activities git commit: always make classloader

Posted by st...@apache.org.
always make classloader


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/db41b591
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/db41b591
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/db41b591

Branch: refs/heads/cwl-browse
Commit: db41b5914f5dbe6377352c4afb78fe9fa501318a
Parents: 2ab4bc4
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Apr 28 16:11:18 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Apr 28 16:11:18 2016 +0100

----------------------------------------------------------------------
 .../org/apache/taverna/wsdl/testutils/WSDLTestHelper.java    | 1 +
 .../taverna/wsdl/xmlsplitter/XMLInputSplitterTest.java       | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/db41b591/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java
index 40fd823..ee4b461 100644
--- a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java
+++ b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/testutils/WSDLTestHelper.java
@@ -96,6 +96,7 @@ public class WSDLTestHelper implements LocationConstants {
 	}
 	
 	public static String wsdlResourcePath(String resourceName) throws Exception {
+		makeClassLoader();
 		return getResource(WSDL_RESOURCE_BASE+resourceName).toExternalForm();
 	}
 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/db41b591/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/xmlsplitter/XMLInputSplitterTest.java
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/xmlsplitter/XMLInputSplitterTest.java b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/xmlsplitter/XMLInputSplitterTest.java
index 4d856eb..afba005 100644
--- a/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/xmlsplitter/XMLInputSplitterTest.java
+++ b/taverna-wsdl-generic/src/test/java/org/apache/taverna/wsdl/xmlsplitter/XMLInputSplitterTest.java
@@ -32,11 +32,11 @@ import org.apache.taverna.wsdl.testutils.WSDLTestHelper;
 
 import org.junit.Test;
 
-public class XMLInputSplitterTest implements LocationConstants {
+public class XMLInputSplitterTest extends WSDLTestHelper {
 
 	@Test
 	public void testExecute() throws Exception {
-		WSDLParser parser = new WSDLParser(WSDLTestHelper.wsdlResourcePath("eutils/eutils_lite.wsdl"));
+		WSDLParser parser = new WSDLParser(wsdlResourcePath("eutils/eutils_lite.wsdl"));
 		TypeDescriptor descriptor = parser.getOperationInputParameters("run_eInfo").get(0);
 		XMLInputSplitter splitter = new XMLInputSplitter(descriptor,new String[]{"db","tool","email"},new String[]{"text/plain","text/plain","text/plain"},new String[]{"output"});
 		Map<String,Object> inputMap = new HashMap<String, Object>();
@@ -54,7 +54,7 @@ public class XMLInputSplitterTest implements LocationConstants {
 	
 	@Test
 	public void testOptional() throws Exception {
-		WSDLParser parser = new WSDLParser(WSDLTestHelper.wsdlResourcePath("VSOi.wsdl"));
+		WSDLParser parser = new WSDLParser(wsdlResourcePath("VSOi.wsdl"));
 		TypeDescriptor descriptor = parser.getOperationInputParameters("Query").get(0);
 		XMLInputSplitter splitter = new XMLInputSplitter(descriptor,new String[]{"version","block"},new String[]{"text/plain","text/plain"},new String[]{"output"});
 		Map<String,Object> inputMap = new HashMap<String, Object>();
@@ -71,7 +71,7 @@ public class XMLInputSplitterTest implements LocationConstants {
 	
 	@Test
 	public void testNillable() throws Exception {
-		WSDLParser parser = new WSDLParser(WSDLTestHelper.wsdlResourcePath("VSOi.wsdl"));
+		WSDLParser parser = new WSDLParser(wsdlResourcePath("VSOi.wsdl"));
 		TypeDescriptor descriptor = parser.getOperationInputParameters("Query").get(0);
 		XMLInputSplitter splitter = new XMLInputSplitter(descriptor,new String[]{"version","block"},new String[]{"text/plain","text/plain"},new String[]{"output"});
 		Map<String,Object> inputMap = new HashMap<String, Object>();


[03/28] incubator-taverna-common-activities git commit: Moved third-party test WSDLs to https://github.com/taverna-extras/wsdl-generic-test-cases

Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/prodoric.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/prodoric.wsdl b/taverna-wsdl-generic/src/test/resources/testwsdls/prodoric.wsdl
deleted file mode 100644
index bd1ce36..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/prodoric.wsdl
+++ /dev/null
@@ -1,360 +0,0 @@
-<?xml version ='1.0' encoding ='UTF-8' ?> 
-<definitions name='prodoric_ws' 
-  targetNamespace='ws.prodoric' 
-  xmlns:tns='ws.prodoric' 
-  xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' 
-  xmlns:xsd='http://www.w3.org/2001/XMLSchema' 
-  xmlns:soapenc='http://schemas.xmlsoap.org/soap/encoding/' 
-  xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/' 
-  xmlns='http://schemas.xmlsoap.org/wsdl/'> 
-
-<wsdl:types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap"
-xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-targetNamespace="ws.prodoric">
-
-<xsd:element name="ProteinAccString"  type="xsd:string"/>
-<xsd:element name="HelloStringIn"     type="xsd:string"/>
-<xsd:element name="HelloStringOut"    type="xsd:string"/>
-<xsd:element name="ProfileAcc"        type="xsd:string"/>
-
-<xsd:element name="OperonParams"             type="tns:ParamsType"/>
-<xsd:element name="RegulatorParams"          type="tns:ParamsType"/>
-<xsd:element name="ProfileParameterParams"   type="tns:ParamsType"/>
-<xsd:element name="ExpressionFromGeneParams" type="tns:ParamsType"/>
-<xsd:element name="GenomeParams"             type="tns:ParamsType"/>
-  <xsd:complexType name="ParamsType">
-
-    <xsd:sequence>
-      <xsd:element name="idtype" type="xsd:string"/>
-      <xsd:element name="id"     type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<xsd:element name="UniprotAccArray" type="tns:StringArrayType"/>
-<xsd:complexType name="StringArrayType">
-  <xsd:sequence>
-   <xsd:element name="str" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:element name="ArrayOfOperonResult" type="tns:OperonResultArrayType"/>
-<xsd:complexType name="OperonResultArrayType">
-  <xsd:sequence>
-   <xsd:element name="OperonResult" type="tns:OperonResultType" minOccurs="0" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
-<xsd:complexType name="OperonResultType">
-  <xsd:sequence>
-    <xsd:element name="gene_acc"    type="xsd:string"/>
-
-    <xsd:element name="short_name"  type="xsd:string"/>
-    <xsd:element name="gene_name"   type="xsd:string"/>
-    <xsd:element name="orf_id"      type="xsd:string"/>
-    <xsd:element name="operon_acc"  type="xsd:string"/>
-    <xsd:element name="operon_name" type="xsd:string"/>
-    <xsd:element name="references"  type="xsd:string"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:element name="ArrayOfRegulatorResult" type="tns:RegulatorResultArrayType"/>
-
-<xsd:complexType name="RegulatorResultArrayType">
-  <xsd:sequence>
-   <xsd:element name="RegulatorResult" type="tns:RegulatorResultType" minOccurs="0" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
-<xsd:complexType name="RegulatorResultType">
-  <xsd:sequence>
-    <xsd:element name="protein_acc"    type="xsd:string"/>
-    <xsd:element name="short_name"     type="xsd:string"/>
-    <xsd:element name="protein_name"   type="xsd:string"/>
-
-    <xsd:element name="orf_id"         type="xsd:string"/>
-    <xsd:element name="mode_of_action" type="xsd:string"/>
-    <xsd:element name="promoter_acc"   type="xsd:string"/>
-    <xsd:element name="promoter_name"  type="xsd:string"/>
-    <xsd:element name="site_acc"       type="xsd:string"/>
-    <xsd:element name="site_name"      type="xsd:string"/>
-    <xsd:element name="sequence"       type="xsd:string"/>
-    <xsd:element name="references"     type="xsd:string"/>
-  </xsd:sequence>
-
-</xsd:complexType>
-
-<xsd:element name="ArrayOfProfileParameterResult" type="tns:ProfileParameterResultArrayType"/>
-<xsd:complexType name="ProfileParameterResultArrayType">
-  <xsd:sequence>
-   <xsd:element name="ProfileParameterResult" type="tns:ProfileParameterResultType" minOccurs="0" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
-<xsd:complexType name="ProfileParameterResultType">
-  <xsd:sequence>
-    <xsd:element name="profile_acc" type="xsd:string"/>
-    <xsd:element name="description" type="xsd:string"/>
-
-    <xsd:element name="condition"   type="xsd:string"/>
-    <xsd:element name="details"     type="xsd:string"/>
-    <xsd:element name="genome_acc"  type="xsd:string"/>
-    <xsd:element name="genome"      type="xsd:string"/>
-    <xsd:element name="references"  type="xsd:string"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:element name="ArrayOfProfileResult" type="tns:ProfileResultArrayType"/>
-<xsd:complexType name="ProfileResultArrayType">
-  <xsd:sequence>
-
-   <xsd:element name="ProfileResult" type="tns:ProfileResultType" minOccurs="0" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
-<xsd:complexType name="ProfileResultType">
-  <xsd:sequence>
-    <xsd:element name="gene_acc"    type="xsd:string"/>
-    <xsd:element name="orf_id"      type="xsd:string"/>
-    <xsd:element name="short_name"  type="xsd:string"/>
-    <xsd:element name="gene_name"   type="xsd:string"/>
-    <xsd:element name="regulation"  type="xsd:string"/>
-
-    <xsd:element name="fold_change" type="xsd:string"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:element name="ArrayOfExpressionFromGene" type="tns:ExpressionFromGeneArrayType"/>
-<xsd:complexType name="ExpressionFromGeneArrayType">
-  <xsd:sequence>
-   <xsd:element name="ExpressionFromGene" type="tns:ExpressionFromGeneType" minOccurs="0" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
-<xsd:complexType name="ExpressionFromGeneType">
-  <xsd:sequence>
-
-    <xsd:element name="profile_acc" type="xsd:string"/>
-    <xsd:element name="description" type="xsd:string"/>
-    <xsd:element name="condition"   type="xsd:string"/>
-    <xsd:element name="regulation"  type="xsd:string"/>
-    <xsd:element name="fold_change" type="xsd:string"/>
-    <xsd:element name="references"  type="xsd:string"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:element name="ArrayOfGenomeResult" type="tns:GenomeResultArrayType"/>
-
-<xsd:complexType name="GenomeResultArrayType">
-  <xsd:sequence>
-   <xsd:element name="GenomeResult" type="tns:GenomeResultType" minOccurs="0" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
-<xsd:complexType name="GenomeResultType">
-  <xsd:sequence>
-    <xsd:element name="genome_acc"   type="xsd:string"/>
-    <xsd:element name="genome_name"  type="xsd:string"/>
-  </xsd:sequence>
-
-</xsd:complexType>
-
-</xsd:schema>
-
-</wsdl:types>
-
-<message name='getOperonRequest'>
-  <part name='params' element='tns:OperonParams'/>
-</message>
-<message name='getOperonResponse'> 
-  <part name='return' element='tns:ArrayOfOperonResult'/> 
-</message> 
-
-<message name='getRegulatorsFromGeneRequest'>
-  <part name='params' element='tns:RegulatorParams'/>
-</message>
-
-<message name='getRegulatorsFromGeneResponse'> 
-  <part name='return' element='tns:ArrayOfRegulatorResult'/> 
-</message>
-
-<message name='getProfileParameterRequest'>
-  <part name='params' element='tns:ProfileParameterParams'/>
-</message>
-<message name='getProfileParameterResponse'> 
-  <part name='return' element='tns:ArrayOfProfileParameterResult'/> 
-</message>
-
-<message name='getProfileRequest'>
-  <part name='params' element='tns:ProfileAcc'/>
-</message>
-<message name='getProfileResponse'> 
-  <part name='return' element='tns:ArrayOfProfileResult'/> 
-
-</message>
-
-<message name='getExpressionFromGeneRequest'>
-  <part name='params' element='tns:ExpressionFromGeneParams'/>
-</message>
-<message name='getExpressionFromGeneResponse'> 
-  <part name='return' element='tns:ArrayOfExpressionFromGene'/> 
-</message>
-
-<message name='getGenomeRequest'>
-  <part name='params' element='tns:GenomeParams'/> 
-</message>
-<message name='getGenomeResponse'>
-  <part name='return' element='tns:ArrayOfGenomeResult'/> 
-
-</message> 
-
-<message name='getUniProtAccRequest'> 
-  <part name='protein_acc' element='tns:ProteinAccString'/> 
-</message>
-<message name='getUniProtAccResponse'> 
-  <part name='uniprot_acc' element='tns:UniprotAccArray'/> 
-</message> 
-
-<message name='helloRequest'> 
-  <part name='input'  element='tns:HelloStringIn'/> 
-</message>
-<message name='helloResponse'> 
-  <part name='return' element='tns:HelloStringOut'/> 
-</message>
-
-
-<portType name='prodoricPortType'> 
-
-  <operation name='getOperon'> 
-    <input  message='tns:getOperonRequest'/> 
-    <output message='tns:getOperonResponse'/> 
-  </operation>
-
-  <operation name='getRegulatorsFromGene'> 
-    <input  message='tns:getRegulatorsFromGeneRequest'/> 
-    <output message='tns:getRegulatorsFromGeneResponse'/> 
-  </operation>
-
-  <operation name='getProfileParameter'> 
-    <input  message='tns:getProfileParameterRequest'/> 
-    <output message='tns:getProfileParameterResponse'/> 
-  </operation>
-
-  <operation name='getProfile'> 
-    <input  message='tns:getProfileRequest'/> 
-    <output message='tns:getProfileResponse'/> 
-  </operation>
-
-  <operation name='getExpressionFromGene'> 
-    <input  message='tns:getExpressionFromGeneRequest'/> 
-    <output message='tns:getExpressionFromGeneResponse'/> 
-  </operation>
-
-  <operation name='getGenome'>
-    <input  message='tns:getGenomeRequest'/> 
-    <output message='tns:getGenomeResponse'/> 
-  </operation> 
-
-  <operation name='getUniProtAcc'> 
-    <input  message='tns:getUniProtAccRequest'/> 
-    <output message='tns:getUniProtAccResponse'/> 
-  </operation> 
-
-  <operation name='hello'> 
-    <input  message='tns:helloRequest'/> 
-    <output message='tns:helloResponse'/> 
-  </operation>
-
-</portType> 
-
-
-<binding name='prodoricBinding' type='tns:prodoricPortType'> 
-  <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> 
-
-  <operation name='getOperon'> 
-    <soap:operation soapAction='ws.prodoric#getOperon'/> 
-    <input> 
-      <soap:body use='literal' namespace='ws.prodoric' /> 
-    </input> 
-    <output> 
-      <soap:body use='literal' namespace='ws.prodoric' /> 
-    </output> 
-  </operation>
-
-  <operation name='getRegulatorsFromGene'> 
-    <soap:operation soapAction='ws.prodoric#getRegulatorsFromGene'/> 
-    <input> 
-      <soap:body use='literal' namespace='ws.prodoric' /> 
-    </input> 
-    <output> 
-      <soap:body use='literal' namespace='ws.prodoric' /> 
-    </output> 
-  </operation>
-
-  <operation name='getProfileParameter'> 
-    <soap:operation soapAction='ws.prodoric#getProfileParameter'/> 
-    <input> 
-      <soap:body use='literal' namespace='ws.prodoric' /> 
-    </input> 
-    <output> 
-      <soap:body use='literal' namespace='ws.prodoric' /> 
-    </output> 
-  </operation>
-
-  <operation name='getProfile'> 
-    <soap:operation soapAction='ws.prodoric#getProfile'/> 
-    <input> 
-      <soap:body use='literal' namespace='ws.prodoric' /> 
-    </input> 
-    <output> 
-      <soap:body use='literal' namespace='ws.prodoric' /> 
-    </output> 
-  </operation>
-
-  
-    <operation name='getExpressionFromGene'> 
-    <soap:operation soapAction='ws.prodoric#getExpressionFromGene'/> 
-    <input> 
-      <soap:body use='literal' namespace='ws.prodoric' /> 
-    </input> 
-    <output> 
-      <soap:body use='literal' namespace='ws.prodoric' /> 
-    </output> 
-  </operation>
-  
-
-  <operation name='getGenome'> 
-    <soap:operation soapAction='ws.prodoric#getGenome'/> 
-    <input> 
-      <soap:body use='literal' namespace='ws.prodoric' /> 
-    </input> 
-    <output> 
-      <soap:body use='literal' namespace='ws.prodoric' /> 
-    </output> 
-  </operation> 
-
-  <operation name='getUniProtAcc'> 
-    <soap:operation soapAction='ws.prodoric#getUniProtAcc'/> 
-    <input> 
-      <soap:body use='literal' namespace='ws.prodoric' /> 
-    </input> 
-    <output> 
-      <soap:body use='literal' namespace='ws.prodoric' /> 
-    </output> 
-  </operation>
-
-  <operation name='hello'> 
-    <soap:operation soapAction='ws.prodoric#hello'/> 
-    <input> 
-      <soap:body use='literal' namespace='ws.prodoric' /> 
-    </input> 
-    <output> 
-      <soap:body use='literal' namespace='ws.prodoric' /> 
-    </output> 
-  </operation>
-
-</binding> 
-
-
-<service name='prodoric_webservice'> 
-  <port name='prodoricPort' binding='tns:prodoricBinding'> 
-    <soap:address location='http://134.169.104.13/webservice/prodoric_server.php'/> 
-  </port> 
-
-</service>
-</definitions>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b29c0312/taverna-wsdl-generic/src/test/resources/testwsdls/whatizit.wsdl
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/src/test/resources/testwsdls/whatizit.wsdl b/taverna-wsdl-generic/src/test/resources/testwsdls/whatizit.wsdl
deleted file mode 100644
index b3016fa..0000000
--- a/taverna-wsdl-generic/src/test/resources/testwsdls/whatizit.wsdl
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns:tns="http://www.ebi.ac.uk/webservices/whatizit/ws" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://www.ebi.ac.uk/webservices/whatizit/ws" name="whatizit">
-
-  <types>
-    <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ebi.ac.uk/webservices/whatizit/ws" version="1.0">
-
-    <xs:element xmlns:ns1="http://www.ebi.ac.uk/webservices/whatizit/ws" type="ns1:search" name="search"/>
-    <xs:complexType name="search">
-      <xs:sequence>
-        <xs:element type="xs:string" minOccurs="0" name="pipelineName"/>
-        <xs:element type="xs:string" minOccurs="0" name="query"/>
-
-        <xs:element name="limit">      
-          <xs:simpleType>
-            <xs:restriction base="xs:int">
-              <xs:minInclusive value="0"/>
-              <xs:maxExclusive value="10000"/>
-            </xs:restriction>
-          </xs:simpleType>
-        </xs:element>      
-      </xs:sequence>
-    </xs:complexType>
-
-    <xs:element xmlns:ns2="http://www.ebi.ac.uk/webservices/whatizit/ws" type="ns2:searchResponse" name="searchResponse"/>
-    <xs:complexType name="searchResponse">
-      <xs:sequence>
-        <xs:element type="xs:string" minOccurs="0" name="return"/>
-      </xs:sequence>
-    </xs:complexType>
-    
-    <xs:element xmlns:ns3="http://www.ebi.ac.uk/webservices/whatizit/ws" type="ns3:WhatizitException" name="WhatizitException"/>
-    <xs:complexType name="WhatizitException">
-
-      <xs:sequence>
-        <xs:element type="xs:string" minOccurs="0" name="message"/>
-      </xs:sequence>
-    </xs:complexType>
-
-    <xs:element xmlns:ns4="http://www.ebi.ac.uk/webservices/whatizit/ws" type="ns4:contact" name="contact"/>
-    <xs:complexType name="contact">
-      <xs:sequence>
-        <xs:element type="xs:string" minOccurs="0" name="pipelineName"/>
-
-        <xs:element type="xs:string" minOccurs="0" name="text"/>
-        <xs:element type="xs:boolean" name="convertToHtml"/>
-      </xs:sequence>
-    </xs:complexType>
-
-    <xs:element xmlns:ns5="http://www.ebi.ac.uk/webservices/whatizit/ws" type="ns5:contactResponse" name="contactResponse"/>
-    <xs:complexType name="contactResponse">
-      <xs:sequence>
-        <xs:element type="xs:string" minOccurs="0" name="return"/>
-
-      </xs:sequence>
-    </xs:complexType>
-
-    <xs:element xmlns:ns6="http://www.ebi.ac.uk/webservices/whatizit/ws" type="ns6:queryPmid" name="queryPmid"/>
-    <xs:complexType name="queryPmid">
-      <xs:sequence>
-        <xs:element type="xs:string" minOccurs="0" name="pipelineName"/>
-        <xs:element type="xs:string" minOccurs="0" name="pmid"/>
-      </xs:sequence>
-
-    </xs:complexType>
-
-    <xs:element xmlns:ns7="http://www.ebi.ac.uk/webservices/whatizit/ws" type="ns7:queryPmidResponse" name="queryPmidResponse"/>
-    <xs:complexType name="queryPmidResponse">
-      <xs:sequence>
-        <xs:element type="xs:string" minOccurs="0" name="return"/>
-      </xs:sequence>
-    </xs:complexType>
-
-    <xs:element xmlns:ns8="http://www.ebi.ac.uk/webservices/whatizit/ws" type="ns8:getPipelinesStatus" name="getPipelinesStatus"/>
-
-    <xs:complexType name="getPipelinesStatus"/>
-
-    <xs:element xmlns:ns9="http://www.ebi.ac.uk/webservices/whatizit/ws" type="ns9:getPipelinesStatusResponse" name="getPipelinesStatusResponse"/>
-    <xs:complexType name="getPipelinesStatusResponse">
-      <xs:sequence>
-        <xs:element xmlns:ns10="http://www.ebi.ac.uk/webservices/whatizit/ws" type="ns10:selectItem" minOccurs="0" name="return" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="selectItem">
-
-      <xs:sequence>
-        <xs:element type="xs:string" minOccurs="0" name="description"/>
-        <xs:element type="xs:boolean" name="disabled"/>
-        <xs:element type="xs:string" minOccurs="0" name="label"/>
-        <xs:element type="xs:anyType" minOccurs="0" name="value"/>
-      </xs:sequence>
-    </xs:complexType>
-    </xs:schema>  
-  </types>
-
-  
-  
-  <message name="contact">
-    <part element="tns:contact" name="parameters"/>
-  </message>
-  
-  <message name="contactResponse">
-    <part element="tns:contactResponse" name="parameters"/>
-  </message>
-
-  <message name="WhatizitException">
-    <part element="tns:WhatizitException" name="fault"/>
-
-  </message>
-  
-  <message name="getPipelinesStatus">
-    <part element="tns:getPipelinesStatus" name="parameters"/>
-  </message>
-  
-  <message name="getPipelinesStatusResponse">
-    <part element="tns:getPipelinesStatusResponse" name="parameters"/>
-  </message>
-  
-  <message name="queryPmid">
-    <part element="tns:queryPmid" name="parameters"/>
-
-  </message>
-  
-  <message name="queryPmidResponse">
-    <part element="tns:queryPmidResponse" name="parameters"/>
-  </message>
-  
-  <message name="search">
-    <part element="tns:search" name="parameters"/>
-  </message>
-  
-  <message name="searchResponse">
-    <part element="tns:searchResponse" name="parameters"/>
-
-  </message>
-  
-  
-  <portType name="whatizit">
-    <operation name="contact">
-      <input message="tns:contact"/>
-      <output message="tns:contactResponse"/>
-      <fault message="tns:WhatizitException" name="WhatizitException"/>
-    </operation>
-    <operation name="getPipelinesStatus">
-      <input message="tns:getPipelinesStatus"/>
-
-      <output message="tns:getPipelinesStatusResponse"/>
-      <fault message="tns:WhatizitException" name="WhatizitException"/>
-    </operation>
-    <operation name="queryPmid">
-      <input message="tns:queryPmid"/>
-      <output message="tns:queryPmidResponse"/>
-      <fault message="tns:WhatizitException" name="WhatizitException"/>
-    </operation>
-    <operation name="search">
-
-      <input message="tns:search"/>
-      <output message="tns:searchResponse"/>
-      <fault message="tns:WhatizitException" name="WhatizitException"/>
-    </operation>
-  </portType>
-  
-  <binding type="tns:whatizit" name="pipelineBinding">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="contact">
-      <soap:operation soapAction=""/>
-
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="WhatizitException">
-        <soap:fault use="literal" name="WhatizitException"/>
-      </fault>
-
-    </operation>
-    <operation name="getPipelinesStatus">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-
-      <fault name="WhatizitException">
-        <soap:fault use="literal" name="WhatizitException"/>
-      </fault>
-    </operation>
-    <operation name="queryPmid">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="WhatizitException">
-        <soap:fault use="literal" name="WhatizitException"/>
-      </fault>
-    </operation>
-    <operation name="search">
-      <soap:operation soapAction=""/>
-
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <mime:multipartRelated>
-        <mime:part>
-           <soap:body parts="" use="literal"/>
-        </mime:part>
-         <mime:part>
-
-          <mime:content type="text/xml" part="parameters"/>
-         </mime:part>
-       </mime:multipartRelated>
-	  </output>
-      <fault name="WhatizitException">
-        <soap:fault use="literal" name="WhatizitException"/>
-      </fault>
-    </operation>
-  </binding>
-
-  <service name="whatizit">
-    <port binding="tns:pipelineBinding" name="pipeline">
-      <soap:address location="http://www.ebi.ac.uk:80/webservices/whatizit/ws"/>
-    </port>
-  </service>
-</definitions>
\ No newline at end of file