Index: BL/Sys/FOP/DocBase.cls.xml
===================================================================
diff -u -r73494 -r74029
--- BL/Sys/FOP/DocBase.cls.xml	(.../DocBase.cls.xml)	(revision 73494)
+++ BL/Sys/FOP/DocBase.cls.xml	(.../DocBase.cls.xml)	(revision 74029)
@@ -72,207 +72,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="RequestFromTest">
-<Description>
-Build the DocBase process to test DocBase2 functionality
-Oproepen als :
-	s sc=##class(BL.Sys.FOP.DocBase).RequestFromTest()   w sc,!</Description>
-<ClassMethod>1</ClassMethod>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-
- /*
-	String testFile = "file:///E:/FOP/Data/Facts002c.xml";
-	String outFilename = "D:\\projects\\VanHoecke\\data\\Facts002c.xml.byUrl.pdf";
-	
-	String processorBeanId = "adb_simpleRenderOnlySequenceProcessor";
-	String renderProcess = "adb_renderTask";
-	
-	ProcessorInvokerService procSvc = new ProcessorInvokerService();
-	BeanRuntimeProperty prop = new BeanRuntimeProperty();
-	
-	ArrayList properties = new ArrayList();
-	addBeanRuntimeProperty(properties, renderProcess, "renderInfo.conditionalProcessing", false);
-	addBeanRuntimeProperty(properties, renderProcess, "renderInfo.renderOutputType", "PDF");
-	addBeanRuntimeProperty(properties, renderProcess, "renderInfo.renderInputType", "xml/xsl");
-	addBeanRuntimeProperty(properties, renderProcess, "renderInfo.sourceBytesFromUrl", testFile);
-	
-	addBeanRuntimeProperty(properties, renderProcess, "dpInfo.documentName", "Factuur");
-	addBeanRuntimeProperty(properties, renderProcess, "dpInfo.documentType", "fo");
-	addBeanRuntimeProperty(properties, renderProcess, "dpInfo.stage", "DEV");
-	
-	JobResult jResult = procSvc.doSeededTasks(processorBeanId, properties);
-	TaskResult tResult = jResult.tasksResults[0];
-	
-	RenderResult rResult = (RenderResult)tResult.result;
-	writeFile(rResult.renderResult, outFilename);
-
-
-	String testFile = "file:///E:/FOP/Data/Facts002c.xml";
-	String outputFilename = "E:/FOP/PDFTest/Facts002c.xml.pdf";
-	String cacheURL = "http://cache02/csp/Admin1/WS.FOP.StatusServer.cls";
-	
-	String processorBeanId = "vh_renderAndSaveToFileNotifyProcessor";
-	String renderTask = "adb_renderTask";
-	String saveTask = "adb_saveTask";
-	String notifyTask = "vh_notificationTask";
-	
-	ProcessorInvokerService procSvc = new ProcessorInvokerService();
-	fopProcessInvoker.BeanRuntimeProperty prop = new fopProcessInvoker.BeanRuntimeProperty();
-	
-	ArrayList properties = new ArrayList();
-	addBeanRuntimeProperty(properties, renderTask, "renderInfo.conditionalProcessing", false);
-	addBeanRuntimeProperty(properties, renderTask, "renderInfo.renderOutputType", "PDF");
-	addBeanRuntimeProperty(properties, renderTask, "renderInfo.renderInputType", "xml/xsl");
-	addBeanRuntimeProperty(properties, renderTask, "renderInfo.sourceBytesToRender", readData(testFile));
-	
-	addBeanRuntimeProperty(properties, renderTask, "dpInfo.documentName", "Factuur");
-	addBeanRuntimeProperty(properties, renderTask, "dpInfo.documentType", "fo");
-	addBeanRuntimeProperty(properties, renderTask, "dpInfo.stage", "DEV");
-	
-	addBeanRuntimeProperty(properties, saveTask, "outputFileName", outputFilename);
-	
-	addBeanRuntimeProperty(properties, notifyTask, "delegate.cacheWebServiceURL", cacheURL);
-	addBeanRuntimeProperty(properties, processorBeanId, "defaultErrorHandler.cacheNotifier.cacheWebServiceURL", cacheURL);
-	
-	JobResult jResult = procSvc.doSeededTasks(processorBeanId, properties);
-	
-	System.Console.WriteLine("jobId returned: [" + jResult.jobId + "]");
-
-
-            String testFile = "file:///E:/FOP/Data/Facts002c.xml";
-            String outputFilename = "E:/FOP/PDFTest/transformed.xml";
-            String xsltFile = "D:\\projects\\VanHoecke\\data\\sample.xslt";
-
-            String processorBeanId = "vh_XSLTransformAndFileSequenceProcessor";
-            String loadTask = "adb_loadTask";
-            String transformTask = "adb_xsltTransformationTask";
-            String saveTask = "adb_saveTask";
-
-            ProcessorInvokerService procSvc = new ProcessorInvokerService();
-            BeanRuntimeProperty prop = new BeanRuntimeProperty();
-
-            ArrayList properties = new ArrayList();
-            addBeanRuntimeProperty(properties, loadTask, "inputFileUrl", testFile);
-
-            addBeanRuntimeProperty(properties, transformTask, "xslBytes", readData(xsltFile));
-
-            addBeanRuntimeProperty(properties, saveTask, "outputFileName", outputFilename);
-
-            JobResult jResult = procSvc.doSeededTasks(processorBeanId, properties);
-
-            System.Console.WriteLine("jobId returned: [" + jResult.jobId + "]");
-
- */
-
-	 d WLIP^vhDBG(97,"Start")
-	
-	// Init data/objects
-	Set lbDefs=$LB("CLS.MTH.XML","BL.Flow.Factuur.Doc","GetFopXML",$LB($LB(255275,,"C")))
-	Set testFile = "file:///E:/FOP/Data/Facts002c.xml"
-	Set testFile2 = "file:///E:/FOP/Data/hafeleTest.xml"
-	// Set XSLPath="file:///C:/FOP/XSLT/MapToFlowOfferte.xslt"
-	Set XSLPath="c:/FOP/XSLT/MapToFlowOfferte_v2007r3sp1.xslt"   ; MapToFlowOfferte_v2007r3sp1.xslt   ; MapToFlowOfferte.xslt
-	;Set XSLPath="file:///fop/e$/FOP/XSLT/MapToFlowOfferte.xslt"
-	Set outFilename = "E:/FOP/PDFTest/Factuur/Facts002c.xml.pdf"
-	Set outFilename2 = "E:/FOP/PDFTest/Factuur/EDI_HafeleTest_7r3sp1_001.xml"
-	Set UrlSFS=""   ; ^Sys.FOP.Settings("DocBase","SendFOPStatus-URL",$$$UCase($$$Server)_"\"_$$$UCase($$$NSpace))
-	// Processor data
-	;Set processorBeanId = "vh_renderAndEmailProcessor"
-	;Set processorBeanId = "vh_renderAndSaveToFileNotifyProcessor"
-	;Set processorBeanId = "adb_simpleRenderOnlySequenceProcessor"
-	Set processorBeanId = "vh_XSLTransformAndFileSequenceProcessor"
-	Set renderTask = "adb_renderTask"
-	Set saveTask = "adb_saveTask"
-	Set mailTask = "adb_mailSenderTask"
-	Set notifyTask = "vh_notificationTask"
-	Set loadTask = "adb_loadTask"
-	Set transformTask = "adb_xsltTransformationTask"
-	
-	Set FStream=##class(%FileBinaryStream).%New()
-	Do tfxOpenFileStream(.FStream,$G(XSLPath))   ; Stream ophalen
-	
-	Set ProptList=##class(%ListOfObjects).%New()
-	Do addBeanRuntimeProperty(ProptList, loadTask, "inputFileUrl", testFile2)
-	Do addBeanRuntimeProperty(ProptList, transformTask, "xslBytes", FStream, "Stream")
-	Do addBeanRuntimeProperty(ProptList, saveTask, "outputFileName", outFilename2)
-	
-	/*
-	// Propts for RenderInfo
-	Do addBeanRuntimeProperty(ProptList, renderTask, "renderInfo.conditionalProcessing", 0, "Bool")   ; true/false
-	Do addBeanRuntimeProperty(ProptList, renderTask, "renderInfo.renderOutputType", "PDF")
-	Do addBeanRuntimeProperty(ProptList, renderTask, "renderInfo.renderInputType", "xml/xsl")
-	;Do addBeanRuntimeProperty(ProptList, renderTask, "renderInfo.sourceBytesFromUrl", testFile)
-	Do addBeanRuntimeProperty(ProptList, renderTask, "renderInfo.sourceBytesToRender", $$GetDataStream(lbDefs), "Stream")
-	Set xsltParams = "LOCALE=VH_nl"
-	;Do addBeanRuntimeProperty(ProptList, renderTask, "renderInfo.renderXsltParamList", xsltParams)
-	// Propts for dpInfo	
-	Do addBeanRuntimeProperty(ProptList, renderTask, "dpInfo.documentName", "factuur_01.00")   ; "Factuur"
-	Do addBeanRuntimeProperty(ProptList, renderTask, "dpInfo.documentType", "fo")
-	Do addBeanRuntimeProperty(ProptList, renderTask, "dpInfo.stage", "DEV")
-	// Save to file
-	Do addBeanRuntimeProperty(ProptList, saveTask, "outputFileName", outFilename)
-	// Create email
-	;Do addBeanRuntimeProperty(ProptList, mailTask, "mailTo", "wv@vanhoecke.be")
-	;Do addBeanRuntimeProperty(ProptList, mailTask, "mailFrom", "fopAdmin@vanhoecke.be")
-	;Do addBeanRuntimeProperty(ProptList, mailTask, "subject", "subject")
-	;Do addBeanRuntimeProperty(ProptList, mailTask, "text", "mail body text")
-	;Do addBeanRuntimeProperty(ProptList, mailTask, "attachmentName", "myFile.pdf")
-	// SendFopStatus URL
-	;Do addBeanRuntimeProperty(ProptList, notifyTask, "delegate.cacheWebServiceURL", UrlSFS)
-	;Do addBeanRuntimeProperty(ProptList, processorBeanId, "defaultErrorHandler.cacheNotifier.cacheWebServiceURL", UrlSFS)	
-*/
-	// Call WS
-	;Set ProcSvc=$System.OBJ.New("WS.FOP.DocBase2Async")
-	Set ProcSvc=$System.OBJ.New("WS.FOP.DocBase2")   ; ProcessorInvokerService
-	Set blnPeek=0
-	Set TimeOut=$G(TimeOut,20)
-	Set sc=..PrepareWSClient(ProcSvc,.TimeOut,.blnPeek)
-	Quit:($$$ISERR(sc)) sc	
-	Set Response=ProcSvc.doSeededTasks(processorBeanId, ProptList)
-	;Do HandleResultAsync(Response)
-	Do HandleResultSync(Response)
- 	Quit $$$OK
-	
-	
-tfxOpenFileStream(FStream,FilePath)   ; FStream als .local doorgeven
-	Set tmpStream=##class(%FileBinaryStream).%New()
-	Set sc=tmpStream.LinkToFile(FilePath)
-	If $$$ISOK(sc) Do
-	. Do FStream.CopyFrom(tmpStream)
-	.  ;d WL^vhDBG("Stream from file "_FilePath_"  Size: "_tmpStream.Size)
-	Else  Do
-	. d WL^vhDBG("Fout bij openen van de FileStream: LinkToFile="_$$ParseStatus^vhLib(sc))
-	. Set FStream=""
-	Quit
-
-GetDataStream(lbDefs)
-	Set StreamObj=##class(%FileBinaryStream).%New()
-	Set sc=$zobjclassmethod($LI(lbDefs,2),$LI(lbDefs,3),.StreamObj,$LI(lbDefs,4))   ; Call classmethod to fetch data into StreamObj
-	Quit StreamObj
-
-HandleResultAsync(JobID)
-	w "FOP Started: initial feedback: JobID="_JobID,!
-	Set ResourceID=..ResourceNameFromJobID(JobID)
-	Do:($L(ResourceID)) ..AddToTempLog(ResourceID,"Log: "_processorBeanId_"\JobID OK")   ; "="_JobID
-	Set:($$$ISOK(sc))&&($L($G(JobID))) sc=..WaitUntilAsyncFinished(JobID,.fopRes,1)   ; sc=$$rawWaitUntilFinished(JobID)
-	w "fopResponse for "_JobID_" :  DumpObject ",!
-	w $$ObjToText^vhLib(fopRes)	
-	Quit	
-HandleResultSync(JobResult)
-	w "Result Sync : fopResponse DumpObject ",!
-	w $$ObjToText^vhLib(JobResult)	
-	Set Key=""
-	For  Set TaskResult=JobResult.tasksResults.GetNext(.Key) Quit:(Key="")  Do
-	. w "TaskResult "_Key_" :  DumpObject ",!
-	. w $$ObjToText^vhLib(TaskResult)
- 	Quit
-addBeanRuntimeProperty(ProptList,BeanName,ProptName,ProptValue, SpecialType)
-	Do ##class(BL.Sys.FOP.WSRequestInfo2).AddBeanRuntimeProperty(ProptList,BeanName,ProptName,.ProptValue, .SpecialType)
-	Quit
-]]></Implementation>
-</Method>
-
 <Method name="RequestFromTaskSeq">
 <Description>
 Build the DocBase process from the arTask array and returns it via fopReq.
@@ -492,7 +291,7 @@
 	Set Body=Body_"Error message: "_$$ParseStatus^vhLib($G(Error))_$$$CRLF
 	Set Body=Body_""_$$$CRLF
 	Set Body=Body_$$$CRLF_"Groep   : "_"DocBase"
-	Set Body=Body_$$$CRLF_"Actie   : "_"RunDocBaseWS"
+	Set Body=Body_$$$CRLF_"Actie   : "_"RunDocBaseWS" _ "  v7.0.1  (NEW DOCBASE01)"
 	Set Body=Body_$$$CRLF_"Detail  : "_msgData
 	;Set Body=Body_$$$CRLF_"Error   : "_$$ParseStatus^vhLib(Error)
 	Set Body=Body_$$$CRLF