Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/personality/SFS/Melder.cls.xml
===================================================================
diff -u -r35902 -r35944
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/personality/SFS/Melder.cls.xml	(.../Melder.cls.xml)	(revision 35902)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/personality/SFS/Melder.cls.xml	(.../Melder.cls.xml)	(revision 35944)
@@ -3,54 +3,19 @@
 <Class name="APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.SFS.Melder">
 <Super>APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.SapMelder</Super>
 
-<Method name="Meld">
-<FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
-<Implementation><![CDATA[
-	set ..Offerte = Offerte
-	Try {
-		#dim OfferteID As %String = ..Offerte.GeefID()
-		#dim OfferteDto As %RegisteredObject = ..GeefOfferteDto()
-		#dim XMLStream As %GlobalCharacterStream = ..GeefXMLStream(OfferteDto)
-		#dim HttpMessage As TECH.Http.Message = ..GeefHttpMessage(XMLStream)
-		Do ..VerzendHttpMessage(HttpMessage)
-	}
-	Catch {
-		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		#dim ErrorMsg As %String = "De bestelling "_$G(OfferteID)_" van de eindklant kon niet naar SFS verzonden worden."
-
-		Do ..Logger.ErrorMail(ErrorMsg,Exception.ToString())
-
-		Set NieuweExceptie = ##class(TECH.Exceptions.BaseException).%New(Exception.GeefExceptionCode(),ErrorMsg)
-		Do NieuweExceptie.VoegToeInnerExceptie(Exception)
-		Do ##class(TECH.ExceptionHandler).Throw(NieuweExceptie)	
-	}
-]]></Implementation>
-</Method>
-
-<Method name="GeefOfferteDto">
+<Method name="GeefPersonality">
 <Private>1</Private>
-<ReturnType>APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.Offerte</ReturnType>
-<Implementation><![CDATA[	Quit ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.OfferteGenerator).%New().GeefOfferteDto(..Offerte)
+<ReturnType>DOM.common.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.common.SFSPersonality).Instance()
 ]]></Implementation>
 </Method>
 
-<Method name="GeefXMLStream">
-<FormalSpec>OfferteDto:%RegisteredObject</FormalSpec>
-<Private>1</Private>
-<ReturnType>%GlobalCharacterStream</ReturnType>
-<Implementation><![CDATA[
-	Set Stream = ##class(%GlobalCharacterStream).%New()
-	Do ##class(TECH.DataTransferObjectUtils).VoegToeXMLAanStream(.Stream,OfferteDto)
-	Quit Stream
-]]></Implementation>
-</Method>
-
 <Method name="GeefHttpMessage">
 <FormalSpec>XMLStream:%Stream</FormalSpec>
 <Private>1</Private>
 <ReturnType>TECH.Http.Message</ReturnType>
 <Implementation><![CDATA[
-	Set HttpMessage=##class(TECH.Http.Message).%New()
+	#dim HttpMessage As TECH.Http.Message = ##class(TECH.Http.Message).%New()
 	
 	Set HttpMessage.Server = "extranet.sfsservices.biz"
 	Set HttpMessage.Location = "/xic34/sap/xi/adapter_plain"   ; Productie : "xic34"    <->    Test : "xic30" 
@@ -71,24 +36,6 @@
 	Quit HttpMessage
 ]]></Implementation>
 </Method>
-
-<Method name="VerzendHttpMessage">
-<FormalSpec>HttpMessage:TECH.Http.Message</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim HttpPoster As TECH.Http.Poster = ##class(TECH.Context).Instance().GeefHttpAPI().GeefHttpPoster()
-	Try {
-		Do HttpPoster.PostMessage(HttpMessage)
-	}
-	Catch {
-		#dim Exception As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
-		Do ..Logger.ErrorMail("SFS_ORDERS2_POST_FAILED","Offerte = "_..Offerte.GeefID()_" Error: "_Exception.GeefOmschrijving())
-		; Rethrow ??? 
-	}
-
-	Do ..Logger.Info("SFS_ORDERS2_POST_SUCCESS","Offerte = "_..Offerte.GeefID())
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/personality/common/SapMelder.cls.xml
===================================================================
diff -u -r35900 -r35944
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/personality/common/SapMelder.cls.xml	(.../SapMelder.cls.xml)	(revision 35900)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/personality/common/SapMelder.cls.xml	(.../SapMelder.cls.xml)	(revision 35944)
@@ -9,41 +9,74 @@
 <Private>1</Private>
 </Property>
 
