This commit was manufactured by cvs2svn to create tag 'v201102260613'.v201102260613

49 files changed, 0 insertions, 2438 deletions

diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/.cvsignore b/tests/org.eclipse.wst.wsdl.tests/samples/.cvsignore
deleted file mode 100644
index 86d4c2dd3..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-generated
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/BindingFaultReconciliation/BindingFaultSample.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/BindingFaultReconciliation/BindingFaultSample.wsdl
deleted file mode 100644
index 55fca0189..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/BindingFaultReconciliation/BindingFaultSample.wsdl
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

-	xmlns:tns="http://www.example.org/BindingFaultSample/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-	name="BindingFaultSample" targetNamespace="http://www.example.org/BindingFaultSample/">

-	<wsdl:types>

-		<xsd:schema targetNamespace="http://www.example.org/BindingFaultSample/"

-			xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-			<xsd:element name="Operation1">

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="in" type="xsd:string" />

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="Operation1Response">

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="out" type="xsd:string" />

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="Operation1Fault">

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="fault" type="xsd:string" />

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="Operation2">

-				<xsd:complexType>

-					<xsd:sequence>

-

-						<xsd:element name="in" type="xsd:string"></xsd:element>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="Operation2Response">

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="out" type="xsd:string"></xsd:element>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="Operation2Fault1">

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="Operation2Fault1" type="xsd:string"></xsd:element>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-			<xsd:element name="Operation2Fault2">

-				<xsd:complexType>

-					<xsd:sequence>

-						<xsd:element name="Operation2Fault2" type="xsd:string"></xsd:element>

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-		</xsd:schema>

-	</wsdl:types>

-	<wsdl:message name="Operation1Request">

-		<wsdl:part element="tns:Operation1" name="parameters" />

-	</wsdl:message>

-	<wsdl:message name="Operation1Response">

-		<wsdl:part element="tns:Operation1Response" name="parameters" />

-	</wsdl:message>

-	<wsdl:message name="Operation1Fault">

-		<wsdl:part name="Fault" element="tns:Operation1Fault" />

-	</wsdl:message>

-	<wsdl:message name="Operation2Request">

-		<wsdl:part name="parameters" element="tns:Operation2"></wsdl:part>

-	</wsdl:message>

-	<wsdl:message name="Operation2Response">

-		<wsdl:part name="parameters" element="tns:Operation2Response"></wsdl:part>

-	</wsdl:message>

-	<wsdl:message name="Operation2Fault1">

-		<wsdl:part name="parameters" element="tns:Operation2Fault1"></wsdl:part>

-	</wsdl:message>

-	<wsdl:message name="Operation2Fault2">

-		<wsdl:part name="parameters" element="tns:Operation2Fault2"></wsdl:part>

-	</wsdl:message>

-	<wsdl:portType name="SamplePort">

-		<wsdl:operation name="Operation1">

-			<wsdl:input message="tns:Operation1Request" />

-			<wsdl:output message="tns:Operation1Response" />

-		</wsdl:operation>

-		<wsdl:operation name="Operation2">

-			<wsdl:input message="tns:Operation2Request" />

-			<wsdl:output message="tns:Operation2Response" />

-			<wsdl:fault name="Operation2Fault1" message="tns:Operation2Fault1" />

-			<wsdl:fault name="Operation2Fault2" message="tns:Operation2Fault2" />

-		</wsdl:operation>

-	</wsdl:portType>

-	<wsdl:binding name="SamplePortSOAPBinding" type="tns:SamplePort">

-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

-		<wsdl:operation name="Operation1">

-			<soap:operation soapAction="http://www.example.org/BindingFaultSample/Operation1" />

-			<wsdl:input>

-				<soap:body use="literal" />

-			</wsdl:input>

-			<wsdl:output>

-				<soap:body use="literal" />

-			</wsdl:output>

-			<wsdl:fault name="Operation1Fault">

-				<soap:fault name="Operation1Fault" />

-			</wsdl:fault>

-		</wsdl:operation>

-		<wsdl:operation name="Operation2">

-			<soap:operation soapAction="http://www.example.org/BindingFaultSample/Operation2" />

-			<wsdl:input>

-				<soap:body use="literal" />

-			</wsdl:input>

-			<wsdl:output>

-				<soap:body use="literal" />

-			</wsdl:output>

-			<wsdl:fault name="Operation2Fault1">

-				<soap:fault use="literal" name="Operation2Fault1" />

-			</wsdl:fault>

-			<wsdl:fault name="Operation2Fault2">

-				<soap:fault use="literal" name="Operation2Fault2" />

-			</wsdl:fault>

-		</wsdl:operation>

-	</wsdl:binding>

-	<wsdl:service name="SampleService">

-		<wsdl:port binding="tns:SamplePortSOAPBinding" name="SamplePort">

-			<soap:address location="http://www.example.org/" />

-		</wsdl:port>

-	</wsdl:service>

