Index: BL/Sys/FOP/DocBase.cls.xml
===================================================================
diff -u -r2726 -r3729
--- BL/Sys/FOP/DocBase.cls.xml	(.../DocBase.cls.xml)	(revision 2726)
+++ BL/Sys/FOP/DocBase.cls.xml	(.../DocBase.cls.xml)	(revision 3729)
@@ -6,6 +6,7 @@
 <IncludeCode>BL.Sys.FOP.Common</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="ProxyServer">
 <Default>192.168.1.97</Default>
@@ -277,11 +278,11 @@
 Build the DocBase process from the arTask array and returns it via fopReq.
 fopReq als .local doorgeven</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[SeqItem:Sys.FOP.emSeqItemDocBaseWS,&fopReq:WSRequestInfo2]]></FormalSpec>
+<FormalSpec><![CDATA[SeqItem:Sys.FOP.emSeqItemDocBaseWS,&fopReq:BL.Sys.FOP.WSRequestInfo2]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Quit:(SeqItem.Type'?1(1"DocBase")) $$$ERROR($$$GeneralError,"RequestFromTaskSeq: SeqItem not correct type: "_SeqItem.Type_" in stead of ""DocBase"".")
-	Set fopReq=##class(WSRequestInfo2).%New()
+	Set fopReq=##class(BL.Sys.FOP.WSRequestInfo2).%New()
 	Set fopReq.ProcessorBeanID=..ProcessNameCVT(SeqItem.ADBProcess,$S(..#PseudoAsync&&..CallTypeAsync(SeqItem.CallType):$$$rmSync, 1:SeqItem.CallType))   ; arTask("ADB_PROCESS")
 	Set fopReq.SeedData=SeqItem.ProptList
 	;Do:(..CallTypeAsync(SeqItem.CallType)) bdpSendFOPStatus()
@@ -413,7 +414,7 @@
 Call the DocBase process via WebService and returns the status.
 In case of the Sync WS (CallType=S), the response is returned by reference (.local SyncResponse) if the FOP process was successful.</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[fopReq:WSRequestInfo,CallType:%String,&SyncResponse:WSResponse]]></FormalSpec>
+<FormalSpec><![CDATA[fopReq:BL.Sys.FOP.WSRequestInfo2,CallType:%String,&SyncResponse:BL.Sys.FOP.WSResponse]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
  #define CallTypeDFL   "S"
@@ -426,7 +427,7 @@
 	. Set sc=..RunWSProcessAsyncAndWait(fopReq,.fopJobID,.fopRes,)
 	. Set:($$$ISOK(sc))&&($G(fopJobID)="") sc=$$$ERROR($$$GeneralError,"DocBase RunWSProcessAsyncAndWait() returned an empty JobID. ")
 	. Set blnResponseObj=$IsObject($G(fopRes))
-	. Set SyncResponse=##class(WSResponse).%New()
+	. Set SyncResponse=##class(BL.Sys.FOP.WSResponse).%New()
 	. Set SyncResponse.jobID=$G(fopJobID)
 	. Set SyncResponse.jobStatus   =$S(blnResponseObj:fopRes.jobStatus,    $$$ISOK(sc):$$$adbResultFINISHED, 1:"FOP_VH_ERROR")
 	. Set SyncResponse.errorMessage=$S(blnResponseObj:fopRes.errorMessage, $$$ISOK(sc):$$$StringEmpty,       1:$$ParseStatus^vhLib(sc))
@@ -513,7 +514,7 @@
 <Description>
 Call DocBase WS via sync method. The response is returned by reference (.local SyncResponse) if the FOP process was successful.</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[fopReq:WS.FOP.WSRequestInfo,&fopRes:WSResponse,TimeOut:%Integer,blnPeek:%Boolean]]></FormalSpec>
+<FormalSpec><![CDATA[fopReq:BL.Sys.FOP.WSRequestInfo2,&fopRes:BL.Sys.FOP.WSResponse,TimeOut:%Integer,blnPeek:%Boolean]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set sc=..CallWSProcess("Sync",fopReq,,.fopRes,.TimeOut,.blnPeek)
@@ -525,7 +526,7 @@
 <Description>
 Call DocBase WS via Async method. The JobID of the async DocBase process/thread is returned immediatly (.local JobID)</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[fopReq:WS.FOP.WSRequestInfo,&JobID:%String,TimeOut:%Integer]]></FormalSpec>
+<FormalSpec><![CDATA[fopReq:BL.Sys.FOP.WSRequestInfo2,&JobID:%String,TimeOut:%Integer]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set sc=..CallWSProcess("Async",fopReq,.JobID,,.TimeOut)
@@ -540,7 +541,7 @@
 The JobID is returned, unless the DocBase WS is not available.
 The response fopRes is returned in case of fopProcess errors.</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[fopReq:WS.FOP.WSRequestInfo,&JobID:%String,&fopRes:WSAsyncResponse,TimeOut:%Integer]]></FormalSpec>
+<FormalSpec><![CDATA[fopReq:BL.Sys.FOP.WSRequestInfo2,&JobID:%String,&fopRes:BL.Sys.FOP.WSAsyncResponse,TimeOut:%Integer]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	;Set JobID="Test1234WV"
@@ -566,7 +567,7 @@
 In normal circumstances, it's the "SendFopStatus" that triggers the Wait event (when no error occurs).
 The response fopRes is returned by reference in case of fopProcess errors.]]></Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[&JobID:%String,&fopRes:WSAsyncResponse,WaitEventTimeOut:%Integer=10]]></FormalSpec>
+<FormalSpec><![CDATA[&JobID:%String,&fopRes:BL.Sys.FOP.WSAsyncResponse,WaitEventTimeOut:%Integer=10]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 #define FopResStatus(%v)   $IsObject($G(fopRes))&&(fopRes.jobStatus=%v)
@@ -670,7 +671,7 @@
 	
 	If $G(blnSimulOnError)&&($$$ISERR(scAsync))&&('$IsObject($G(fopRes))) Do
 	. ; Simulate AsyncResponseObj
-	. Set fopRes=##class(WSAsyncResponse).%New()
+	. Set fopRes=##class(BL.Sys.FOP.WSAsyncResponse).%New()
 	. Set fopRes.jobStatus="FOP_VH_ERROR"
 	. Set fopRes.errorMessage=$$ParseStatus^vhLib(scAsync)
 	Quit
@@ -740,7 +741,7 @@
 The response depends on the specified Type: sync returns fopRes and JobID, Async returns JobID only (.locals fopRes and JobID)
 Returns the Status as the result, and sends a mail in case of a WS error ($ZTRAP).</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[Type:%String,fopReq:BL.Sys.FOP.WSRequestInfo2,&JobID:%String,&fopRes:WSResponse,TimeOut:%Integer,blnPeek:%Boolean]]></FormalSpec>
+<FormalSpec><![CDATA[Type:%String,fopReq:BL.Sys.FOP.WSRequestInfo2,&JobID:%String,&fopRes:BL.Sys.FOP.WSResponse,TimeOut:%Integer,blnPeek:%Boolean]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	set blnAsync=($$$UCase(Type)'?1(1"S",1"SYNC"))
@@ -867,7 +868,7 @@
 Set msg="Status: "_fopStatus_$S($L(ErrorMsg):$$$CRLF_ErrorMsg, 1:"")
 RetriesOnError: Aantal nieuwe pogingen (getJobStatus) wanneer de method faalt (WebService blijkt soms niet stabiel te zijn)</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[fopJobID:%String,&fopRes:WSAsyncResponse,RetriesOnError:%Integer=0]]></FormalSpec>
+<FormalSpec><![CDATA[fopJobID:%String,&fopRes:BL.Sys.FOP.WSAsyncResponse,RetriesOnError:%Integer=0]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	;New cl,TimeOut,sc,CustomMsg
@@ -903,7 +904,7 @@
 w ##class(BL.Sys.FOP.DocBase).GetAsyncResponseOK(...)
 Set msg="Status: "_fopStatus_$S($L(ErrorMsg):$$$CRLF_ErrorMsg, 1:"")</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[fopJobID:%String,&fopRes:WSAsyncResponse,&fopStatus:%String,&ErrorMsg:%String]]></FormalSpec>
+<FormalSpec><![CDATA[fopJobID:%String,&fopRes:BL.Sys.FOP.WSAsyncResponse,&fopStatus:%String,&ErrorMsg:%String]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set sc=..GetAsyncResponse(.fopJobID, .fopRes)
@@ -963,7 +964,7 @@
 
 <Method name="HandleFopResponseError">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>fopRes:WSResponse,JobID:%String,fopReq:WSRequestInfo</FormalSpec>
+<FormalSpec>fopRes:WS.FOP.WSResponse,JobID:%String,fopReq:WS.FOP.WSRequestInfo</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set:($G(JobID)="") JobID=$S($IsObject(fopRes):fopRes.jobID, 1:"")