+<Property name="OfferteGenerator">
+<Type>APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.OfferteGenerator</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Logger">
 <Type>vhLib.Logger</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
+<FormalSpec>Logger:vhLib.Logger="",OfferteGenerator:APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.OfferteGenerator=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..Logger = ##class(vhLib.Logger).%New("APPS.VKP")
-	
+	Set ..Logger = $$$Inject(Logger, ##class(vhLib.Logger).%New("APPS.VKP"))
+	Set ..OfferteGenerator = $$$Inject(OfferteGenerator, ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.OfferteGenerator).%New())
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="Meld">
 <FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[
+	Set ..Offerte = Offerte
+	
+	Try {
+		#dim OfferteDto As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.Offerte = ..OfferteGenerator.GeefOfferteDto(..Offerte)
+		#dim XmlStream As %GlobalCharacterStream = ..GeefXMLStream(OfferteDto)
+		#dim HttpMessage As TECH.Http.Message = ..GeefHttpMessage(XmlStream)
+		
+		Do ..VerzendHttpMessage(HttpMessage)
+	} Catch {
+		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		#dim OfferteId As %String = ..Offerte.GeefID()
+		#dim Omschrijving As %String = "De bestelling " _ $Get(OfferteId) _ " van de eindklant kon niet naar " _ ..GeefPersonality().GeefNaam() _ " verzonden worden."
+
+		Do ..Logger.ErrorMail(Omschrijving, Exceptie.ToString())
+
+		#dim NieuweExceptie As TECH.Exceptions.Exception = ##class(TECH.Exceptions.BaseException).%New(Exceptie.GeefExceptionCode(), Omschrijving)
+		Do NieuweExceptie.VoegToeInnerExceptie(Exceptie)
+		
+		Do ##class(TECH.ExceptionHandler).Throw(NieuweExceptie)	
+	}
+]]></Implementation>
 </Method>
 
-<Method name="GeefOfferteDto">
+<Method name="GeefPersonality">
 <Abstract>1</Abstract>
 <Private>1</Private>
-<ReturnType>APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.Offerte</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<ReturnType>DOM.common.Personality</ReturnType>
 </Method>
 
 <Method name="GeefXMLStream">
-<Abstract>1</Abstract>
+<Final>1</Final>
 <FormalSpec>OfferteDto:%RegisteredObject</FormalSpec>
 <Private>1</Private>
 <ReturnType>%GlobalCharacterStream</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[
+	#dim Stream As %GlobalCharacterStream = ##class(%GlobalCharacterStream).%New()
+	
+	Do ##class(TECH.DataTransferObjectUtils).VoegToeXMLAanStream(.Stream, OfferteDto)
+	
+	Quit Stream
+]]></Implementation>
 </Method>
 
 <Method name="GeefHttpMessage">
@@ -55,10 +88,21 @@
 </Method>
 
 <Method name="VerzendHttpMessage">
