Index: AXdata/AifMessage/Message.cls.xml
===================================================================
diff -u -r35200 -r35255
--- AXdata/AifMessage/Message.cls.xml	(.../Message.cls.xml)	(revision 35200)
+++ AXdata/AifMessage/Message.cls.xml	(.../Message.cls.xml)	(revision 35255)
@@ -29,6 +29,10 @@
 <Required>1</Required>
 </Property>
 
+<Property name="Response">
+<Type>AXdata.AifMessage.MessageData</Type>
+</Property>
+
 <Property name="Status">
 <Type>%String</Type>
 <InitialExpression>"Pending"</InitialExpression>
@@ -84,6 +88,9 @@
 <Value name="7">
 <Value>Company</Value>
 </Value>
+<Value name="8">
+<Value>Response</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: AXdata/AifMessage/MessageRepository.cls.xml
===================================================================
diff -u -r35026 -r35255
--- AXdata/AifMessage/MessageRepository.cls.xml	(.../MessageRepository.cls.xml)	(revision 35026)
+++ AXdata/AifMessage/MessageRepository.cls.xml	(.../MessageRepository.cls.xml)	(revision 35255)
@@ -7,6 +7,13 @@
 <Type>%String</Type>
 <Default>AXdata.AifMessage.Message</Default>
 </Parameter>