-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/BindingOperationReconciliation/BindingOperationReconciliation.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/BindingOperationReconciliation/BindingOperationReconciliation.wsdl
deleted file mode 100644
index 8f3026d5b..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/BindingOperationReconciliation/BindingOperationReconciliation.wsdl
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:tns="http://www.example.org/BindingOperationReconciliation/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="BindingOperationReconciliation"
-	targetNamespace="http://www.example.org/BindingOperationReconciliation/">
-	<wsdl:types>
-		<xsd:schema
-			targetNamespace="http://www.example.org/BindingOperationReconciliation/"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-			<xsd:element name="NewOperation">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="in" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="NewOperationResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="out" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:schema>
-	</wsdl:types>
-
-	<wsdl:message name="NewOperationRequest">
-		<wsdl:part element="tns:NewOperation" name="parameters" />
-	</wsdl:message>
-
-	<wsdl:message name="NewOperationResponse">
-		<wsdl:part element="tns:NewOperationResponse" name="parameters" />
-	</wsdl:message>
-
-	<wsdl:message name="NewOperationRequest2">
-		<wsdl:part element="tns:NewOperation" name="parameters" />
-	</wsdl:message>
-
-	<wsdl:message name="NewOperationResponse2">
-		<wsdl:part element="tns:NewOperationResponse" name="parameters" />
-	</wsdl:message>
-
-	<wsdl:message name="NewOperationRequest3">
-		<wsdl:part element="tns:NewOperation" name="parameters" />
-	</wsdl:message>
-
-	<wsdl:message name="NewOperationResponse3">
-		<wsdl:part element="tns:NewOperationResponse" name="parameters" />
-	</wsdl:message>
-
-	<wsdl:portType name="BindingOperationReconciliation">
-		<wsdl:operation name="NewOperation">
-			<wsdl:input message="tns:NewOperationRequest" />
-			<wsdl:output message="tns:NewOperationResponse" />
-		</wsdl:operation>
-		<wsdl:operation name="NewOperation2">
-			<wsdl:input message="tns:NewOperationRequest2" />
-			<wsdl:output message="tns:NewOperationResponse2" />
-		</wsdl:operation>
-		<wsdl:operation name="NewOperation3">
-			<wsdl:input name="Input3" message="tns:NewOperationRequest3" />
-			<wsdl:output name="Output3" message="tns:NewOperationResponse3" />
-		</wsdl:operation>
-	</wsdl:portType>
-
-	<wsdl:binding name="BindingOperationReconciliationSOAP"
-		type="tns:BindingOperationReconciliation">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="NewOperation">
-			<soap:operation
-				soapAction="http://www.example.org/BindingOperationReconciliation/NewOperation" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="NewOperation2">
-			<soap:operation
-				soapAction="http://www.example.org/BindingOperationReconciliation/NewOperation2" />
-			<wsdl:input name="Input2">
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output name="Output2">
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="NewOperation3">
-			<soap:operation
-				soapAction="http://www.example.org/BindingOperationReconciliation/NewOperation3" />
-			<wsdl:input name="Input3">
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output name="Output3">
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="BindingOperationReconciliation">
-		<wsdl:port binding="tns:BindingOperationReconciliationSOAP"
-			name="BindingOperationReconciliationSOAP">
-			<soap:address location="http://www.example.org/" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/DuplicateSAXException/SAXException.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/DuplicateSAXException/SAXException.wsdl
deleted file mode 100644
index 13f431f32..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/DuplicateSAXException/SAXException.wsdl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions
-	xmlns:tns="http://www.example.org/NamespacePrefixNotBound/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="NamespacePrefixNotBound"
-	targetNamespace="http://www.example.org/NamespacePrefixNotBound/">
-	<undefined:test />
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/FullElementExtensibility/ExtendedWSDL.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/FullElementExtensibility/ExtendedWSDL.wsdl
deleted file mode 100644
index a6bdf4617..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/FullElementExtensibility/ExtendedWSDL.wsdl
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:tns="http://www.example.org/ExtendedWSDL/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ExtendedWSDL"
-	xmlns:ext="http://www.example.org/Extensions/"
-	targetNamespace="http://www.example.org/ExtendedWSDL/">
-
-	<wsdl:import location="Imported.wsdl"
-		namespace="http://www.example.org/Imported/">
-		<ext:import />
-	</wsdl:import>
-
-	<wsdl:message name="extendedMessage">
-		<ext:message />
-		<wsdl:part name="extendedPart">
-			<ext:part />
-		</wsdl:part>
-	</wsdl:message>
-
-	<wsdl:portType name="extendedPortType">
-		<ext:portType />
-		<wsdl:operation name="extendedOperation">
-			<ext:operation />
-			<wsdl:input message="extendedMessage">
-				<ext:input />
-			</wsdl:input>
-			<wsdl:output message="extendedMessage">
-				<ext:output />
-			</wsdl:output>
-			<wsdl:fault name="extendedFault" message="extendedMessage">
-				<ext:fault />
-			</wsdl:fault>
-		</wsdl:operation>
-	</wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/FullElementExtensibility/Imported.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/FullElementExtensibility/Imported.wsdl
deleted file mode 100644
index 1bc000e6b..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/FullElementExtensibility/Imported.wsdl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/Imported/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Imported" targetNamespace="http://www.example.org/Imported/">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://www.example.org/Imported/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <xsd:element name="NewOperation">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="in" type="xsd:string"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="NewOperationResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="out" type="xsd:string"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part element="tns:NewOperation" name="parameters"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part element="tns:NewOperationResponse" name="parameters"/>
-  </wsdl:message>
-  <wsdl:portType name="Imported">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="ImportedSOAP" type="tns:Imported">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="NewOperation">
-      <soap:operation soapAction="http://www.example.org/Imported/NewOperation"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="Imported">
-    <wsdl:port binding="tns:ImportedSOAP" name="ImportedSOAP">
-      <soap:address location="http://www.example.org/"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/GetWSDLType/BadImport.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/GetWSDLType/BadImport.wsdl
deleted file mode 100644
index 7a8a7d1f7..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/GetWSDLType/BadImport.wsdl
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/badwsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="badwsdl" targetNamespace="http://www.example.org/badwsdl/">
-  <wsdl:import namespace="http://www.example.org/ImportMe/" location="ImportMe.wsdl"></wsdl:import>
-  <xsd:import namespace="http://www.example.com/BadImport" schemaLocation="BadImport.xsd"></xsd:import>
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://www.example.org/badwsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <xsd:element name="NewOperation">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="in" type="xsd:string"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="NewOperationResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="out" type="xsd:string"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part element="tns:NewOperation" name="parameters"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part element="tns:NewOperationResponse" name="parameters"/>
-  </wsdl:message>
-  <wsdl:portType name="badwsdl">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="badwsdlSOAP" type="tns:badwsdl">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="NewOperation">
-      <soap:operation soapAction="http://www.example.org/badwsdl/NewOperation"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="badwsdl">
-    <wsdl:port binding="tns:badwsdlSOAP" name="badwsdlSOAP">
-      <soap:address location="http://www.example.org/"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/GetWSDLType/ImportMe.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/GetWSDLType/ImportMe.wsdl
deleted file mode 100644
index d8899d135..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/GetWSDLType/ImportMe.wsdl
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions name="ImportMe" targetNamespace="http://www.example.org/ImportMe/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/ImportMe/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://www.example.org/ImportMe/">
-      <xsd:element name="NewOperation">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="in" type="xsd:string"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="NewOperationResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="out" type="xsd:string"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="NewOperationResponse1">
-      	<xsd:complexType>
-      		<xsd:sequence>
-
-      			<xsd:element name="out" type="xsd:string"></xsd:element>
-      		</xsd:sequence>
-      	</xsd:complexType>
-      </xsd:element>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="ImportMeMessageRequest">
-    <wsdl:part element="tns:NewOperation" name="parameters"/>
-  </wsdl:message>
-  <wsdl:message name="ImportMeMessageResponse">
-    <wsdl:part element="tns:NewOperationResponse" name="parameters"/>
-  </wsdl:message>
-  <wsdl:message name="ImportMeMessageExtra">
-  	<wsdl:part name="NewPart" type="xsd:string"></wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-  	<wsdl:part name="parameters" element="tns:NewOperation"></wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="NewOperationResponse">
-  	<wsdl:part name="parameters" element="tns:NewOperationResponse1"></wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="ImportMe">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:ImportMeMessageRequest"/>
-      <wsdl:output message="tns:ImportMeMessageResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="ImportPortTypeExtra">
-  	<wsdl:operation name="NewOperation">
-  		<wsdl:input message="tns:NewOperationRequest"></wsdl:input>
-  		<wsdl:output message="tns:NewOperationResponse"></wsdl:output>
-  	</wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="ImportMeSOAP" type="tns:ImportMe">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="NewOperation">
-      <soap:operation soapAction="http://www.example.org/ImportMe/NewOperation"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="ImportBindingExtra"
-  	type="tns:ImportPortTypeExtra">
-  	<soap:binding style="document"
-  		transport="http://schemas.xmlsoap.org/soap/http" />
-  	<wsdl:operation name="NewOperation">
-  		<soap:operation
-  			soapAction="http://www.example.org/ImportMe/NewOperation" />
-  		<wsdl:input>
-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>
-  			<soap:body use="literal" />
-  		</wsdl:output>
-  	</wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="ImportMe">
-    <wsdl:port binding="tns:ImportMeSOAP" name="ImportMeSOAP">
-      <soap:address location="http://www.example.org/"/>
-    </wsdl:port>
-  </wsdl:service>
-  <wsdl:service name="ImportServiceExtra">
-  	<wsdl:port name="ImportPortExtra" binding="tns:ImportBindingExtra">
-  		<soap:address location="http://www.example.org/" />
-  	</wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/HandlesDocumentationElements/Documented.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/HandlesDocumentationElements/Documented.wsdl
deleted file mode 100644
index 6a3112c51..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/HandlesDocumentationElements/Documented.wsdl
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:tns="http://www.example.org/Documented/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Documented"
-	targetNamespace="http://www.example.org/Documented/">
-	<wsdl:documentation>Definitions documentation.</wsdl:documentation>
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://www.example.org/Documented/"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-			<xsd:element name="NewOperation">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="in" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="NewOperationResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="out" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="NewOperationRequest">
-		<wsdl:documentation>Message documentation.</wsdl:documentation>
-		<wsdl:part element="tns:NewOperation" name="parameters" />
-	</wsdl:message>
-	<wsdl:message name="NewOperationResponse">
-		<wsdl:part element="tns:NewOperationResponse" name="parameters" />
-	</wsdl:message>
-	<wsdl:portType name="Documented">
-		<wsdl:documentation>
-			Port type documentation.
-		</wsdl:documentation>
-		<wsdl:operation name="NewOperation">
-			<wsdl:documentation>
-				Operation documentation.
-			</wsdl:documentation>
-			<wsdl:input message="tns:NewOperationRequest" />
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="DocumentedSOAP" type="tns:Documented">
-		<wsdl:documentation>Binding documentation.</wsdl:documentation>
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="NewOperation">
-			<soap:operation
-				soapAction="http://www.example.org/Documented/NewOperation" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="Documented">
-		<wsdl:documentation>Service documentation.</wsdl:documentation>
-		<wsdl:port binding="tns:DocumentedSOAP" name="DocumentedSOAP">
-			<wsdl:documentation>Port documentation.</wsdl:documentation>
-			<soap:address location="http://www.example.org/" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ImportsWithNonStandardFileExtension/ImportWithNonStandardFileExtension.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ImportsWithNonStandardFileExtension/ImportWithNonStandardFileExtension.wsdl
deleted file mode 100644
index 3607a8bf8..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ImportsWithNonStandardFileExtension/ImportWithNonStandardFileExtension.wsdl
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="ImportWithNonStandardFileExtension"
-	targetNamespace="http://www.example.org/ImportWithNonStandardFileExtension/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/ImportWithNonStandardFileExtension/"
-	xmlns:wsdl0="http://www.example.org/ImportWithNonStandardWSDLFileExtension/wsdl0/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:xsd1="http://www.example.org/NonStandardSchemaFileExtension/xsd0">
-
-	<wsdl:import
-		namespace="http://www.example.org/ImportWithNonStandardWSDLFileExtension/wsdl0/"
-		location="NonStandardWSDLFileExtension.wsdl0"></wsdl:import>
-		
-	<wsdl:import
-		namespace="http://www.example.org/NonStandardSchemaFileExtension/xsd0"
-		location="NonStandardSchemaFileExtension.xsd1">
-	</wsdl:import>
-	<wsdl:types>
-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			targetNamespace="http://www.example.org/ImportWithNonStandardFileExtension/">
-			<xsd:element name="NewOperation">
-				<xsd:complexType>
-					<xsd:sequence>
-
-						<xsd:element name="in" type="xsd:string"></xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="NewOperationResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-
-						<xsd:element name="out" type="xsd:string"></xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:schema>
-	</wsdl:types>
-
-	<wsdl:message name="NewOperationRequest">
-		<wsdl:part name="parameters" type="xsd1:ImportedTypeViaWSDLImport"></wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="NewOperationResponse">
-		<wsdl:part name="parameters" element="tns:NewOperationResponse"></wsdl:part>
-	</wsdl:message>
-	<wsdl:portType name="NewPortType">
-		<wsdl:operation name="NewOperation">
-			<wsdl:input message="tns:NewOperationRequest"></wsdl:input>
-			<wsdl:output message="tns:NewOperationResponse"></wsdl:output>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:service name="ImportWithNonStandardFileExtension">
-		<wsdl:port binding="wsdl0:ImportWithNonStandardFileExtensionSOAP"
-			name="ImportWithNonStandardFileExtensionSOAP">
-			<soap:address location="http://www.example.org/" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ImportsWithNonStandardFileExtension/NonStandardSchemaFileExtension.xsd0 b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ImportsWithNonStandardFileExtension/NonStandardSchemaFileExtension.xsd0
deleted file mode 100644
index 889db8374..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ImportsWithNonStandardFileExtension/NonStandardSchemaFileExtension.xsd0
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/NonStandardSchemaFileExtension/xsd0" xmlns:tns="http://www.example.org/NonStandardSchemaFileExtension/xsd0" elementFormDefault="qualified">
-
-    <complexType name="NewType" testXSD0="passed">
-    	<sequence>
-    		<element name="NewElement" type="string"></element>
-    		<element name="NewElement1" type="string"></element>
-    	</sequence>
-    </complexType>
-</schema>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ImportsWithNonStandardFileExtension/NonStandardSchemaFileExtension.xsd1 b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ImportsWithNonStandardFileExtension/NonStandardSchemaFileExtension.xsd1
deleted file mode 100644
index 625fd714c..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ImportsWithNonStandardFileExtension/NonStandardSchemaFileExtension.xsd1
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/NonStandardSchemaFileExtension/xsd0" xmlns:tns="http://www.example.org/NonStandardSchemaFileExtension/xsd0" elementFormDefault="qualified">
-
-    <complexType name="ImportedTypeViaWSDLImport" testXSD1="passed">
-    	<sequence>
-    		<element name="NewElement" type="string"></element>
-    		<element name="NewElement1" type="string"></element>
-    	</sequence>
-    </complexType>
-</schema>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ImportsWithNonStandardFileExtension/NonStandardWSDLFileExtension.wsdl0 b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ImportsWithNonStandardFileExtension/NonStandardWSDLFileExtension.wsdl0
deleted file mode 100644
index d99e375b7..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ImportsWithNonStandardFileExtension/NonStandardWSDLFileExtension.wsdl0
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions name="ImportWithNonStandardFileExtension" targetNamespace="http://www.example.org/ImportWithNonStandardWSDLFileExtension/wsdl0/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/ImportWithNonStandardWSDLFileExtension/wsdl0/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://www.example.org/ImportWithNonStandardWSDLFileExtension/wsdl0/" xmlns:xsd0="http://www.example.org/NonStandardSchemaFileExtension/xsd0">
-            <xsd:import schemaLocation="NonStandardSchemaFileExtension.xsd0" namespace="http://www.example.org/NonStandardSchemaFileExtension/xsd0"></xsd:import>
-            <xsd:element name="NewOperation">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="in" type="xsd0:NewType"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="NewOperationResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="out" type="xsd:string"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part element="tns:NewOperation" name="parameters"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part element="tns:NewOperationResponse" name="parameters"/>
-  </wsdl:message>
-  <wsdl:portType name="ImportWithNonStandardFileExtension">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="ImportWithNonStandardFileExtensionSOAP" type="tns:ImportWithNonStandardFileExtension">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="NewOperation">
-      <soap:operation soapAction="http://www.example.org/ImportWithNonStandardWSDLFileExtension/wsdl0/NewOperation"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/InlineTypesFromImportsAreVisible/A.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/InlineTypesFromImportsAreVisible/A.wsdl
deleted file mode 100644
index f8d62203b..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/InlineTypesFromImportsAreVisible/A.wsdl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:b="http://B"
-	xmlns:tns="http://A"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-	name="A"
-	targetNamespace="http://A">		
-	<wsdl:import location="B.wsdl" namespace="http://B"/>				
-	<wsdl:message name="message">	
-		<wsdl:part name="parameters" type="b:BType" />
-	</wsdl:message>	
-	<wsdl:portType name="portType">
-		<wsdl:operation name="op">
-			<wsdl:output message="tns:message" />
-		</wsdl:operation>
-	</wsdl:portType>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/InlineTypesFromImportsAreVisible/B.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/InlineTypesFromImportsAreVisible/B.wsdl
deleted file mode 100644
index 73e864732..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/InlineTypesFromImportsAreVisible/B.wsdl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-	name="B"
-	targetNamespace="http://B">
-	<wsdl:types>
-		<xsd:schema
-			targetNamespace="http://B">
-			<xsd:complexType name="BType">
-				<xsd:sequence>
-					<xsd:element name="attribute1" type="xsd:string" />
-				</xsd:sequence>
-			</xsd:complexType>
-		</xsd:schema>	
-	</wsdl:types>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LoadsNamelessDefinition/MissingName.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LoadsNamelessDefinition/MissingName.wsdl
deleted file mode 100644
index 8e8c996ff..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LoadsNamelessDefinition/MissingName.wsdl
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LoadsNamelessDefinition/WithName.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LoadsNamelessDefinition/WithName.wsdl
deleted file mode 100644
index c909b513e..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LoadsNamelessDefinition/WithName.wsdl
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" name="WSDLFile">