-<Abstract>1</Abstract>
+<Final>1</Final>
 <FormalSpec>HttpMessage:TECH.Http.Message</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[
+	Try {
+		#dim HttpPoster As TECH.Http.Poster = ##class(TECH.Context).Instance().GeefHttpAPI().GeefHttpPoster()
+		Do HttpPoster.PostMessage(HttpMessage)
+		
+		Do ..Logger.Info(..GeefPersonality().GeefNaam() _ "_ORDERS2_POST_SUCCESS","Offerte = " _ ..Offerte.GeefID())
+	} Catch {
+		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		
+		Do ..Logger.ErrorMail(..GeefPersonality().GeefNaam() _ "_ORDERS2_POST_FAILED", "Offerte = " _ ..Offerte.GeefID() _ " Error: " _ Exceptie.GeefOmschrijving())
+	}
+]]></Implementation>
 </Method>
 </Class>
 
Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/personality/common/SapMelder/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/personality/common/SapMelder/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/personality/common/SapMelder/Test.cls.xml	(revision 35944)
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.SapMelder.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="OfferteStub">
+<Type>vhTest.Mock.APPS.VKP.Offerte</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Set ..OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do ..OfferteStub.IndienMethodCall("GeefID").DanReturn($$$DummyInteger)
+]]></Implementation>
+</Method>
+
+<Method name="Test: HttpPoster wordt opgeroepen door Meld-method">
+<Implementation><![CDATA[
+	#dim HttpPosterMock As vhTest.Mock.TECH.Http.Poster = ##class(vhTest.Mock.TECH.Http.Poster).%New()
+	Do HttpPosterMock.VerwachtMethodCall("PostMessage", $$$ElkeWaarde)
+	
+	#dim HttpApiMock As vhTest.Mock.TECH.Http.HttpAPI = ##class(vhTest.Mock.TECH.Http.HttpAPI).MockInstance()
+	Do HttpApiMock.VerwachtMethodCall("GeefHttpPoster").DanReturn(HttpPosterMock)
+	
+	#dim OfferteGeneratorStub As vhTest.Mock.APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.OfferteGenerator = ##class(vhTest.Mock.APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.OfferteGenerator).%New()
+	Do OfferteGeneratorStub.IndienMethodCall("GeefOfferteDto", $$$ElkeWaarde).DanReturn(##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.Offerte).%New())
+
+	#dim SapMelder As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.SapMelder = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.HaefeleBE.Melder).%New("", OfferteGeneratorStub)
+	Do SapMelder.Meld(..OfferteStub)
+	
+	Do HttpApiMock.Verifieer()
+	Do HttpPosterMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: OfferteGenerator wordt opgeroepen door Meld-method">
+<Implementation><![CDATA[
+	#dim OfferteGeneratorMock As vhTest.Mock.APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.OfferteGenerator = ##class(vhTest.Mock.APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.OfferteGenerator).%New()
+	Do OfferteGeneratorMock.VerwachtMethodCall("GeefOfferteDto", $$$ElkeWaarde).DanReturn(##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.Offerte).%New())
+
+	#dim HttpApiStub As vhTest.Mock.TECH.Http.HttpAPI = ##class(vhTest.Mock.TECH.Http.HttpAPI).MockInstance()
+	Do HttpApiStub.IndienMethodCall("GeefHttpPoster")
+
+	#dim SapMelder As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.SapMelder = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.HaefeleBE.Melder).%New("", OfferteGeneratorMock)
+	Do SapMelder.Meld(..OfferteStub)
+	
+	Do OfferteGeneratorMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Logger wordt opgeroepen door Meld-method">
+<Implementation><![CDATA[
+	#dim LoggerMock As vhTest.Mock.vhLib.Logger = ##class(vhTest.Mock.vhLib.Logger).%New()
+	Do LoggerMock.VerwachtMethodCall("Info", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde)
+	
+	#dim OfferteGeneratorStub As vhTest.Mock.APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.OfferteGenerator = ##class(vhTest.Mock.APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.OfferteGenerator).%New()
+	Do OfferteGeneratorStub.IndienMethodCall("GeefOfferteDto", $$$ElkeWaarde).DanReturn(##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.Offerte).%New())
+
+	#dim HttpPosterStub As vhTest.Mock.TECH.Http.Poster = ##class(vhTest.Mock.TECH.Http.Poster).%New()
+	Do HttpPosterStub.IndienMethodCall("PostMessage", $$$ElkeWaarde)
+
+	#dim HttpApiStub As vhTest.Mock.TECH.Http.HttpAPI = ##class(vhTest.Mock.TECH.Http.HttpAPI).MockInstance()
+	Do HttpApiStub.IndienMethodCall("GeefHttpPoster").DanReturn(HttpPosterStub)
+
+	#dim SapMelder As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.SapMelder = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.HaefeleBE.Melder).%New(LoggerMock, OfferteGeneratorStub)
+	Do SapMelder.Meld(..OfferteStub)
+	
+	Do LoggerMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Exceptie wordt verwacht en gelogd indien een fout optreedt vóór het verzenden van de HttpMessage">
+<Implementation><![CDATA[
+	#dim OmschrijvingSubStrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("De bestelling", $$$DummyInteger, "van de eindklant kon niet naar Häfele verzonden worden")
+	#dim VerwachteExceptie = ##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.BaseException", OmschrijvingSubStrings)
+	
+	Do ..ZetVerwachteExceptie(VerwachteExceptie)
+	
+	#dim LoggerMock As vhTest.Mock.vhLib.Logger = ##class(vhTest.Mock.vhLib.Logger).%New()
+	Do LoggerMock.VerwachtMethodCall("ErrorMail", $$$ElkeWaarde, $$$ElkeWaarde)
+	
+	#dim OfferteGeneratorStub As vhTest.Mock.APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.OfferteGenerator = ##class(vhTest.Mock.APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.OfferteGenerator).%New()
+	Do OfferteGeneratorStub.IndienMethodCall("GeefOfferteDto", $$$ElkeWaarde).DanException(##class(TECH.Exceptions.GeneralErrorException).%New("Een exceptie"))
+
+	#dim SapMelder As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.SapMelder = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.HaefeleBE.Melder).%New(LoggerMock, OfferteGeneratorStub)
+	Do SapMelder.Meld(..OfferteStub)
+	
+	Do LoggerMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Exceptie wordt verwacht en gelogd indien een fout optreedt bij het verzenden van de HttpMessage">
+<Implementation><![CDATA[
+	#dim LoggerMock As vhTest.Mock.vhLib.Logger = ##class(vhTest.Mock.vhLib.Logger).%New()
+	Do LoggerMock.VerwachtMethodCall("ErrorMail", $$$ElkeWaarde, $$$ElkeWaarde)
+	
+	#dim OfferteGeneratorStub As vhTest.Mock.APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.OfferteGenerator = ##class(vhTest.Mock.APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.OfferteGenerator).%New()
+	Do OfferteGeneratorStub.IndienMethodCall("GeefOfferteDto", $$$ElkeWaarde).DanReturn(##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.dto.Offerte).%New())
+
+	#dim HttpPosterStub As vhTest.Mock.TECH.Http.Poster = ##class(vhTest.Mock.TECH.Http.Poster).%New()
+	Do HttpPosterStub.IndienMethodCall("PostMessage", $$$ElkeWaarde).DanException("Een exceptie")
+
+	#dim HttpApiStub As vhTest.Mock.TECH.Http.HttpAPI = ##class(vhTest.Mock.TECH.Http.HttpAPI).MockInstance()
+	Do HttpApiStub.IndienMethodCall("GeefHttpPoster").DanReturn(HttpPosterStub)
+
+	#dim SapMelder As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.SapMelder = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.HaefeleBE.Melder).%New(LoggerMock, OfferteGeneratorStub)
+	Do SapMelder.Meld(..OfferteStub)
+	
+	Do LoggerMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/personality/HaefeleBE/Melder.cls.xml
===================================================================
diff -u -r35899 -r35944
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/personality/HaefeleBE/Melder.cls.xml	(.../Melder.cls.xml)	(revision 35899)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/personality/HaefeleBE/Melder.cls.xml	(.../Melder.cls.xml)	(revision 35944)
@@ -2,6 +2,31 @@
 <Export generator="Cache" version="24">
 <Class name="APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.HaefeleBE.Melder">
 <Super>APPS.VKP.Offerte.impl.BesteldeOfferteMelder.personality.common.SapMelder</Super>
+
+<Method name="GeefPersonality">
+<Private>1</Private>
+<ReturnType>DOM.common.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.common.HaefeleBEPersonality).Instance()
+]]></Implementation>
+</Method>
+
+<Method name="GeefHttpMessage">
+<FormalSpec>XMLStream:%Stream</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.Http.Message</ReturnType>
+<Implementation><![CDATA[
+	#dim HttpMessage As TECH.Http.Message = ##class(TECH.Http.Message).%New()
+		
+	Set HttpMessage.Server = "192.168.24.10"   ; ip-adres van netwerk-tunnel naar hafele-server (dit i.p.v. een domeinnaam); Testserver IP = "192.168.25.31"
+	Set HttpMessage.Port = 15000
+	Set HttpMessage.Location = "/"
+	Set HttpMessage.ContentType = "text/xml"
+	Set HttpMessage.ContextEncoding = "UTF-8"
+	Set HttpMessage.Data = XMLStream
+	
+	Quit HttpMessage
+]]></Implementation>
+</Method>
 </Class>