Index: BL/Sys/FOP/DocBase.cls.xml
===================================================================
diff -u -r31131 -r41195
--- BL/Sys/FOP/DocBase.cls.xml	(.../DocBase.cls.xml)	(revision 31131)
+++ BL/Sys/FOP/DocBase.cls.xml	(.../DocBase.cls.xml)	(revision 41195)
@@ -392,7 +392,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	  d WLIP^vhDBG(97,"PeekServer Test")
-	Set cl=$System.OBJ.New("WS.FOP.DocBase")
+	Set cl=$System.OBJ.New("WS.FOP.DocBase2")
 	If blnDirect Do  Quit ""
 	. Do tpsPeekServerDirect
 	Set locIndx=cl.PeekSOAPServer("",0,"FOP_ADB_ERR")
@@ -414,24 +414,22 @@
 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:BL.Sys.FOP.WSRequestInfo2,CallType:%String,&SyncResponse:BL.Sys.FOP.WSResponse]]></FormalSpec>
+<FormalSpec><![CDATA[fopReq:BL.Sys.FOP.WSRequestInfo2,CallType:%String,&SyncResponse:WS.FOP2.JobResult]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
  #define CallTypeDFL   "S"
  	;New fopRes,fopJobID,Rslt,sc,blnResponseObj,blnOK,oLog,blnSoapTrapped,msg,msgData,tmpItem,ResourceID,ADBTempLog
 	Quit:('$IsObject(fopReq)) $$$ERROR($$$GeneralError,"No WSRequestInfo object")
-	Quit:('..#UseDocBase2)&&(fopReq.process="") $$$ERROR($$$GeneralError,"WSRequestInfo: ADBProcess empty")
 	Quit:(..#UseDocBase2)&&(fopReq.ProcessorBeanID="") $$$ERROR($$$GeneralError,"WSRequestInfo: ADBProcess empty")
 	Set:($G(CallType)="") CallType=$$$CallTypeDFL
 	If CallType="A" Do
 	. 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(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))
-	. ;Set sc=$S($L($G(fopJobID)):$$$OK, 1:$$$ERROR($$$GeneralError,"DocBase RunWSProcessAsyncAndWait() returned an empty JobID. "))
+	. Set SyncResponse=##class(WS.FOP2.JobResult).%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))
 	Else  If CallType="S" Do
 	. Set sc=..RunWSProcessSync(fopReq,.fopRes,,)
 	. ;Set:($$$ISOK(sc)) SyncResponse=$G(fopRes)
@@ -523,7 +521,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:BL.Sys.FOP.WSRequestInfo2,&fopRes:BL.Sys.FOP.WSResponse,TimeOut:%Integer,blnPeek:%Boolean]]></FormalSpec>
+<FormalSpec><![CDATA[fopReq:BL.Sys.FOP.WSRequestInfo2,&fopRes:WS.FOP2.JobResult,TimeOut:%Integer,blnPeek:%Boolean]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set sc=..CallWSProcess("Sync",fopReq,,.fopRes,.TimeOut,.blnPeek)
@@ -550,7 +548,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:BL.Sys.FOP.WSRequestInfo2,&JobID:%String,&fopRes:BL.Sys.FOP.WSAsyncResponse,TimeOut:%Integer]]></FormalSpec>
+<FormalSpec><![CDATA[fopReq:BL.Sys.FOP.WSRequestInfo2,&JobID:%String,&fopRes:WS.FOP3.JobInfo,TimeOut:%Integer]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	;Set JobID="Test1234WV"
@@ -576,7 +574,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:BL.Sys.FOP.WSAsyncResponse,WaitEventTimeOut:%Integer=10]]></FormalSpec>
+<FormalSpec><![CDATA[&JobID:%String,&fopRes:WS.FOP3.JobInfo,WaitEventTimeOut:%Integer=10]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 #define FopResStatus(%v)   $IsObject($G(fopRes))&&(fopRes.jobStatus=%v)
@@ -680,7 +678,7 @@
 	
 	If $G(blnSimulOnError)&&($$$ISERR(scAsync))&&('$IsObject($G(fopRes))) Do
 	. ; Simulate AsyncResponseObj
-	. Set fopRes=##class(BL.Sys.FOP.WSAsyncResponse).%New()
+	. Set fopRes=##class(WS.FOP3.JobInfo).%New()
 	. Set fopRes.jobStatus="FOP_VH_ERROR"
 	. Set fopRes.errorMessage=$$ParseStatus^vhLib(scAsync)
 	Quit
@@ -750,7 +748,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:BL.Sys.FOP.WSResponse,TimeOut:%Integer,blnPeek:%Boolean]]></FormalSpec>
+<FormalSpec><![CDATA[Type:%String,fopReq:BL.Sys.FOP.WSRequestInfo2,&JobID:%String,&fopRes:WS.FOP2.JobResult,TimeOut:%Integer,blnPeek:%Boolean]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	set blnAsync=($$$UCase(Type)'?1(1"S",1"SYNC"))
@@ -873,12 +871,11 @@
 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:BL.Sys.FOP.WSAsyncResponse,RetriesOnError:%Integer=0]]></FormalSpec>