-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LocalNamespace/LocalDefaultNamespace.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LocalNamespace/LocalDefaultNamespace.wsdl
deleted file mode 100644
index 6c460408c..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LocalNamespace/LocalDefaultNamespace.wsdl
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="LocalDefaultNamespace"
-	targetNamespace="http://www.example.org/LocalDefaultNamespace"
-	xmlns="http://www.example.org/LocalDefaultNamespace"
-	xmlns:tns="http://www.example.org/LocalDefaultNamespace/xsd"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-	<wsdl:types>
-		<xsd:schema
-			targetNamespace="http://www.example.org/LocalDefaultNamespace/xsd"
-			xmlns="http://www.example.org/LocalDefaultNamespace/xsd"
-			attributeFormDefault="unqualified"
-			elementFormDefault="unqualified">
-
-			<xsd:element name="test">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="input" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="testResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="output" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-		</xsd:schema>
-	</wsdl:types>
-
-	<wsdl:message name="TestRequestMessage">
-		<wsdl:part name="parameters" element="test"
-			xmlns="http://www.example.org/LocalDefaultNamespace/xsd" />
-	</wsdl:message>
-
-	<wsdl:message name="TestResponseMessage">
-		<wsdl:part name="parameters" element="testResponse"
-			xmlns="http://www.example.org/LocalDefaultNamespace/xsd" />
-	</wsdl:message>
-
-	<wsdl:portType name="TestPortType">
-		<wsdl:operation name="test">
-			<wsdl:input name="TestInput" message="TestRequestMessage" />
-			<wsdl:output name="TestOutput" message="TestResponseMessage" />
-		</wsdl:operation>
-	</wsdl:portType>
-
-	<wsdl:binding name="TestSOAPBinding"
-		type="TestPortType">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="test">
-			<soap:operation style="document"
-				soapAction="test" />
-			<wsdl:input name="TestInput">
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output name="TestOutput">
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-
-	<wsdl:service name="TestService">
-		<wsdl:port name="TestPort" binding="TestSOAPBinding">
-			<soap:address location="http://www.example.org/test" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LocalNamespace/LocalNamespace.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LocalNamespace/LocalNamespace.wsdl
deleted file mode 100644
index a829b276c..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LocalNamespace/LocalNamespace.wsdl
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-<wsdl:definitions xmlns:tns="http://tempuri.org/Simple/"

-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Simple"

-	targetNamespace="http://tempuri.org/Simple/">

-

-	<wsdl:types>

-

-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-			elementFormDefault="qualified"

-			targetNamespace="http://tempuri.org/Simple/">

-

-			<xsd:element name="OperationInput">

-

-				<xsd:complexType>

-

-					<xsd:sequence>

-						<xsd:element name="attribute1"

-							type="xsd:string" />

-						<xsd:element name="attribute2"

-							type="xsd:string" />

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-

-			<xsd:element name="OperationOutput">

-

-				<xsd:complexType>

-

-					<xsd:sequence>

-						<xsd:element name="attribute1"

-							type="xsd:string" />

-						<xsd:element name="attribute2"

-							type="xsd:string" />

-					</xsd:sequence>

-				</xsd:complexType>

-			</xsd:element>

-		</xsd:schema>

-	</wsdl:types>

-

-	<wsdl:message name="myOperationResponse">

-		<wsdl:part name="myOperationResponse"

-			element="tns:OperationOutput" />

-	</wsdl:message>

-

-	<wsdl:message name="myOperationRequest">

-		<wsdl:part xmlns:parttns="http://tempuri.org/Simple/"

-			name="myOperationRequest" element="parttns:OperationInput" />

-	</wsdl:message>

-

-	<wsdl:portType name="MyPortType">

-

-		<wsdl:operation name="myOperation">

-			<wsdl:input message="tns:myOperationRequest" />

-			<wsdl:output message="tns:myOperationResponse" />

-		</wsdl:operation>

-	</wsdl:portType>

-	

-</wsdl:definitions>

diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LocalNamespace/LocalNamespace2.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LocalNamespace/LocalNamespace2.wsdl
deleted file mode 100644
index 30b2ee391..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LocalNamespace/LocalNamespace2.wsdl
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<wsdl:definitions xmlns:tns="http://www.example.org/example/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="example"
-	targetNamespace="http://www.example.org/example/">
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://www.example.org/example/">
-			<xsd:element name="NewOperation">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="in" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="NewOperationResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="out" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="NewOperationRequest">
-		<wsdl:part element="tns:NewOperation" name="parameters" />
-	</wsdl:message>
-	<wsdl:message name="NewOperationResponse">
-		<wsdl:part element="tns:NewOperationResponse" name="parameters" />
-	</wsdl:message>
-	<wsdl:portType name="example">
-		<wsdl:operation name="NewOperation">
-			<wsdl:input message="tns:NewOperationRequest" />
-			<wsdl:output message="tns:NewOperationResponse" />
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-		name="exampleSOAP" type="tns:example">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="NewOperation">
-			<soap:operation
-				soapAction="http://www.example.org/example/NewOperation" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="example">
-		<wsdl:port xmlns="http://schemas.xmlsoap.org/wsdl/soap/"
-			binding="tns:exampleSOAP" name="exampleSOAP">
-			<address location="http://www.example.org/" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/NullNamespaceURI/Confirmation.xsd b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/NullNamespaceURI/Confirmation.xsd
deleted file mode 100644
index 6340877ba..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/NullNamespaceURI/Confirmation.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-	<xsd:element name="Confirmation" type="ConfirmationType" />

	<xsd:complexType name="ConfirmationType">
