Index: AXimpl/AifMessage/EventHandler/RequestLogger.cls.xml
===================================================================
diff -u -r35197 -r35200
--- AXimpl/AifMessage/EventHandler/RequestLogger.cls.xml	(.../RequestLogger.cls.xml)	(revision 35197)
+++ AXimpl/AifMessage/EventHandler/RequestLogger.cls.xml	(.../RequestLogger.cls.xml)	(revision 35200)
@@ -3,6 +3,29 @@
 <Class name="AXimpl.AifMessage.EventHandler.RequestLogger">
 <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.RequestSendEvent</FormalSpec>
@@ -11,7 +34,19 @@
 </Method>
 
 <Method name="Log">
-<FormalSpec>Command:%String,Id:%String,Message:AXaif.Message.Envelope,MessageStream:%Stream.Object</FormalSpec>
+<FormalSpec>Command:%String,SubjectId:%String,Message:AXaif.Message.Envelope,MessageStream:%Stream.Object</FormalSpec>
+<Implementation><![CDATA[
+	#dim AifMessage As AXdata.AifMessage.Message = ..AifMessageRepository.Maak()
+	Set AifMessage.Command = Command
+	Set AifMessage.SubjectId = SubjectId
+	Set AifMessage.Action = Message.Header.Action
+	Set AifMessage.Company = Message.Header.Company
+	Set AifMessage.Request.TimeStamp = ..DateTimeAPI.CurrentTimeStamp()
+	Set AifMessage.Request.GUID = Message.Header.MessageId
+	Do AifMessage.Request.Stream.CopyFrom(MessageStream)
+	
+	Do ..AifMessageRepository.Bewaar(AifMessage)
+]]></Implementation>
 </Method>
 </Class>
 
Index: AXdata/AifMessage/MessageData.cls.xml
===================================================================
diff -u -r35026 -r35200
--- AXdata/AifMessage/MessageData.cls.xml	(.../MessageData.cls.xml)	(revision 35026)
+++ AXdata/AifMessage/MessageData.cls.xml	(.../MessageData.cls.xml)	(revision 35200)
@@ -10,6 +10,27 @@
 <Property name="Stream">
 <Type>%GlobalCharacterStream</Type>
 </Property>
+
+<Property name="TimeStamp">
+<Type>%TimeStamp</Type>
+</Property>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>MessageDataState</State>
+<StreamLocation>^AXdata.AifMessage.MessageDataS</StreamLocation>
+<Data name="MessageDataState">
+<Value name="1">
+<Value>GUID</Value>
+</Value>
+<Value name="2">
+<Value>Stream</Value>
+</Value>
+<Value name="3">
+<Value>TimeStamp</Value>
+</Value>
+</Data>
+</Storage>
 </Class>
 
 
Index: vhUnitTest/AXimpl/AifMessage/EventHandler/RequestLogger/Log/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/AifMessage/EventHandler/RequestLogger/Log/Test.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/AifMessage/EventHandler/RequestLogger/Log/Test.cls.xml	(revision 35200)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.AifMessage.EventHandler.RequestLogger.Log.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Log">
+<Implementation><![CDATA[
+	Do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
+	
+	Set AifMessage = ##class(AXdata.AifMessage.Message).%New()
+	Set MessageRepositoryMock = ##class(vhTest.Mock.AX.AifMessage.MessageRepository).%New()
+	Do MessageRepositoryMock.VerwachtMethodCall("Maak").DanReturn(AifMessage).ExactAantalKeer(1)
+	Do MessageRepositoryMock.VerwachtMethodCall("Bewaar",AifMessage).ExactAantalKeer(1)
+	
+	#dim Command As %String = "Customer/Create"
+	#dim Id As %String = "K||1000"
+	#dim Envelope As AXaif.Message.Envelope = ##class(AXaif.Message.Envelope).%New()
+	Set Envelope.Header.Action = "http://schemas.microsoft.com/dynamics/2008/01/services/CustomerService/create"
+	Set Envelope.Header.MessageId = "{12345-123-ABC}"
+	Set Envelope.Header.Company = "VHBE"
+	#dim MessageStream As %Stream.Object = ##class(%GlobalCharacterStream).%New()
+	Do MessageStream.Write("<XML></XML>")
+	
+	Set RequestLogger = ##class(AXimpl.AifMessage.EventHandler.RequestLogger).%New(MessageRepositoryMock)	
+	Do RequestLogger.Log(Command,Id,Envelope,MessageStream)
+		
+	Do $$$AssertEquals(AifMessage.Command,"Customer/Create")
+	Do $$$AssertEquals(AifMessage.SubjectId,"K||1000")
+	Do $$$AssertEquals(AifMessage.Status,"Pending")
+	Do $$$AssertEquals(AifMessage.Request.GUID,"{12345-123-ABC}")
+	Do $$$AssertEquals(AifMessage.Action,"http://schemas.microsoft.com/dynamics/2008/01/services/CustomerService/create")
+	Do $$$AssertEquals(AifMessage.Company,"VHBE")
+	Do $$$AssertEquals(AifMessage.Request.TimeStamp,"2011-06-30 09:15:00")
+	
+	Do $$$AssertNotEquals(AifMessage.Request.Stream,MessageStream)
+	Do $$$AssertEquals(AifMessage.Request.Stream.Read(),MessageStream.Read())
+	
+	Do MessageRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXdata/AifMessage/Message.cls.xml
===================================================================
diff -u -r35026 -r35200
--- AXdata/AifMessage/Message.cls.xml	(.../Message.cls.xml)	(revision 35026)
+++ AXdata/AifMessage/Message.cls.xml	(.../Message.cls.xml)	(revision 35200)
@@ -45,6 +45,16 @@
 <Required>1</Required>
 </Property>
 
+<Property name="SubjectId">
+<Type>%String</Type>
+<Required>1</Required>
+</Property>
+
+<Property name="Company">
+<Type>%String</Type>
+<Required>1</Required>
+</Property>
+
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
 <DataLocation>^AXdata.AifMessage.MessageD</DataLocation>
@@ -53,8 +63,6 @@
 <IndexLocation>^AXdata.AifMessage.MessageI</IndexLocation>
 <StreamLocation>^AXdata.AifMessage.MessageS</StreamLocation>
 <Data name="MessageDefaultData">
-<Structure>listnode</Structure>
-<Subscript/>
 <Value name="1">
 <Value>%%CLASSNAME</Value>
 </Value>
@@ -70,6 +78,12 @@
 <Value name="5">
 <Value>Command</Value>
 </Value>
+<Value name="6">
+<Value>SubjectId</Value>
+</Value>
+<Value name="7">
+<Value>Company</Value>
+</Value>
 </Data>
 </Storage>
 </Class>