+<FormalSpec><![CDATA[fopJobID:%String,&fopRes:WS.FOP3.JobInfo,RetriesOnError:%Integer=0]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	;New cl,TimeOut,sc,CustomMsg
 	Set cl=$System.OBJ.New($S(..#UseDocBase2:"WS.FOP.DocBase2Async", 1:"WS.FOP.DocBaseAsync"))
-	;Set cl=$System.OBJ.New("WS.FOP.DocBaseAsync")
 	Set TimeOut=20
 	Set sc=..PrepareWSClient(cl,TimeOut,0)
 	Quit:($$$ISERR(sc)) sc
@@ -905,7 +902,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:BL.Sys.FOP.WSAsyncResponse,&fopStatus:%String,&ErrorMsg:%String]]></FormalSpec>
+<FormalSpec><![CDATA[fopJobID:%String,&fopRes:WS.FOP3.JobInfo,&fopStatus:%String,&ErrorMsg:%String]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set sc=..GetAsyncResponse(.fopJobID, .fopRes)
@@ -917,73 +914,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="HandleFopResponse">
-<Description>
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ ///
-|  Methods handling the response of the DocBase web service:            | ///
-|  calltypes: WSResponse / WSAsyncResponse                              | ///
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ ///
-
-Uitlezen/verwerken van de resultaten</Description>
-<ClassMethod>1</ClassMethod>
-<FormalSpec>fopRes:WS.FOP.WSResponse,fopReq:WS.FOP.WSRequestInfo</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
- /*
-#define StringEmpty   $C(0)
-
-	;New sc,FileName
-	Quit:('$IsObject(fopRes)) $$$OK   ; eigenlijk niet, maar allee ...
-	Set sc=$$$OK
-	If fopRes.errorMessage=$$$StringEmpty Do
-	. w:($G(%DebugW,0)) "DocBase process ["_fopReq.process_"]: successful !",!
-	. w:($G(%DebugW,0)) "JobID:"_fopRes.jobID_"   STATUS: "_fopRes.jobStatus_$S($L(fopRes.data)<50:$$$CRLF_"Feedback: "_fopRes.data,1:""),!
-	. If fopReq.process="RenderOnly" Do
-	..  Set FileName=##class(%File).NormalizeDirectory("C:\FOP\PDFTemp\")_"SampleA_cache.pdf"
-	..  Set sc=$$fprResponseToFile(fopRes,FileName)
-	..  d WL^vhDBG($G(%PrefixWL)_"Response.data saved to file : "_FileName_$$$CRLF_" --> Status msg: "_$$ParseStatus^vhLib(sc))
-	. Else  If fopReq.process?1(1"SimpleXslTransformationOnly") Do
-	..  Set FileName=##class(%File).NormalizeDirectory("C:\FOP\PDFTemp\")_"Result.fo.xml"
-	..  Set sc=$$fprResponseToFile(fopRes,FileName)
-	..  d WL^vhDBG($G(%PrefixWL)_"Response.data saved to file : ["_$$$Server_"] "_FileName_$$$CRLF_" --> Status msg: "_$$ParseStatus^vhLib(sc))
-	. Else  Do
-	..  d WL^vhDBG($G(%PrefixWL)_"Data: "_fopRes.data)
-	Else  Do
-	. Set sc=..HandleFopResponseError(fopRes,fopReq)
-	Quit sc
-fprResponseToFile(response,FileName)
-	;New sc,stream
-	Set stream=##class(%FileCharacterStream).%New()
-	Set sc=stream.LinkToFile(FileName)
-	Quit:($$$ISERR(sc)) sc
-	Set sc=stream.Write(response.data)
-	Set sc=stream.SaveStream()
-	Quit $$$OK
- */
-]]></Implementation>
-</Method>
-
-<Method name="HandleFopResponseError">
-<ClassMethod>1</ClassMethod>
-<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:"")
-	Set FopStatus=fopRes.jobStatus
-	Set ErrorMsg=fopRes.errorMessage
-	Set ErrorMsgShort=$P(ErrorMsg,$C(10),1,5)
- /*
-#define StringEmpty   $C(0)
-	Quit:(fopRes.errorMessage=$$$StringEmpty) $$$OK
-	w "DocBase process ["_$S($IsObject($G(fopReq)):fopReq.process,1:"")_"]: Error in SOAPmethod !",!
-	w "Error Dtl: zie DebugWin",!
-	d WL^vhDBG($G(%PrefixWL)_"ERROR:  JobID:"_fopRes.jobID_"   "_$$$CRLF_"STATUS: "_fopRes.jobStatus)
-	d WL^vhDBG($G(%PrefixWL)_"MSG: "_$P(fopRes.errorMessage,$C(10),1,5))
-	Quit $$$ERROR($$$GeneralError,"Error in DocBase processing: see log")
- */
-]]></Implementation>
-</Method>
-
 <Method name="AddToTempLog">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ResourceID:%String,LogData:%String,Delim:%String="\",blnCheckEmpty:%Boolean=0</FormalSpec>