-		<xsd:sequence>
-			<xsd:element name="number" type="xsd:int" />
-			<xsd:element name="message" type="xsd:string" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-</xsd:schema>
-
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/NullNamespaceURI/ContactInfo.xsd b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/NullNamespaceURI/ContactInfo.xsd
deleted file mode 100644
index 937d8aac8..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/NullNamespaceURI/ContactInfo.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/ContactInfo"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-	<xsd:element name="phoneNumber">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="areaCode" type="xsd:int" />
-				<xsd:element name="number" type="xsd:int" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:complexType name="addressType">
-		<xsd:sequence>
-			<xsd:element name="street" type="xsd:string" />
-			<xsd:element name="city" type="xsd:string" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-</xsd:schema>
-
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/NullNamespaceURI/ContactInfoService.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/NullNamespaceURI/ContactInfoService.wsdl
deleted file mode 100644
index 4909c54e0..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/NullNamespaceURI/ContactInfoService.wsdl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="ContactInfoService"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:contact="http://www.example.org/ContactInfo"
-	xmlns:tns="http://www.example.org/ContactInfoService"
-	targetNamespace="http://www.example.org/ContactInfoService">
-
-	<wsdl:types>
-		<xsd:schema
-			targetNamespace="http://www.example.org/ContactInfoService"
-			xmlns:contact="http://www.example.org/ContactInfo"
-			xmlns:tns="http://www.example.org/ContactInfoService"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-			<xsd:import namespace="http://www.example.org/ContactInfo"
-				schemaLocation="ContactInfo.xsd" />
-			<xsd:import schemaLocation="Confirmation.xsd" />
-		</xsd:schema>
-	</wsdl:types>
-
-	<wsdl:message name="updatePhoneNumberRequestMsg">
-		<wsdl:part element="contact:phoneNumber" name="input1" />
-	</wsdl:message>
-	<wsdl:message name="updatePhoneNumberResponseMsg">
-		<wsdl:part element="Confirmation" name="output1" />
-	</wsdl:message>
-	<wsdl:message name="updateAddressRequestMsg">
-		<wsdl:part type="contact:addressType" name="input2" />
-	</wsdl:message>
-	<wsdl:message name="updateAddressResponseMsg">
-		<wsdl:part type="ConfirmationType" name="output2" />
-	</wsdl:message>
-
-	<wsdl:portType name="testPortType">
-		<wsdl:operation name="updatePhoneNumber">
-			<wsdl:input message="tns:updatePhoneNumberRequestMsg" />
-			<wsdl:output message="tns:updatePhoneNumberResponseMsg" />
-		</wsdl:operation>
-		<wsdl:operation name="updateAddress">
-			<wsdl:input message="tns:updateAddressRequestMsg" />
-			<wsdl:output message="tns:updateAddressResponseMsg" />
-		</wsdl:operation>
-	</wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/OperationStyle/OperationStyleTest.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/OperationStyle/OperationStyleTest.wsdl
deleted file mode 100644
index 506aec60d..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/OperationStyle/OperationStyleTest.wsdl
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://example.org"

-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="OperationStyleTest" targetNamespace="http://example.org">

-

-	<jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">

-		<jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>

-		<jaxws:enableAsyncMapping>false</jaxws:enableAsyncMapping>

-	</jaxws:bindings>

-

-	<types>

-		<xsd:schema targetNamespace="http://example.org" xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-			elementFormDefault="qualified" xmlns:tns="http://example.org">

-

-			<xsd:element name="quoteRequest" type="tns:quoteRequestType" />

-

-			<xsd:complexType name="quoteRequestType">

-				<xsd:sequence>

-					<xsd:element name="stockSymbol" type="xsd:int" />

-					<xsd:element name="transactionDate" type="xsd:date" />

-				</xsd:sequence>

-			</xsd:complexType>

-

-			<xsd:element name="quoteResponse" type="tns:quoteResponseType" />

-

-			<xsd:complexType name="quoteResponseType">

-				<xsd:sequence>

-					<xsd:element name="value" type="xsd:double" />

-				</xsd:sequence>

-			</xsd:complexType>

-

-			<xsd:element name="quoteError" type="xsd:string" />

-

-		</xsd:schema>

-	</types>

-

-	<message name="Quote">

-		<part name="params" element="tns:quoteRequest" />

-	</message>

-

-	<message name="QuoteResponse">

-		<part name="result" element="tns:quoteResponse" />

-	</message>

-

-	<message name="QuoteError">

-		<part name="error" element="tns:quoteError" />

-	</message>

-

-	<portType name="QuotePortType">

-

-		<jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">

-			<jaxws:class name="QuoteProviderImpl" />

-			<jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>

-			<jaxws:enableAsyncMapping>false</jaxws:enableAsyncMapping>

-		</jaxws:bindings>

-

-		<operation name="GetQuote">

-

-			<jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"

-				xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">

-				<jaxws:method name="getQuote" />

-				<jaxws:parameter part="wsdl:definitions/wsdl:message[@name='Quote']/wsdl:part[@name='params']"

-					childElementName="tns:stockSymbol" name="symbol" />

-				<jaxws:parameter part="wsdl:definitions/wsdl:message[@name='Quote']/wsdl:part[@name='params']"

-					childElementName="tns:transactionDate" name="date" />

-				<jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>

-				<jaxws:enableAsyncMapping>false</jaxws:enableAsyncMapping>

-			</jaxws:bindings>

-

-			<input message="tns:Quote" />

-

-			<output message="tns:QuoteResponse" />

-

-			<fault name="QuoteError" message="tns:QuoteError">

-

-				<jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">

-					<jaxws:class name="QuoteException" />

-				</jaxws:bindings>

-

-			</fault>

-		</operation>

-	</portType>

-

-	<binding name="QuoteBinding" type="tns:QuotePortType">

-

-		<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />

-

-		<operation name="GetQuote">

-			<soap:operation soapAction="" />

-			<input>

-				<soap:body use="literal" />

-			</input>

-			<output>

-				<soap:body use="literal" />

-			</output>

-			<fault name="QuoteError">

-				<soap:fault name="QuoteError" use="literal" />

-			</fault>

-		</operation>

-

-	</binding>

-

-	<service name="QuoteService">

-

-		<jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">

-			<jaxws:class name="QuotationService" />

-		</jaxws:bindings>

-

-		<port name="QuotePort" binding="tns:QuoteBinding">

-

-			<jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">

-				<jaxws:method name="getQuotationService" />

-			</jaxws:bindings>

-

-			<soap:address location="http://localhost:8080/quote" />

-

-		</port>

-

-	</service>

-

-</definitions>

diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ReconcileNonWSDLElements/ReconcileNonWSDLElements.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ReconcileNonWSDLElements/ReconcileNonWSDLElements.wsdl
deleted file mode 100644
index ddb785716..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ReconcileNonWSDLElements/ReconcileNonWSDLElements.wsdl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.com/ReconcileNonWSDLElements/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ReconcileNonWSDLElements" targetNamespace="http://www.example.com/ReconcileNonWSDLElements/">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://www.example.com/ReconcileNonWSDLElements/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <xsd:element name="NewOperation">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="in" type="xsd:string"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="NewOperationResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="out" type="xsd:string"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part element="tns:NewOperation" name="parameters"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part element="tns:NewOperationResponse" name="parameters"/>
-  </wsdl:message>
-  <wsdl:portType name="ReconcileNonWSDLElements">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="ReconcileNonWSDLElementsSOAP" type="tns:ReconcileNonWSDLElements">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="NewOperation">
-      <soap:operation soapAction="http://www.example.com/ReconcileNonWSDLElements/NewOperation"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="ReconcileNonWSDLElements">
-    <wsdl:port binding="tns:ReconcileNonWSDLElementsSOAP" name="ReconcileNonWSDLElementsSOAP">
-      <soap:address location="http://www.example.org/"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ReconcilesExtensibleElements/ExtensibleElementSample.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ReconcilesExtensibleElements/ExtensibleElementSample.wsdl
deleted file mode 100644
index c93610936..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ReconcilesExtensibleElements/ExtensibleElementSample.wsdl
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/BindingFaultSample/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="BindingFaultSample"
-	targetNamespace="http://www.example.org/BindingFaultSample/">
-	<xsd:annotation>
-		<xsd:documentation>
-			Annotation
- 			</xsd:documentation>
-	</xsd:annotation>
-	<wsdl:import namespace="" location="">
-		<xsd:annotation>
-			<xsd:documentation>
-				Annotation
- 			</xsd:documentation>
-		</xsd:annotation>
-	</wsdl:import>
-	<wsdl:types>
-		<xsd:annotation>
-			<xsd:documentation>
-				Annotation
- 			</xsd:documentation>
-		</xsd:annotation>
-
-		<xsd:schema targetNamespace="http://www.example.org/BindingFaultSample/"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-			<xsd:element name="Operation1">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="in" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="Operation1Response">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="out" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="Operation1Fault">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="fault" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="Operation2">
-				<xsd:complexType>
-					<xsd:sequence>
-
-						<xsd:element name="in" type="xsd:string"></xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="Operation2Response">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="out" type="xsd:string"></xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="Operation2Fault1">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="Operation2Fault1" type="xsd:string"></xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="Operation2Fault2">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="Operation2Fault2" type="xsd:string"></xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="Operation1Fault1">
-				<xsd:complexType>
-					<xsd:sequence>
-
-						<xsd:element name="Operation1Fault" type="xsd:string">
-						</xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="Operation1Request">
-		<xsd:annotation>
-			<xsd:documentation>
-				Annotation
- 			</xsd:documentation>
-		</xsd:annotation>
-		<wsdl:part element="tns:Operation1" name="parameters">
-			<xsd:annotation>
-				<xsd:documentation>
-					Annotation
- 			</xsd:documentation>
-			</xsd:annotation>
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="Operation1Response">
-		<wsdl:part element="tns:Operation1Response" name="parameters" />
-	</wsdl:message>
-	<wsdl:message name="Operation1Fault">
-		<wsdl:part name="Fault" element="tns:Operation1Fault" />
-	</wsdl:message>
-	<wsdl:message name="Operation2Request">
-		<wsdl:part name="parameters" element="tns:Operation2"></wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="Operation2Response">
-		<wsdl:part name="parameters" element="tns:Operation2Response"></wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="Operation2Fault1">
-		<wsdl:part name="parameters" element="tns:Operation2Fault1"></wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="Operation2Fault2">
-		<wsdl:part name="parameters" element="tns:Operation2Fault2"></wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="Operation1Fault1">
-		<wsdl:part name="parameters" element="tns:Operation1Fault1"></wsdl:part>
-	</wsdl:message>
-	<wsdl:portType name="SamplePort">
-		<xsd:annotation>
-			<xsd:documentation>
-				Annotation
- 			</xsd:documentation>
-		</xsd:annotation>
-
-		<wsdl:operation name="Operation1">
-			<xsd:annotation>
-				<xsd:documentation>
-					Annotation
- 			</xsd:documentation>
-			</xsd:annotation>
-			<wsdl:input message="tns:Operation1Request">
-				<xsd:annotation>
-					<xsd:documentation>
-						Annotation
- 			</xsd:documentation>
-				</xsd:annotation>
-			</wsdl:input>
-			<wsdl:output message="tns:Operation1Response">
-				<xsd:annotation>
-					<xsd:documentation>
-						Annotation
- 			</xsd:documentation>
-				</xsd:annotation>
-			</wsdl:output>
-			<wsdl:fault name="fault" message="tns:Operation1Fault1">
-				<xsd:annotation>
-					<xsd:documentation>
-						Annotation
- 			</xsd:documentation>
-				</xsd:annotation>
-			</wsdl:fault>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="SamplePortSOAPBinding" type="tns:SamplePort">
-		<xsd:annotation>
-			<xsd:documentation>
-				Annotation
- 			</xsd:documentation>
-		</xsd:annotation>
-
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="Operation1">
-			<xsd:annotation>
-				<xsd:documentation>
-					Annotation
- 				</xsd:documentation>
-			</xsd:annotation>
-
-			<soap:operation
-				soapAction="http://www.example.org/BindingFaultSample/Operation1" />
-			<wsdl:input>
-				<xsd:annotation>
-					<xsd:documentation>
-						Annotation
- 					</xsd:documentation>
-				</xsd:annotation>
-
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<xsd:annotation>
-					<xsd:documentation>
-						Annotation
- 			</xsd:documentation>
-				</xsd:annotation>
-				<soap:body use="literal" />
-			</wsdl:output>
-			<wsdl:fault name="Operation1Fault">
-				<xsd:annotation>
-					<xsd:documentation>
-						Annotation
- 					</xsd:documentation>
-				</xsd:annotation>
-
-				<soap:fault name="Operation1Fault" />
-			</wsdl:fault>
-		</wsdl:operation>
-
-	</wsdl:binding>
-	<wsdl:service name="SampleService">
-		<xsd:annotation>
-			<xsd:documentation>
-				Annotation
- 			</xsd:documentation>
-		</xsd:annotation>
-
-		<wsdl:port binding="tns:SamplePortSOAPBinding" name="SamplePort">
-			<xsd:annotation>
-				<xsd:documentation>
-					Annotation
- 				</xsd:documentation>
-			</xsd:annotation>
-			<soap:address location="http://www.example.org/" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ReconcilesImportsWithNoLocation/Main.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ReconcilesImportsWithNoLocation/Main.wsdl
deleted file mode 100644
index 935e11107..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/ReconcilesImportsWithNoLocation/Main.wsdl
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:tns="http://www.example.org/B/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="B"
-	targetNamespace="http://www.example.org/B/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:wsdl1="http://www.example.org/A/">
-	<wsdl:import namespace="http://www.example.org/A/" />
-	<wsdl:service name="B">
-		<wsdl:port name="NewPort" binding="wsdl1:ASOAP">
-			<soap:address location="http://www.example.org/" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/SOAPBodyReconciliationForMIME/SOAPBodyForMIME.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/SOAPBodyReconciliationForMIME/SOAPBodyForMIME.wsdl
deleted file mode 100644
index 85108699c..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/SOAPBodyReconciliationForMIME/SOAPBodyForMIME.wsdl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="SOAPBodyForMIME" targetNamespace="http://www.examples.org/SOAPBodyForMIME"
-	xmlns:tns="http://www.examples.org/SOAPBodyForMIME" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://www.examples.org/SOAPBodyForMIME"
-			xmlns:tns="http://www.examples.org/SOAPBodyForMIME"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-			<xsd:element name="stringParam" type="xsd:string" />
-			<xsd:element name="binaryParam" type="xsd:base64Binary" />
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="testOperationRequestMsg">
-		<wsdl:part element="tns:stringParam" name="part1" />
-		<wsdl:part element="tns:binaryParam" name="part2" />
-	</wsdl:message>
-	<wsdl:portType name="TestPortType">
-		<wsdl:operation name="testOperation">
-			<wsdl:input message="tns:testOperationRequestMsg" name="input" />
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="TestBinding" type="tns:TestPortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="testOperation">
-			<soap:operation soapAction="" />
-			<wsdl:input name="input">
-				<mime:multipartRelated>
-					<mime:part>
-						<soap:body parts="part1" use="literal" />
-					</mime:part>
-					<mime:part>
-						<mime:content part="part2" />
-					</mime:part>
-				</mime:multipartRelated>
-			</wsdl:input>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="TestService">
-		<wsdl:port binding="tns:TestBinding" name="TestPort">
-			<soap:address location="http://localhost:9080/SOAPBodyForMIME" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TargetNamespace/TargetNamespace.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TargetNamespace/TargetNamespace.wsdl
deleted file mode 100644
index ddfd9bc5a..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TargetNamespace/TargetNamespace.wsdl
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="TargetNamespace"
-	targetNamespace="http://www.example.org/TargetNamespace/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/TargetNamespace/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://www.example.org/TargetNamespace/"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-			<xsd:element name="NewOperation">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="in" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="NewOperationResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="out" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="NewOperationRequest">
-		<wsdl:part element="tns:NewOperation" name="parameters" />
-	</wsdl:message>
-	<wsdl:message name="NewOperationResponse">
-		<wsdl:part element="tns:NewOperationResponse" name="parameters" />
-	</wsdl:message>
-	<wsdl:portType name="TargetNamespace">
-		<wsdl:operation name="NewOperation">
-			<wsdl:input message="tns:NewOperationRequest" />
-			<wsdl:output message="tns:NewOperationResponse" />
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="TargetNamespaceSOAP" type="tns:TargetNamespace">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="NewOperation">
-			<soap:operation soapAction="http://www.example.org/TargetNamespace/NewOperation" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="TargetNamespace">
-		<wsdl:port binding="tns:TargetNamespaceSOAP" name="TargetNamespaceSOAP">
-			<soap:address location="http://www.example.org/" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test.wsdl
deleted file mode 100644
index 8dde88d30..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test.wsdl
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<definitions name="TestService"

-	targetNamespace="http://test.org/Service/"

-	xmlns="http://schemas.xmlsoap.org/wsdl/"

-	xmlns:tns="http://test.org/Service/"

-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-	xmlns:test="http://test.org/">

-	<types>

-		<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">

-			<xs:import namespace="http://test.org/"

-				schemaLocation="Test1.xsd" />

-		</xs:schema>

-		<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">

-			<xs:import namespace="http://test.org/"

-				schemaLocation="Test2.xsd" />

-		</xs:schema>

-	</types>

-	<message name="testRequest">

-		<part name="requestPart" type="test:MyType" />

-	</message>

-	<message name="testResponse">

-		<part name="responsePart" element="test:MyElement" />

-	</message>

-	<portType name="TestPort">

-		<operation name="testOperation">

-			<input message="tns:testRequest" name="testRequest" />

-			<output message="tns:testResponse" name="testResponse" />

-		</operation>

-

-	</portType>

-</definitions>

diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test1.xsd b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test1.xsd
deleted file mode 100644
index 82c36aab7..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test1.xsd
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<schema xmlns="http://www.w3.org/2001/XMLSchema"

-	targetNamespace="http://test.org/"

-	xmlns:tns="http://test.org/">

-</schema>

diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test2.xsd b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test2.xsd
deleted file mode 100644
index e281a196e..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test2.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<schema xmlns="http://www.w3.org/2001/XMLSchema"

-	targetNamespace="http://test.org/"

-	xmlns:tns="http://test.org/">

-	

-	<element name="MyElement" type="string"></element>

-

-	<simpleType name="MyType">

-		<restriction base="string"></restriction>

-	</simpleType>

-

-</schema>

diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypesExtensibility/TypesExtensibility.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypesExtensibility/TypesExtensibility.wsdl
deleted file mode 100644
index dd5668a28..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypesExtensibility/TypesExtensibility.wsdl
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:tns="http://www.example.org/TypesExtensibility/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="TypesExtensibility"
-	xmlns:typeEx="http://www.example.org/OtherTypes/"
-	targetNamespace="http://www.example.org/TypesExtensibility/">
-	<wsdl:types>
-		<typeEx:typeDef />
-		<xsd:schema
-			targetNamespace="http://www.example.org/Types/">
-			<xsd:element name="test" type="xsd:string" />
-		</xsd:schema>
-		<typeEx:typeDef />
-	</wsdl:types>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDL4JRemove/ImportMe.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDL4JRemove/ImportMe.wsdl
deleted file mode 100644
index d8899d135..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDL4JRemove/ImportMe.wsdl
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions name="ImportMe" targetNamespace="http://www.example.org/ImportMe/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/ImportMe/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://www.example.org/ImportMe/">
-      <xsd:element name="NewOperation">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="in" type="xsd:string"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="NewOperationResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="out" type="xsd:string"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="NewOperationResponse1">
-      	<xsd:complexType>
-      		<xsd:sequence>
-
-      			<xsd:element name="out" type="xsd:string"></xsd:element>
-      		</xsd:sequence>
-      	</xsd:complexType>
-      </xsd:element>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="ImportMeMessageRequest">
-    <wsdl:part element="tns:NewOperation" name="parameters"/>
-  </wsdl:message>
-  <wsdl:message name="ImportMeMessageResponse">
-    <wsdl:part element="tns:NewOperationResponse" name="parameters"/>
-  </wsdl:message>
-  <wsdl:message name="ImportMeMessageExtra">
-  	<wsdl:part name="NewPart" type="xsd:string"></wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-  	<wsdl:part name="parameters" element="tns:NewOperation"></wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="NewOperationResponse">
-  	<wsdl:part name="parameters" element="tns:NewOperationResponse1"></wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="ImportMe">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:ImportMeMessageRequest"/>
-      <wsdl:output message="tns:ImportMeMessageResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="ImportPortTypeExtra">
-  	<wsdl:operation name="NewOperation">
-  		<wsdl:input message="tns:NewOperationRequest"></wsdl:input>
-  		<wsdl:output message="tns:NewOperationResponse"></wsdl:output>
-  	</wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="ImportMeSOAP" type="tns:ImportMe">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="NewOperation">
-      <soap:operation soapAction="http://www.example.org/ImportMe/NewOperation"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="ImportBindingExtra"
-  	type="tns:ImportPortTypeExtra">
-  	<soap:binding style="document"
-  		transport="http://schemas.xmlsoap.org/soap/http" />
-  	<wsdl:operation name="NewOperation">
-  		<soap:operation
-  			soapAction="http://www.example.org/ImportMe/NewOperation" />
-  		<wsdl:input>
-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>
-  			<soap:body use="literal" />
-  		</wsdl:output>
-  	</wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="ImportMe">
-    <wsdl:port binding="tns:ImportMeSOAP" name="ImportMeSOAP">
-      <soap:address location="http://www.example.org/"/>
-    </wsdl:port>
-  </wsdl:service>
-  <wsdl:service name="ImportServiceExtra">
-  	<wsdl:port name="ImportPortExtra" binding="tns:ImportBindingExtra">
-  		<soap:address location="http://www.example.org/" />
-  	</wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDL4JRemove/RemoveViaWSDL4J.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDL4JRemove/RemoveViaWSDL4J.wsdl
deleted file mode 100644
index c5744b524..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDL4JRemove/RemoveViaWSDL4J.wsdl
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions name="RemoveViaWSDL4J" targetNamespace="http://www.example.org/RemoveViaWSDL4J/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/RemoveViaWSDL4J/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl1="http://www.example.org/ImportMe/">
-    <wsdl:import namespace="http://www.example.org/ImportMe/" location="ImportMe.wsdl"></wsdl:import>
-    <wsdl:types>
-    <xsd:schema targetNamespace="http://www.example.org/RemoveViaWSDL4J/">
-      <xsd:element name="NewOperation">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="in" type="xsd:string"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="NewOperationResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="out" type="xsd:string"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="NewOperationResponse1">
-      	<xsd:complexType>
-      		<xsd:sequence>
-
-      			<xsd:element name="out" type="xsd:string"></xsd:element>
-      		</xsd:sequence>
-      	</xsd:complexType>
-      </xsd:element>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="RemoveViaWSDL4JMessageRequest">
-    <wsdl:part element="tns:NewOperation" name="parameters"/>
-  </wsdl:message>
-  <wsdl:message name="RemoveViaWSDL4JMessageResponse">
-    <wsdl:part element="tns:NewOperationResponse" name="parameters"/>
-  </wsdl:message>
-  <wsdl:message name="RemoveViaWSDL4JMessageExtra">
-  	<wsdl:part name="NewPart" type="xsd:string"></wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-  	<wsdl:part name="parameters" element="tns:NewOperation"></wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="NewOperationResponse">
-  	<wsdl:part name="parameters" element="tns:NewOperationResponse1"></wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="RemoveViaWSDL4J">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:RemoveViaWSDL4JMessageRequest"/>
-      <wsdl:output message="tns:RemoveViaWSDL4JMessageResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="MainPortTypeExtra">
-  	<wsdl:operation name="NewOperation">
-  		<wsdl:input message="tns:NewOperationRequest"></wsdl:input>
-  		<wsdl:output message="tns:NewOperationResponse"></wsdl:output>
-  	</wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="RemoveViaWSDL4JSOAP" type="tns:RemoveViaWSDL4J">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="NewOperation">
-      <soap:operation soapAction="http://www.example.org/RemoveViaWSDL4J/NewOperation"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="MainBindingExtra" type="tns:MainPortTypeExtra">
-  	<soap:binding style="document"
-  		transport="http://schemas.xmlsoap.org/soap/http" />
-  	<wsdl:operation name="NewOperation">
-  		<soap:operation
-  			soapAction="http://www.example.org/RemoveViaWSDL4J/NewOperation" />
-  		<wsdl:input>
-  			<soap:body use="literal" />
-  		</wsdl:input>
-  		<wsdl:output>
-  			<soap:body use="literal" />
-  		</wsdl:output>
-  	</wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="RemoveViaWSDL4J">
-    <wsdl:port binding="tns:RemoveViaWSDL4JSOAP" name="RemoveViaWSDL4JSOAP">
-      <soap:address location="http://www.example.org/"/>
-    </wsdl:port>
-  </wsdl:service>
-  <wsdl:service name="MainServiceExtra">
-  	<wsdl:port name="MainPortExtra" binding="tns:MainBindingExtra">
-  		<soap:address location="http://www.example.org/" />
-  	</wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/firstlevel.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/firstlevel.wsdl
deleted file mode 100644
index fcb8dc11b..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/firstlevel.wsdl
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.example.com" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com">

-    <import location="secondlevel.wsdl" namespace="http://www.example.com"/>

-	<message name="testINPUTmessage">

-		<part name="testINpart" type="xsd:string"/>

-	</message>

-</definitions>

diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/main.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/main.wsdl
deleted file mode 100644
index b0a42a716..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/main.wsdl
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" 

-	xmlns:tns="http://www.example.com" 

-	targetNamespace="http://www.example.com">

-    

-    <import location="firstlevel.wsdl" namespace="http://www.example.com"/>

-    

-    <portType name="TestPortType">

-

-    	<operation name="TestOperation">

-

-    		<!-- This is located in the first level import -->

-

-    		<input message="tns:testINPUTmessage"/>

-

-    		<!-- This is located in the second level import -->

-

-    		<output message="tns:testOUTPUTmessage"/>

-

-    	</operation>

-

-    </portType>

-    

-</definitions>

diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/secondlevel.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/secondlevel.wsdl
deleted file mode 100644
index 6e2efd98f..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/secondlevel.wsdl
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" 

-	xmlns:tns="http://www.example.com" 

-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" 

-	targetNamespace="http://www.example.com">

-

-	<!-- Here to force a cyclic import to make sure the code does not go into an infinite recursion. -->

-	

-    <import location="main.wsdl" namespace="http://www.example.com"/>

-

-	<message name="testOUTPUTmessage">

-		<part name="testOUTpart" type="xsd:string"/>

-	</message>

-

-	<!-- Duplicated here to allow testing the imports tree traversal order.

-	This message will be "masked" by the one declared in the firstlevel.wsdl -->

-

-	<message name="testINPUTmessage">

-		<part name="testINpart" type="xsd:int"/>

-	</message>

-

-</definitions>

diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/HTTP/HTTPExample.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/HTTP/HTTPExample.wsdl
deleted file mode 100644
index 11a4b7795..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/HTTP/HTTPExample.wsdl
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-	xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-	xmlns:tns="http://www.example.org/HTTPExample/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="HTTPExample"
-	targetNamespace="http://www.example.org/HTTPExample/">
-	<wsdl:message name="NewOperationRequest">
-		<wsdl:part name="NewOperationRequest" type="xsd:string" />
-	</wsdl:message>
-	<wsdl:message name="NewOperationResponse">
-		<wsdl:part name="NewOperationResponse" type="xsd:string" />
-	</wsdl:message>
-	<wsdl:portType name="HTTPExample">
-		<wsdl:operation name="NewOperation">
-			<wsdl:input message="tns:NewOperationRequest" />
-			<wsdl:output message="tns:NewOperationResponse" />
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="HTTPExampleHTTP" type="tns:HTTPExample">
-		<http:binding verb="GET" />
-		<wsdl:operation name="NewOperation">
-			<http:operation location="/NewOperation" />
-			<wsdl:input>
-				<http:urlEncoded />
-			</wsdl:input>
-			<wsdl:output>
-				<mime:content type="text/xml" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="HTTPExample">
-		<wsdl:port binding="tns:HTTPExampleHTTP"
-			name="HTTPExampleHTTP">
-			<http:address location="http://www.example.org/" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/HTTP/HTTPTest.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/HTTP/HTTPTest.wsdl
deleted file mode 100644
index 51211edbc..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/HTTP/HTTPTest.wsdl
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-	xmlns:tns="http://www.example.org/HTTPTest/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="HTTPTest"
-	targetNamespace="http://www.example.org/HTTPTest/">
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://www.example.org/HTTPTest/"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-			<xsd:element name="NewOperation">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="in" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="NewOperationResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="out" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="NewOperationFault">
-				<xsd:complexType>
-					<xsd:sequence>
						<xsd:element name="fault"
