Index: BL/Sys/FOP/DocBase.cls.xml
===================================================================
diff -u -r73208 -r73494
--- BL/Sys/FOP/DocBase.cls.xml	(.../DocBase.cls.xml)	(revision 73208)
+++ BL/Sys/FOP/DocBase.cls.xml	(.../DocBase.cls.xml)	(revision 73494)
@@ -727,7 +727,7 @@
 Prepares the DocBase WS Client :
 Set TimeOut, if defined - Can check that WS is alive, via PeekServer (param blnPeek) - Set Proxy, if specified (programmer mode)</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>cl:%SOAP.WebClient,TimeOut:%Integer,blnPeek:%Boolean</FormalSpec>
+<FormalSpec>cl:%SOAP.WebClient,TimeOut:%Integer,blnPeek:%Boolean,IsActiefDocBaseV7:%Boolean=0</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	#define globSettingUseProxy          ^Sys.FOP.Settings("DocBase","UseProxy")
@@ -740,8 +740,14 @@
 	  ;d:(blnPeek) WL^vhDBG($G(%PrefixWL)_"PeekServer OK")
 	;Do cl.SetLocation($S(locIndx>0:$LG(lbLocs,locIndx),1:""))   ; Only one location, i.e. the default is already set
 	Do cl.SetTimeOut($G(TimeOut,60))
-	Set cl.HttpUsername="uta"
-	Set cl.HttpPassword="uta"
+	If IsActiefDocBaseV7 {
+		Set cl.HttpUsername="CacheFopSvc"
+		Set cl.HttpPassword="w5c4ch324p1DF"
+	}
+	Else {
+		Set cl.HttpUsername="uta"
+		Set cl.HttpPassword="uta"
+	}
 	If $G(%blnProxy,..#UseProxy)||($G($$$globSettingUseProxy,..#UseProxy)) Do
 	. ;d WL^vhDBG("Set Proxy")
 	. Set cl.HttpProxyServer=$G($$$globSettingUseProxySub("ProxyServer"),..#ProxyServer)
@@ -768,10 +774,10 @@
 		Do ##class(TECH.Exceptions.UnimplementedException).Throw("DocBaseV7 heeft nog geen implementatie in caché voor Synchronous web service calls.")
 	}
 	
-	Set ProcSvc=$System.OBJ.New($S(IsActiefDocBaseV7:"BL.Sys.FOP.DocBaseWebClientV7.AsyncProcessorInvoker", blnAsync:"WS.FOP.DocBase2Async", 1:"WS.FOP.DocBase2"))
+	Set ProcSvc=$System.OBJ.New($S(IsActiefDocBaseV7:"BL.Sys.FOP.DocBaseV7.AsyncProcessorInvokerWebClient", blnAsync:"WS.FOP.DocBase2Async", 1:"WS.FOP.DocBase2"))
 	Set:(blnAsync) blnPeek=0
 	Set:(blnAsync) TimeOut=$G(TimeOut,30)
-	Set sc=..PrepareWSClient(ProcSvc,.TimeOut,.blnPeek)
+	Set sc=..PrepareWSClient(ProcSvc,.TimeOut,.blnPeek, IsActiefDocBaseV7)
 	Quit:($$$ISERR(sc)) sc
 	  ;d WL^vhDBG("SOAP Client class: "_ProcSvc_$$$CRLF_$$ObjToText^vhLib(ProcSvc))
 	  ;d WL^vhDBG($G(%PrefixWL)_"Invoke DocBase WS ""fopRes=ProcSvc.doSeededTasks(fopReq)"" ... ")
@@ -895,15 +901,23 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	;New cl,TimeOut,sc,CustomMsg
-	Set cl=$System.OBJ.New("WS.FOP.DocBase2Async")
+	
+	Set DocBaseV7Helper = ##class(BL.Sys.FOP.DocBaseV7Helper).%New()
+	#dim IsActiefDocBaseV7 As %Boolean= DocBaseV7Helper.IsActiefDocBaseV7()
+
+	Set cl=$System.OBJ.New($S(IsActiefDocBaseV7:"BL.Sys.FOP.DocBaseV7.AsyncProcessorInvokerWebClient", 1:"WS.FOP.DocBase2Async"))
 	Set TimeOut=20
-	Set sc=..PrepareWSClient(cl,TimeOut,0)
+	Set sc=..PrepareWSClient(cl,TimeOut,0,IsActiefDocBaseV7)
 	Quit:($$$ISERR(sc)) sc
 	Do garFopGetStatusSub()
 	Quit sc
 garFopGetStatusSub()
 	Try{
-		Set:(..#UseDocBase2) fopRes=cl.getJobStatus(fopJobID)
+		If IsActiefDocBaseV7 {
+			Set fopRes = DocBaseV7Helper.VoerUitGetJobStatus(cl, fopJobID)
+		} Else {
+			Set:(..#UseDocBase2) fopRes=cl.getJobStatus(fopJobID)
+		}
 	}Catch(E){
 		 w "Error in SOAPRequest",!
 		Set CustomMsg="FOP Async GetStatus failed ."_$$$CRLF_"fopJobID : "_$G(fopJobID)