Index: vhUpgrade/Test/WebserviceTest.cls.xml
===================================================================
diff -u -r2999 -r3095
--- vhUpgrade/Test/WebserviceTest.cls.xml	(.../WebserviceTest.cls.xml)	(revision 2999)
+++ vhUpgrade/Test/WebserviceTest.cls.xml	(.../WebserviceTest.cls.xml)	(revision 3095)
@@ -10,6 +10,11 @@
 <Default>WSDL.xml</Default>
 </Parameter>
 
+<Parameter name="WebServicePort">
+<Type>%Integer</Type>
+<Default>1972</Default>
+</Parameter>
+
 <Property name="OwnRootPath">
 <Type>%String</Type>
 </Property>
@@ -27,7 +32,7 @@
 	/// Exporteren van wsdl's
 	Do ..ExportWSDL(OwnPath)
 	w "Wacht 20 seconden.",!
-	Hang 20
+	Hang 2
 	/// Vergelijken van wsdl's
 	Write ..VergelijkWSDL(OwnPath,OtherPath)
 	
@@ -57,7 +62,6 @@
 			Set OtherFileName = ##class(TECH.Files).AppendFile(OtherPath,ExtraPath)
 			Set OwnHash = ..Hash(Path)
 			Set OtherHash = ..Hash(OtherFileName)
-			
 			If (OwnHash '= OtherHash)
 			{
 				Set Feedback = Feedback_"WSDL komen niet overeen:"_$C(13,10)
@@ -80,14 +84,34 @@
 			Set ResultSet = ##class(%ResultSet).%New("%File:FileSet")
 			Do ResultSet.Execute(Path,"*")
 			While(ResultSet.Next()) {
-				Set WebService = ResultSet.Data("Name")
-				If ##class(%File).DirectoryExists(WebService){
+				Set WebServiceDir = ResultSet.Data("Name")
+				Set WebService = ##class(%File).GetFilename(WebServiceDir)
+				If ##class(%File).DirectoryExists(WebServiceDir){
 					Set ResultSetWebMethod = ##class(%ResultSet).%New("%File:FileSet")
-					Do ResultSetWebMethod.Execute(WebService,"*")
+					Do ResultSetWebMethod.Execute(WebServiceDir,"*")
 					While(ResultSetWebMethod.Next()) {			
-						Set WebMethod = ResultSetWebMethod.Data("Name")
-						If (WebMethod'[..#BestandNaamWSDL){
-							w $C(9)_WebMethod,!
+						Set WebMethodDir = ResultSetWebMethod.Data("Name")
+						If ( ##class(%File).DirectoryExists(WebMethodDir) && (WebMethodDir'[..#BestandNaamWSDL)){
+							Set WebMethod = ##class(%File).GetFilename(WebMethodDir)
+							/// Alle binnengekomen calls overlopen en naar de twee servers sturen.
+							Set ResultSetSoapRequest = ##class(%ResultSet).%New("%File:FileSet")
+							Do ResultSetSoapRequest.Execute(WebMethodDir,"*IN*")
+							While(ResultSetSoapRequest.Next()) {	
+								Set SoapRequestFile = ResultSetSoapRequest.Data("Name")
+								
+								w WebService," -> ",WebMethod,!
+								w $C(9),"met input : ",SoapRequestFile,!
+	
+								Set StreamA = ..HttpRequest("jbl_xp","dev",..#WebServicePort, WebService, WebMethod,SoapRequestFile)
+								Set StreamB = ..HttpRequest("cache02","dev-admin1",..#WebServicePort, WebService, WebMethod,SoapRequestFile)
+								
+								Set FeedBack = ..VergelijkSoapResponses(StreamA,StreamB).Read(3000)
+								If FeedBack = "" {
+									Write $C(9)_"OK",!
+								}Else{
+									Write $C(9)_FeedBack,!	
+								}
+							}
 						}
 					}
 				}
@@ -97,6 +121,63 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VergelijkSoapResponses">
+<FormalSpec>SoapResponseA:%Stream,SoapResponseB:%Stream</FormalSpec>
+<ReturnType>%Stream</ReturnType>
+<Implementation><![CDATA[
+	Set FeedBack = ##class(%GlobalCharacterStream).%New()
+	/// Vergelijk de tweee Streams
+		While ('SoapResponseA.AtEnd) && ('SoapResponseB.AtEnd){
+			Set LineA = SoapResponseA.ReadLine()
+			Set LineB = SoapResponseB.ReadLine()
+			if (LineA '= LineB){
+				Set IsVerschil = 1
+				if (LineA["SET-COOKIE: CSPSESSIONID"){
+					Set IsVerschil = 0
+				}Elseif ((LineA["<deviceInfo>device: |") && (LineB["<deviceInfo>device: |")){
+					Set IsVerschil = 0
+				}ElseIf ((LineA["DATE: ") && (LineB["DATE: ")){
+					Set IsVerschil = 0	
+				}
+				
+				If (IsVerschil){
+					Do FeedBack.Write(LineA_$C(13,10))
+					Do FeedBack.Write(LineB_$C(13,10))
+					Do FeedBack.Write($C(13,10))
+				}
+			}
+		}
+	Quit FeedBack
+]]></Implementation>
+</Method>
+
+<Method name="HttpRequest">
+<FormalSpec>Server:%String,Namespace:%String,Port:%Integer,ClassName:%String,Method:%String,SoapRequestFile:%String</FormalSpec>
+<ReturnType>%Stream</ReturnType>
+<Implementation><![CDATA[
+	Set Location = "/csp/"_Namespace_"/"_ClassName_".cls?soap_method="_Method
+	Set Httprequest=##class(%Net.HttpRequest).%New()
+	Set Httprequest.Server = Server
+	Set Httprequest.Port = Port
+	Set Httprequest.Location = Location
+	
+	Set FileReader = ##class(TECH.File.FileReader).%New(SoapRequestFile)
+	While (FileReader.HasNextLine()){
+		Do Httprequest.EntityBody.Write(FileReader.ReadLine())
+	}
+	Do FileReader.Close()	
+	
+	Do Httprequest.Post(Location)	
+	
+	Set IO = ##class(TECH.IO).%New()
+	Do IO.Redirect()
+	Do Httprequest.HttpResponse.OutputToDevice()
+	Do IO.Reset()
+	Set Stream = IO.GeefStream()	
+	Quit Stream
+]]></Implementation>
+</Method>
+
 <Method name="ExportWSDL">
 <FormalSpec>Path:%String</FormalSpec>
 <Private>1</Private>