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 2015/02/17 12:36:45 UTC

[25/70] [abbrv] incubator-taverna-common-activities git commit: taverna-wsdl-generic/

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c8b66752/src/test/java/net/sf/taverna/wsdl/xmlsplitter/XMLOutputSplitterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/net/sf/taverna/wsdl/xmlsplitter/XMLOutputSplitterTest.java b/src/test/java/net/sf/taverna/wsdl/xmlsplitter/XMLOutputSplitterTest.java
deleted file mode 100644
index 1a3dd1c..0000000
--- a/src/test/java/net/sf/taverna/wsdl/xmlsplitter/XMLOutputSplitterTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package net.sf.taverna.wsdl.xmlsplitter;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import net.sf.taverna.wsdl.parser.TypeDescriptor;
-import net.sf.taverna.wsdl.parser.WSDLParser;
-import net.sf.taverna.wsdl.testutils.WSDLTestHelper;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-/**
- *
- * @author sowen
- */
-public class XMLOutputSplitterTest extends WSDLTestHelper {
-
-    @Test
-	public void testRPCComplexWithInternalList() throws Exception {
-            
-        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");
-        Map<String,String> inputMap = new HashMap<String,String>();
-        inputMap.put("input", inputXML);
-        Map<String,Object> outputMap = splitter.execute(inputMap);
-        assertNotNull(outputMap.get("length"));
-        assertNotNull(outputMap.get("innerList"));
-        assertNotNull(outputMap.get("innerArray"));
-
-        assertEquals("4",outputMap.get("length"));
-
-        List<String> array = ( List<String> )outputMap.get("innerArray");
-		assertEquals(4,array.size());
-		assertEquals("String A",array.get(0));
-		assertEquals("String B",array.get(1));
-		assertEquals("String C",array.get(2));
-		assertEquals("String D",array.get(3));
-
-        array = ( List<String> )outputMap.get("innerList");
-		assertEquals(4,array.size());
-		assertEquals("String A",array.get(0));
-		assertEquals("String B",array.get(1));
-		assertEquals("String C",array.get(2));
-		assertEquals("String D",array.get(3));
-    }
-
-    @Test
-    public void testWrappedArrayDefinedWithRestriction() throws Exception {
-        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");
-
-        Map<String,String> inputMap = new HashMap<String,String>();
-        inputMap.put("input", inputXML);
-        Map<String,Object> outputMap = splitter.execute(inputMap);
-
-        assertNotNull(outputMap.get("model"));
-        assertNotNull(outputMap.get("fluxNames"));
-        assertNotNull(outputMap.get("fluxVals"));
-
-        assertEquals("teusink",outputMap.get("model"));
-        List<String> array = ( List<String> )outputMap.get("fluxNames");
-        assertEquals(17,array.size());
-        assert(array.contains("v[G3PDH]"));
-
-        array = ( List<String> )outputMap.get("fluxVals");
-        assertEquals(17,array.size());
-        assert(array.contains("88.15049285974906"));
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c8b66752/src/test/java/net/sf/taverna/wsdl/xmlsplitter/XMLSplitterSerialisationHelperTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/net/sf/taverna/wsdl/xmlsplitter/XMLSplitterSerialisationHelperTest.java b/src/test/java/net/sf/taverna/wsdl/xmlsplitter/XMLSplitterSerialisationHelperTest.java
deleted file mode 100644
index 8abdf0e..0000000
--- a/src/test/java/net/sf/taverna/wsdl/xmlsplitter/XMLSplitterSerialisationHelperTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester   
- * 
- *  Modifications to the initial code base are copyright of their
- *  respective authors, or their employers as appropriate.
- * 
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *    
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *    
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.wsdl.xmlsplitter;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.StringReader;
-import java.util.List;
-
-import net.sf.taverna.wsdl.parser.ComplexTypeDescriptor;
-import net.sf.taverna.wsdl.parser.TypeDescriptor;
-
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.XMLOutputter;
-import org.junit.Test;
-
-public class XMLSplitterSerialisationHelperTest {
-
-
-    @Test
-	public void testCyclicToElement() throws Exception {
-		ComplexTypeDescriptor a = new ComplexTypeDescriptor();
-		a.setName("a");
-		a.setType("typename");
-		a.setQnameFromString("{namespace}typename");
-
-		ComplexTypeDescriptor b = new ComplexTypeDescriptor();
-		b.setName("b");
-		b.setType("typename2");
-		b.setQnameFromString("{namespace}typename2");
-
-		a.getElements().add(b);
-
-		b.getElements().add(a);
-
-		Element el = XMLSplitterSerialisationHelper
-				.typeDescriptorToExtensionXML(a);
-
-		String xml = new XMLOutputter().outputString(el);
-
-		assertEquals(
-				"unexpected xml",
-				"<s:extensions xmlns:s=\"http://org.embl.ebi.escience/xscufl/0.1alpha\"><s:complextype optional=\"false\" unbounded=\"false\" typename=\"typename\" name=\"a\" qname=\"{namespace}typename\"><s:elements><s:complextype optional=\"false\" unbounded=\"false\" typename=\"typename2\" name=\"b\" qname=\"{namespace}typename2\"><s:elements><s:complextype id=\"{namespace}typename\" optional=\"false\" unbounded=\"false\" typename=\"typename\" name=\"a\" /></s:elements></s:complextype></s:elements></s:complextype></s:extensions>",
-				xml);
-
-	}
-
-    @Test
-	public void testCyclicToElement2() throws Exception {
-		ComplexTypeDescriptor a = new ComplexTypeDescriptor();
-		a.setName("a");
-		a.setType("typename");
-		a.setQnameFromString("{namespace}typename");
-
-		a.getElements().add(a);
-
-		Element el = XMLSplitterSerialisationHelper
-				.typeDescriptorToExtensionXML(a);
-
-		String xml = new XMLOutputter().outputString(el);
-
-		assertEquals(
-				"unexpected xml",
-				"<s:extensions xmlns:s=\"http://org.embl.ebi.escience/xscufl/0.1alpha\"><s:complextype optional=\"false\" unbounded=\"false\" typename=\"typename\" name=\"a\" qname=\"{namespace}typename\"><s:elements><s:complextype id=\"{namespace}typename\" optional=\"false\" unbounded=\"false\" typename=\"typename\" name=\"a\" /></s:elements></s:complextype></s:extensions>",
-				xml);
-	}
-
-    @Test
-	public void testCyclicFromElement() throws Exception {
-		String xml = "<s:extensions xmlns:s=\"http://org.embl.ebi.escience/xscufl/0.1alpha\"><s:complextype optional=\"false\" unbounded=\"false\" typename=\"typename\" name=\"a\" qname=\"{namespace}typename\"><s:elements><s:complextype id=\"{namespace}typename\" /></s:elements></s:complextype></s:extensions>";
-		Element el = new SAXBuilder().build(new StringReader(xml))
-				.getRootElement();
-
-		TypeDescriptor a = XMLSplitterSerialisationHelper
-				.extensionXMLToTypeDescriptor(el);
-
-		assertTrue("wrong type", a instanceof ComplexTypeDescriptor);
-		assertEquals("wrong name", "a", a.getName());
-
-		List<TypeDescriptor> a_elements = ((ComplexTypeDescriptor) a).getElements();
-
-		assertEquals("should be only 1 element", 1, a_elements.size());
-
-		TypeDescriptor b = a_elements.get(0);
-
-		assertTrue("wrong type", b instanceof ComplexTypeDescriptor);
-
-		List<TypeDescriptor> b_elements = ((ComplexTypeDescriptor) b).getElements();
-
-		assertEquals("should be only 1 element", 1, b_elements.size());
-
-		assertEquals("b should contain a reference to a", a.toString(),
-				b_elements.get(0).toString());
-	}
-
-	/**
-	 * Tests the QName is constructed with the correct URI and LocalPart
-	 * 
-	 * @throws Exception
-	 */
-    @Test
-	public void testCorrectQName() throws Exception {
-		TypeDescriptor desc = XMLSplitterSerialisationHelper
-				.extensionXMLToTypeDescriptor(new SAXBuilder().build(
-						new StringReader(eInfoXML())).getRootElement());
-		assertEquals("NamespaceURI is incorrect",
-				"http://www.ncbi.nlm.nih.gov/soap/eutils/espell", desc
-						.getQname().getNamespaceURI());
-		assertEquals("Localpart is incorrect", "eSpellRequest", desc.getQname()
-				.getLocalPart());
-	}
-
-	private String eInfoXML() {
-		return "<s:extensions xmlns:s=\"http://org.embl.ebi.escience/xscufl/0.1alpha\"><s:complextype optional=\"false\" unbounded=\"false\" typename=\"eSpellRequest\" name=\"parameters\" qname=\"{http://www.ncbi.nlm.nih.gov/soap/eutils/espell}eSpellRequest\"><s:elements><s:basetype optional=\"true\" unbounded=\"false\" typename=\"string\" name=\"db\" qname=\"{http://www.w3.org/2001/XMLSchema}string\" /><s:basetype optional=\"true\" unbounded=\"false\" typename=\"string\" name=\"term\" qname=\"{http://www.w3.org/2001/XMLSchema}string\" /><s:basetype optional=\"true\" unbounded=\"false\" typename=\"string\" name=\"tool\" qname=\"{http://www.w3.org/2001/XMLSchema}string\" /><s:basetype optional=\"true\" unbounded=\"false\" typename=\"string\" name=\"email\" qname=\"{http://www.w3.org/2001/XMLSchema}string\" /></s:elements></s:complextype></s:extensions>";
-
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c8b66752/src/test/resources/getComplexWithInternalListResponse.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/getComplexWithInternalListResponse.xml b/src/test/resources/getComplexWithInternalListResponse.xml
deleted file mode 100644
index 75dd224..0000000
--- a/src/test/resources/getComplexWithInternalListResponse.xml
+++ /dev/null
@@ -1 +0,0 @@
-<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>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c8b66752/src/test/resources/jws-splitter-input.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/jws-splitter-input.xml b/src/test/resources/jws-splitter-input.xml
deleted file mode 100644
index 36384aa..0000000
--- a/src/test/resources/jws-splitter-input.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-<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>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c8b66752/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
deleted file mode 100644
index 3be01eb..0000000
--- a/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-log4j.rootLogger=WARN, CONSOLE
-
-# Default output to console
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-5p %d{ISO8601} (%c:%L) - %m%n
-
-log4j.logger.net.sf.taverna.wsdl=INFO
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c8b66752/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/InstrumentServiceContextTypes.xsd
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/InstrumentServiceContextTypes.xsd b/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/InstrumentServiceContextTypes.xsd
deleted file mode 100644
index bca9ad9..0000000
--- a/src/test/resources/net/sf/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/c8b66752/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/InstrumentServiceTypes.xsd
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/InstrumentServiceTypes.xsd b/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/InstrumentServiceTypes.xsd
deleted file mode 100644
index 3118190..0000000
--- a/src/test/resources/net/sf/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/c8b66752/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/InstrumentService_.wsdl
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/InstrumentService_.wsdl b/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/InstrumentService_.wsdl
deleted file mode 100644
index f9c35df..0000000
--- a/src/test/resources/net/sf/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/c8b66752/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/InstrumentService__.wsdl
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/InstrumentService__.wsdl b/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/InstrumentService__.wsdl
deleted file mode 100644
index f4cb43b..0000000
--- a/src/test/resources/net/sf/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/c8b66752/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/InstrumentService_bindings.wsdl
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/InstrumentService_bindings.wsdl b/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/InstrumentService_bindings.wsdl
deleted file mode 100644
index cf1c40c..0000000
--- a/src/test/resources/net/sf/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/c8b66752/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/ServiceSecurity.wsdl
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/ServiceSecurity.wsdl b/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/ServiceSecurity.wsdl
deleted file mode 100644
index 10efd53..0000000
--- a/src/test/resources/net/sf/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/c8b66752/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/WS-Addressing.xsd
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/WS-Addressing.xsd b/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/WS-Addressing.xsd
deleted file mode 100644
index 008c65e..0000000
--- a/src/test/resources/net/sf/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/c8b66752/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/WS-BaseFaults.wsdl
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/WS-BaseFaults.wsdl b/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/WS-BaseFaults.wsdl
deleted file mode 100644
index 11f8683..0000000
--- a/src/test/resources/net/sf/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/c8b66752/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/WS-BaseFaults.xsd
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/WS-BaseFaults.xsd b/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/WS-BaseFaults.xsd
deleted file mode 100644
index 87d3798..0000000
--- a/src/test/resources/net/sf/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/c8b66752/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/WS-BaseN.wsdl
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/WS-BaseN.wsdl b/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/WS-BaseN.wsdl
deleted file mode 100644
index 418e66c..0000000
--- a/src/test/resources/net/sf/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/c8b66752/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/WS-BaseN.xsd
----------------------------------------------------------------------
diff --git a/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/WS-BaseN.xsd b/src/test/resources/net/sf/taverna/wsdl/parser/TAV-744/WS-BaseN.xsd
deleted file mode 100644
index 9bdf6ae..0000000
--- a/src/test/resources/net/sf/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