+
+<Method name="GeefViaRequestGuid">
+<FormalSpec>Guid:%String</FormalSpec>
+<ReturnType>AXdata.AifMessage.Message</ReturnType>
+<Implementation><![CDATA[	quit ..GeefViaFilter("Request_Guid = ?",$listbuild(Guid))
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/AXimpl/AifMessage/EventHandler/ResponseLogger/Log/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/AifMessage/EventHandler/ResponseLogger/Log/Test.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/AifMessage/EventHandler/ResponseLogger/Log/Test.cls.xml	(revision 35255)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.AifMessage.EventHandler.ResponseLogger.Log.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test">
+<Implementation><![CDATA[
+	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
+	
+	
+	set StoredMessage = ##class(AXdata.AifMessage.Message).%New()
+	set StoredMessage.Command = "SalesInvoice/Create"
+	set StoredMessage.Action = "http://schemas.microsoft.com/dynamics/2008/01/services/GeneralJournalService/create"
+	set StoredMessage.Status = "Pending"
+	set StoredMessage.Request.GUID = "{123456-ABC-1234567}"
+	set StoredMessage.Request.TimeStamp = "2011-06-30 09:00:00"
+	do StoredMessage.Request.Stream.Write("<?xml version=""1.0"" encoding=""UTF-8""?> ... Request")
+			
+	set MessageRepositoryMock = ##class(vhTest.Mock.AX.AifMessage.MessageRepository).%New()
+	do MessageRepositoryMock.VerwachtMethodCall("GeefViaRequestGuid","{123456-ABC-1234567}").DanReturn(StoredMessage)
+	do MessageRepositoryMock.VerwachtMethodCall("Bewaar",StoredMessage)
+	
+	set ResponseMessage = ##class(AXaif.Message.Envelope).%New()
+	set ResponseMessage.Header.MessageId = "{654321-ABC-7654321}"
+	set ResponseMessage.Header.RequestMessageId = "{123456-ABC-1234567}"
+
+	set MessageStream = ##class(%GlobalCharacterStream).%New()
+	do MessageStream.Write("<?xml version=""1.0"" encoding=""UTF-8""?> ... Response")
+	
+	set ReponseLogger = ##class(AXimpl.AifMessage.EventHandler.ResponseLogger).%New(MessageRepositoryMock)
+	do ReponseLogger.Log(ResponseMessage,MessageStream)
+	
+	do $$$AssertEquals(StoredMessage.Status,"Processed")
+	do $$$AssertEquals(StoredMessage.Action,"http://schemas.microsoft.com/dynamics/2008/01/services/GeneralJournalService/create")
+	do $$$AssertEquals(StoredMessage.Request.TimeStamp,"2011-06-30 09:00:00")
+	do $$$AssertEquals(StoredMessage.Request.Stream.Read(),"<?xml version=""1.0"" encoding=""UTF-8""?> ... Request")
+	do $$$AssertEquals(StoredMessage.Response.Stream.Read(),"<?xml version=""1.0"" encoding=""UTF-8""?> ... Response")
+	do $$$AssertEquals(StoredMessage.Response.TimeStamp,"2011-06-30 09:15:00")
+	
+	do MessageRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXimpl/AifMessage/EventHandler/ResponseLogger.cls.xml
===================================================================
diff -u
--- AXimpl/AifMessage/EventHandler/ResponseLogger.cls.xml	(revision 0)
+++ AXimpl/AifMessage/EventHandler/ResponseLogger.cls.xml	(revision 35255)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.AifMessage.EventHandler.ResponseLogger">
+<Super>TECH.Events.EventHandler</Super>
+
+<Property name="AifMessageRepository">
+<Type>AX.AifMessage.MessageRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="DateTimeAPI">
+<Type>TECH.DateTime.DateTimeAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Repository:AX.AifMessage.MessageRepository</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..AifMessageRepository = $$$Inject(Repository,##class(AXdata.AifMessage.MessageRepository).%New())
+	Set ..DateTimeAPI = ##class(TECH.Context).Instance().GeefDateTimeAPI()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="StartVerwerking">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Event:AX.AifMessage.event.ResponseReceivedEvent</FormalSpec>
+<Implementation><![CDATA[	Do ..%New().Log(Event.Data.Message,Event.Data.MessageStream)
+]]></Implementation>
+</Method>
+
+<Method name="Log">
+<FormalSpec>Message:AXaif.Message.Envelope,MessageStream:%Stream.Object</FormalSpec>
+<Implementation><![CDATA[
+	#dim AifMessage As AXdata.AifMessage.Message = ..AifMessageRepository.GeefViaRequestGuid(Message.Header.RequestMessageId)
+	Set AifMessage.Status = "Processed"
+	Set AifMessage.Response.TimeStamp = ..DateTimeAPI.CurrentTimeStamp()
+	Set AifMessage.Response.GUID = Message.Header.MessageId
+	Do AifMessage.Response.Stream.CopyFrom(MessageStream)
+	
+	Do ..AifMessageRepository.Bewaar(AifMessage)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/AifMessage/MessageRepository.cls.xml
===================================================================
diff -u -r35026 -r35255
--- AX/AifMessage/MessageRepository.cls.xml	(.../MessageRepository.cls.xml)	(revision 35026)
+++ AX/AifMessage/MessageRepository.cls.xml	(.../MessageRepository.cls.xml)	(revision 35255)
@@ -30,6 +30,12 @@
 <Abstract>1</Abstract>
 <FormalSpec>ID:%String</FormalSpec>
 </Method>
+
+<Method name="GeefViaRequestGuid">
+<Abstract>1</Abstract>
+<FormalSpec>Guid:%String</FormalSpec>
+<ReturnType>AXdata.AifMessage.Message</ReturnType>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/AX/AifMessage/MessageRepository.cls.xml
===================================================================
diff -u -r35026 -r35255
--- vhTest/Mock/AX/AifMessage/MessageRepository.cls.xml	(.../MessageRepository.cls.xml)	(revision 35026)
+++ vhTest/Mock/AX/AifMessage/MessageRepository.cls.xml	(.../MessageRepository.cls.xml)	(revision 35255)
@@ -29,6 +29,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefViaRequestGuid">
+<FormalSpec>Guid:%String</FormalSpec>
+<ReturnType>AXdata.AifMessage.Message</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefViaRequestGuid",Guid)
+]]></Implementation>
+</Method>
+
 <Method name="Maak">
 <ReturnType>AXdata.AifMessage.Message</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("Maak")