-							type="xsd:string">
-						</xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="Header">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="header"
-							type="xsd:string">
-						</xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="HeaderFault1">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="headerFault1"
-							type="xsd:string">
-						</xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="HeaderFault2">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="headerFault2"
-							type="xsd:string">
-						</xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="NewOperationRequest">
-		<wsdl:part element="tns:NewOperation" name="parameters" />
-		<wsdl:part element="tns:Header" name="header" />
-		<wsdl:part element="tns:HeaderFault1" name="headerFault1" ></wsdl:part>
-		<wsdl:part element="tns:HeaderFault2" name="headerFault2" ></wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="NewOperationResponse">
-		<wsdl:part element="tns:NewOperationResponse" name="parameters" />
-	</wsdl:message>
-	<wsdl:message name="NewOperationFault">
-		<wsdl:part name="parameters" element="tns:NewOperationFault"></wsdl:part>
-	</wsdl:message>
-	<wsdl:portType name="HTTPTest">
-		<wsdl:operation name="NewOperation">
-			<wsdl:input message="tns:NewOperationRequest" />
-			<wsdl:output message="tns:NewOperationResponse" />
-			<wsdl:fault name="fault" message="tns:NewOperationFault" />
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="HTTPTestHTTP" type="tns:HTTPTest">
-		<wsdl:operation name="NewOperation">
-			<wsdl:input />
-			<wsdl:output />
-			<wsdl:fault name="fault" />
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="HTTPTest">
-		<wsdl:port binding="tns:HTTPTestHTTP" name="HTTPTestHTTP">
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/MIME/MIMEExample.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/MIME/MIMEExample.wsdl
deleted file mode 100644
index e33d44e97..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/MIME/MIMEExample.wsdl
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-	xmlns:tns="http://www.example.org/MIMEExample"
-	targetNamespace="http://www.example.org/MIMEExample">
-	<types>
-		<xsd:schema
-			targetNamespace="http://www.example.org/MIMEExample">
-			<xsd:element name="Request" type="xsd:string" />
-			<xsd:element name="Response" type="xsd:string" />
-			<xsd:element name="XMLData">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="element1" type="xsd:int"></xsd:element>
-						<xsd:element name="element2" type="xsd:string"></xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:schema>
-	</types>
-	<message name="RequestMsg">
-		<part name="request" element="tns:Request" />
-	</message>
-	<message name="ResponseMsg">
-		<part name="response" element="tns:Response" />
-		<part name="responseData" type="xsd:base64Binary" />
-		<part name="xmlData" element="tns:XMLData" />
-	</message>
-	<portType name="MIMEExamplePortType">
-		<operation name="testOperation">
-			<input message="tns:RequestMsg" />
-			<output message="tns:ResponseMsg" />
-		</operation>
-	</portType>
-	<binding name="MIMEExampleBinding" type="tns:MIMEExamplePortType">
-		<soap:binding transport="http://schemas.xmlsoap.org/soap/http"
-			style="document" />
-		<operation name="testOperation">
-			<soap:operation
-				soapAction="http://www.example.org/MIMEExample/testOperation" />
-			<input>
-				<soap:body use="literal" />
-			</input>
-			<output>
-				<mime:multipartRelated>
-					<mime:part name="response">
-						<soap:body use="literal" />
-					</mime:part>
-					<mime:part name="responseData">
-						<mime:content part="responseData" type="text/binary" />
-					</mime:part>
-				</mime:multipartRelated>
-				<mime:mimeXML part="xmlData" />
-			</output>
-		</operation>
-	</binding>
-	<service name="MIMEExampleService">
-		<port name="MIMEExamplePort" binding="tns:MIMEExampleBinding">
-			<soap:address location="http://localhost:8080/MIMEExample" />
-		</port>
-	</service>
-</definitions>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/MIME/MIMETest.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/MIME/MIMETest.wsdl
deleted file mode 100644
index ac316aa12..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/MIME/MIMETest.wsdl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-	xmlns:tns="http://www.example.org/MIMETest"
-	targetNamespace="http://www.example.org/MIMETest">
-	<types>
-		<xsd:schema
-			targetNamespace="http://www.example.org/MIMETest">
-			<xsd:element name="Request" type="xsd:string" />
-			<xsd:element name="Response" type="xsd:string" />
-			<xsd:element name="XMLData">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="element1" type="xsd:int"></xsd:element>
-						<xsd:element name="element2" type="xsd:string"></xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:schema>
-	</types>
-	<message name="RequestMsg">
-		<part name="request" element="tns:Request" />
-	</message>
-	<message name="ResponseMsg">
-		<part name="response" element="tns:Response" />
-		<part name="responseData" type="xsd:base64Binary" />
-		<part name="xmlData" element="tns:XMLData" />
-	</message>
-	<portType name="MIMETestPortType">
-		<operation name="testOperation">
-			<input message="tns:RequestMsg" />
-			<output message="tns:ResponseMsg" />
-		</operation>
-	</portType>
-	<binding name="MIMETestBinding" type="tns:MIMETestPortType">
-		<soap:binding transport="http://schemas.xmlsoap.org/soap/http"
-			style="document" />
-		<operation name="testOperation">
-			<soap:operation
-				soapAction="http://www.example.org/MIMETest/testOperation" />
-			<input>
-				<soap:body use="literal" />
-			</input>
-			<output>
-			</output>
-		</operation>
-	</binding>
-	<service name="MIMETestService">
-		<port name="MIMETestPort" binding="tns:MIMETestBinding">
-			<soap:address location="http://localhost:8080/MIMETest" />
-		</port>
-	</service>
-</definitions>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/SOAP/DocumentLiteralSOAPExample.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/SOAP/DocumentLiteralSOAPExample.wsdl
deleted file mode 100644
index acb830c77..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/SOAP/DocumentLiteralSOAPExample.wsdl
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:tns="http://www.example.org/DocumentLiteralSOAPExample/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="DocumentLiteralSOAPExample"
-	targetNamespace="http://www.example.org/DocumentLiteralSOAPExample/">
-	<wsdl:documentation>Test documentation.</wsdl:documentation>
-	<wsdl:types>
-		<wsdl:documentation>Test documentation.</wsdl:documentation>
-		<xsd:schema
-			targetNamespace="http://www.example.org/DocumentLiteralSOAPExample/"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-			<xsd:element name="NewOperationRequest">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="in" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="NewOperationResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="out" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="NewOperationFault">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="fault" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="NewOperationHeader">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="header" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="NewOperationHeaderFault">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="headerFault"
-							type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="TestMsg">
-		<wsdl:part element="tns:NewOperationHeader" name="testHeader" />
-		<wsdl:part element="tns:NewOperationHeaderFault"
-			name="testHeaderFault" />
-	</wsdl:message>
-	<wsdl:message name="NewOperationRequestMsg">
-		<wsdl:documentation>Test documentation.</wsdl:documentation>
-		<wsdl:part element="tns:NewOperationRequest"
-			name="parameters">
-			<wsdl:documentation>Test documentation.</wsdl:documentation>
-		</wsdl:part>
-		<wsdl:part element="tns:NewOperationHeader" name="header" />
-		<wsdl:part element="tns:NewOperationHeaderFault"
-			name="headerFault" />
-	</wsdl:message>
-	<wsdl:message name="NewOperationResponseMsg">
-		<wsdl:part element="tns:NewOperationResponse" name="parameters" />
-	</wsdl:message>
-	<wsdl:message name="NewOperationFaultMsg">
-		<wsdl:part element="tns:NewOperationFault" name="fault" />
-	</wsdl:message>
-	<wsdl:portType name="DocumentLiteralSOAPExample">
-		<wsdl:documentation>Test documentation.</wsdl:documentation>
-		<wsdl:operation name="NewOperation">
-			<wsdl:documentation>Test documentation.</wsdl:documentation>
-			<wsdl:input message="tns:NewOperationRequestMsg">
-				<wsdl:documentation>
-					Test documentation.
-				</wsdl:documentation>
-			</wsdl:input>
-			<wsdl:output message="tns:NewOperationResponseMsg">
-				<wsdl:documentation>
-					Test documentation.
-				</wsdl:documentation>
-			</wsdl:output>
-			<wsdl:fault name="fault"
-				message="tns:NewOperationFaultMsg">
-				<wsdl:documentation>
-					Test documentation.
-				</wsdl:documentation>
-			</wsdl:fault>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="DocumentLiteralSOAPExampleSOAP"
-		type="tns:DocumentLiteralSOAPExample">
-		<wsdl:documentation>Test documentation.</wsdl:documentation>
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="NewOperation">
-			<wsdl:documentation>Test documentation.</wsdl:documentation>
-			<soap:operation style="document"
-				soapAction="http://www.example.org/DocumentLiteralSOAPExample/NewOperation" />
-			<wsdl:input>
-				<wsdl:documentation>
-					Test documentation.
-				</wsdl:documentation>
-				<soap:body use="literal" parts="parameters" />
-				<soap:header use="literal" part="header"
-					message="tns:NewOperationRequestMsg">
-					<soap:headerfault use="literal" part="headerFault"
-						message="tns:NewOperationRequestMsg" />
-				</soap:header>
-			</wsdl:input>
-			<wsdl:output>
-				<wsdl:documentation>
-					Test documentation.
-				</wsdl:documentation>
-				<soap:body use="literal" />
-			</wsdl:output>
-			<wsdl:fault name="fault">
-				<wsdl:documentation>
-					Test documentation.
-				</wsdl:documentation>
-				<soap:fault name="fault" use="literal" />
-			</wsdl:fault>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="DocumentLiteralSOAPExample">
-		<wsdl:documentation>Test documentation.</wsdl:documentation>
-		<wsdl:port binding="tns:DocumentLiteralSOAPExampleSOAP"
-			name="DocumentLiteralSOAPExampleSOAP">
-			<wsdl:documentation>Test documentation.</wsdl:documentation>
-			<soap:address location="http://www.example.org/" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/SOAP/RPCEncodedSOAPExample.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/SOAP/RPCEncodedSOAPExample.wsdl
deleted file mode 100644
index 5702a2e26..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/SOAP/RPCEncodedSOAPExample.wsdl
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:tns="http://www.example.org/RPCEncodedSOAPExample/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="RPCEncodedSOAPExample"
-	targetNamespace="http://www.example.org/RPCEncodedSOAPExample/">
-	<wsdl:message name="NewOperationRequest">
-		<wsdl:part name="NewOperationRequest" type="xsd:string" />
-	</wsdl:message>
-	<wsdl:message name="NewOperationResponse">
-		<wsdl:part name="NewOperationResponse" type="xsd:string" />
-	</wsdl:message>
-	<wsdl:portType name="RPCEncodedSOAPExample">
-		<wsdl:operation name="NewOperation">
-			<wsdl:input message="tns:NewOperationRequest" />
-			<wsdl:output message="tns:NewOperationResponse" />
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="RPCEncodedSOAPExampleSOAP"
-		type="tns:RPCEncodedSOAPExample">
-		<soap:binding style="rpc"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="NewOperation">
-			<soap:operation
-				soapAction="http://www.example.org/RPCEncodedSOAPExample/NewOperation" />
-			<wsdl:input>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					namespace="http://www.example.org/RPCEncodedSOAPExample/"
-					use="encoded" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body
-					encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
-					namespace="http://www.example.org/RPCEncodedSOAPExample/"
-					use="encoded" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="RPCEncodedSOAPExample">
-		<wsdl:port binding="tns:RPCEncodedSOAPExampleSOAP"
-			name="RPCEncodedSOAPExampleSOAP">
-			<soap:address location="http://www.example.org/" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/SOAP/RPCLiteralSOAPExample.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/SOAP/RPCLiteralSOAPExample.wsdl
deleted file mode 100644
index ada77bb99..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/SOAP/RPCLiteralSOAPExample.wsdl
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:tns="http://www.example.org/RPCLiteralSOAPExample/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	name="RPCLiteralSOAPExample"
-	targetNamespace="http://www.example.org/RPCLiteralSOAPExample/">
-	<wsdl:message name="NewOperationRequest">
-		<wsdl:part name="NewOperationRequest" type="xsd:string" />
-	</wsdl:message>
-	<wsdl:message name="NewOperationResponse">
-		<wsdl:part name="NewOperationResponse" type="xsd:string" />
-	</wsdl:message>
-	<wsdl:message name="NewOperationFault">
-		<wsdl:part name="NewOperationFault" type="xsd:string" />
-	</wsdl:message>
-	<wsdl:portType name="RPCLiteralSOAPExample">
-		<wsdl:operation name="NewOperation">
-			<wsdl:input message="tns:NewOperationRequest" />
-			<wsdl:output message="tns:NewOperationResponse" />
-			<wsdl:fault name="fault" message="tns:NewOperationFault" />
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="RPCLiteralSOAPExampleSOAP"
-		type="tns:RPCLiteralSOAPExample">
-		<soap:binding style="rpc"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="NewOperation">
-			<soap:operation
-				soapAction="http://www.example.org/RPCLiteralSOAPExample/NewOperation" />
-			<wsdl:input>
-				<soap:body
-					namespace="http://www.example.org/RPCLiteralSOAPExample/"
-					use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body
-					namespace="http://www.example.org/RPCLiteralSOAPExample/"
-					use="literal" />
-			</wsdl:output>
-			<wsdl:fault name="fault">
-				<soap:fault name="fault"
-					namespace="http://www.example.org/RPCLiteralSOAPExample/"
-					use="literal" />
-			</wsdl:fault>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="RPCLiteralSOAPExample">
-		<wsdl:port binding="tns:RPCLiteralSOAPExampleSOAP"
-			name="RPCLiteralSOAPExampleSOAP">
-			<soap:address location="http://www.example.org/" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/SOAP/SOAPTest.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/SOAP/SOAPTest.wsdl
deleted file mode 100644
index 47ceb9183..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/Extensions/SOAP/SOAPTest.wsdl
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:tns="http://www.example.org/SOAPTest/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="SOAPTest"
-	targetNamespace="http://www.example.org/SOAPTest/">
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://www.example.org/SOAPTest/"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-			<xsd:element name="NewOperation">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="in" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="NewOperationResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="out" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="NewOperationFault">
-				<xsd:complexType>
-					<xsd:sequence>
						<xsd:element name="fault"
-							type="xsd:string">
-						</xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="Header">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="header"
-							type="xsd:string">
-						</xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="HeaderFault1">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="headerFault1"
-							type="xsd:string">
-						</xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="HeaderFault2">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="headerFault2"
-							type="xsd:string">
-						</xsd:element>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="NewOperationRequest">
-		<wsdl:part element="tns:NewOperation" name="parameters" />
-		<wsdl:part element="tns:Header" name="header" />
-		<wsdl:part element="tns:HeaderFault1" name="headerFault1" ></wsdl:part>
-		<wsdl:part element="tns:HeaderFault2" name="headerFault2" ></wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="NewOperationResponse">
-		<wsdl:part element="tns:NewOperationResponse" name="parameters" />
-	</wsdl:message>
-	<wsdl:message name="NewOperationFault">
-		<wsdl:part name="parameters" element="tns:NewOperationFault"></wsdl:part>
-	</wsdl:message>
-	<wsdl:portType name="SOAPTest">
-		<wsdl:operation name="NewOperation">
-			<wsdl:input message="tns:NewOperationRequest" />
-			<wsdl:output message="tns:NewOperationResponse" />
-			<wsdl:fault name="fault" message="tns:NewOperationFault" />
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="SOAPTestSOAP" type="tns:SOAPTest">
-		<wsdl:operation name="NewOperation">
-			<wsdl:input />
-			<wsdl:output />
-			<wsdl:fault name="fault" />
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="SOAPTest">
-		<wsdl:port binding="tns:SOAPTestSOAP" name="SOAPTestSOAP">
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/LoadStoreCompare/.cvsignore b/tests/org.eclipse.wst.wsdl.tests/samples/LoadStoreCompare/.cvsignore
deleted file mode 100644
index d192e8e9f..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/LoadStoreCompare/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.wsdl.out
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/LoadStoreCompare/Imported.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/LoadStoreCompare/Imported.wsdl
deleted file mode 100644
index 4ca82fa6d..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/LoadStoreCompare/Imported.wsdl
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="Imported" targetNamespace="http://www.example.org/Imported/" xmlns:tns="http://www.example.org/Imported/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-  <wsdl:types>
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/Imported/">
-      <xsd:element name="NewOperationResponse" type="xsd:string"/>
-      <xsd:element name="NewOperationRequest" type="xsd:string"/>
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/>
-  </wsdl:message>
-  <wsdl:portType name="Imported">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="ImportedSOAP" type="tns:Imported">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="NewOperation">
-      <soap:operation soapAction="http://www.example.org/Imported/NewOperation"/>
-      <wsdl:input>
-        <soap:body use="literal" parts=" NewOperationRequest"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" parts=" NewOperationResponse"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="Imported">
-    <wsdl:port name="ImportedSOAP" binding="tns:ImportedSOAP">
-      <soap:address location="http://www.example.org/"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/LoadStoreCompare/LoadAndPrintTest.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/LoadStoreCompare/LoadAndPrintTest.wsdl
deleted file mode 100644
index 71bb27305..000000000
--- a/tests/org.eclipse.wst.wsdl.tests/samples/LoadStoreCompare/LoadAndPrintTest.wsdl
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/LoadAndPrintTest/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="LoadAndPrintTest" targetNamespace="http://tempuri.org/LoadAndPrintTest/" xmlns:wsdl1="http://www.example.org/Imported/">
-  <wsdl:import namespace="http://www.example.org/Imported/" location="Imported.wsdl"></wsdl:import>
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://tempuri.org/LoadAndPrintTest/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <xsd:element name="NewOperationResponse" type="xsd:string"/>
-      <xsd:element name="NewOperationRequest" type="xsd:string"/>
-            <xsd:element name="NewOperationNewFault" type="xsd:string"></xsd:element>
-        </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="NewOperationResponse">
-    <wsdl:part element="tns:NewOperationResponse" name="NewOperationResponse"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationRequest">
-    <wsdl:part element="tns:NewOperationRequest" name="NewOperationRequest"/>
-  </wsdl:message>
-  <wsdl:message name="NewOperationNewFault">
-  	<wsdl:part name="NewOperationNewFault"
-  		element="tns:NewOperationNewFault">
-  	</wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="LoadAndPrintTest">
-    <wsdl:operation name="NewOperation">
-      <wsdl:input message="tns:NewOperationRequest"/>
-      <wsdl:output message="tns:NewOperationResponse"/>
-      <wsdl:fault name="NewFault" message="tns:NewOperationNewFault"></wsdl:fault>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="LoadAndPrintTestSOAP" type="tns:LoadAndPrintTest">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="NewOperation">
-      <soap:operation soapAction="http://tempuri.org/LoadAndPrintTest/NewOperation"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="NewFault"></wsdl:fault>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="LoadAndPrintTest">
-    <wsdl:port binding="tns:LoadAndPrintTestSOAP" name="LoadAndPrintTestSOAP">
-      <soap:address location="http://tempuri.org"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>