Index: AX/Uitgaand/common/impl/AifGenerator.cls.xml
===================================================================
diff -u -r35033 -r35034
--- AX/Uitgaand/common/impl/AifGenerator.cls.xml	(.../AifGenerator.cls.xml)	(revision 35033)
+++ AX/Uitgaand/common/impl/AifGenerator.cls.xml	(.../AifGenerator.cls.xml)	(revision 35034)
@@ -8,23 +8,23 @@
 <Private>1</Private>
 </Property>
 
-<Property name="FirmaBepaler">
-<Type>AX.common.impl.FirmaBepaler</Type>
+<Property name="EventRaiser">
+<Type>AXimpl.AifMessage.EventRaiser</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="MessageManager">
-<Type>AX.Uitgaand.common.impl.MessageManager</Type>
+<Property name="RequestComposer">
+<Type>AXimpl.AifMessage.RequestComposer</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="EventRaiser">
-<Type>AXimpl.AifMessage.EventRaiser</Type>
+<Property name="FirmaBepaler">
+<Type>AX.common.impl.FirmaBepaler</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>MessageManager:AX.Uitgaand.common.impl.MessageManager,FileWriter:AX.common.impl.FileWriter,EventRaiser:AXimpl.AifMessage.EventRaiser</FormalSpec>
+<FormalSpec>RequestComposer:AXimpl.AifMessage.RequestComposer,FileWriter:AX.common.impl.FileWriter,EventRaiser:AXimpl.AifMessage.EventRaiser</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -33,7 +33,7 @@
 	set ..FirmaBepaler = ##class(AX.common.impl.FirmaBepaler).%New()
 	set ..FileWriter = $$$Inject(FileWriter,##class(AX.common.impl.FileWriter).%New())
 	set ..EventRaiser = $$$Inject(EventRaiser,##class(AXimpl.AifMessage.EventRaiser).%New())
-	set ..MessageManager = $$$Inject(MessageManager,##class(AX.Uitgaand.common.impl.MessageManager).%New())
+	set ..RequestComposer = $$$Inject(RequestComposer,##class(AXimpl.AifMessage.RequestComposer).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -74,77 +74,19 @@
 <Method name="Generate">
 <FormalSpec>Command:%String,Id:%String</FormalSpec>
 <Implementation><![CDATA[
-	set Message = ##class(AXaif.Message.Envelope).%New()
-	set Message.Header = ##class(AXaif.Message.Header).%New()
-	set Message.Header.MessageId = ..MessageManager.GenerateID()
-	set Message.Header.Company = ..FirmaBepaler.GeefInitialen()
-	set Message.Header.Action = ..GetAction(Command)
-	set Message.Body = ##class(AXaif.Message.Body).%New()
-	set Message.Body.MessageParts = ##class(AXaif.Message.MessageParts).%New()
-	
-	#dim Converter As AX.Uitgaand.common.AifConverter = ..GetConverter(Command)
-	
-	set:Command="Customer/Create" Message.Body.MessageParts.Customer = Converter.Convert(Id)
-	set:Command="SalesInvoice/Create" Message.Body.MessageParts.LedgerGeneralJournal = Converter.Convert(Id)
-	set:Command="PurchaseInvoice/Create" Message.Body.MessageParts.LedgerGeneralJournal = Converter.Convert(Id)
-	set:Command="Customer/Read" Message.Body.MessageParts.EntityKeyList = ..GeefEntityKeyList(Id)
+	#dim Request As AXaif.Message.Envelope = ..RequestComposer.Compose(Command,Id)
 		
 	#dim Path As %String = ##class(TECH.Files).AppendSubPath(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_AIF_RequestPath"),Command)
-	#dim Filename As %String = $replace(Command,"/","-")_" "_$replace(Id,"|","")_" "_" - "_..FirmaBepaler.GeefInitialen()_" - "_##class(TECH.Files).GeefCurrentTimeStamp()_".xml"
+	#dim Filename As %String = $replace(Command,"/","-")_" "_$replace(Id,"|","")_" "_" - "_Request.Header.Company_" - "_##class(TECH.Files).GeefCurrentTimeStamp()_".xml"
 	#dim FullFilename As %String = ##class(TECH.Files).AppendFile(Path,Filename)
 		
 	do ..FileWriter.Open(FullFilename,$$$True)
-	do ..FileWriter.WriteXML(Message)
+	do ..FileWriter.WriteXML(Request)
 	do ..FileWriter.Close()
 	
-	do ..EventRaiser.RaiseRequestSendEvent(Command,Id,Message,..FileWriter.GetStream())
+	do ..EventRaiser.RaiseRequestSendEvent(Command,Id,Request,..FileWriter.GetStream())
 ]]></Implementation>
 </Method>
-
-<Method name="GetConverter">
-<FormalSpec>Command:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>AX.Uitgaand.common.AifConverter</ReturnType>
-<Implementation><![CDATA[
-	quit:Command="Customer/Create" ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
-	quit:Command="SalesInvoice/Create" ##class(AX.Uitgaand.VKP.VerkoopFactuur.impl.AifConverter).%New()
-	quit:Command="PurchaseInvoice/Create" ##class(AX.Uitgaand.BKH.AankoopFactuur.impl.AifConverter).%New()
-	quit $$$NULLOREF
-]]></Implementation>
-</Method>
-
-<Method name="GetAction">
-<FormalSpec>Command:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	quit:Command="Customer/Create" "http://schemas.microsoft.com/dynamics/2008/01/services/CustomerService/create"
-	quit:Command="SalesInvoice/Create" "http://schemas.microsoft.com/dynamics/2008/01/services/GeneralJournalService/create"
-	quit:Command="PurchaseInvoice/Create" "http://schemas.microsoft.com/dynamics/2008/01/services/GeneralJournalService/create"
-	quit:Command="Customer/Read" "http://schemas.microsoft.com/dynamics/2008/01/services/CustomerService/read"
-]]></Implementation>
-</Method>
-
-<Method name="GeefEntityKeyList">
-<FormalSpec>Id:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>AXaif.EntityKey.EntityKeyList</ReturnType>
-<Implementation><![CDATA[
-	Set axEntityKeyList = ##class(AXaif.EntityKey.EntityKeyList).%New()
-	Set axEntityKey = ##class(AXaif.EntityKey.EntityKey).%New()
-	Set axKeyData = ##class(AXaif.EntityKey.KeyData).%New()	
-	Set axKeyField = ##class(AXaif.EntityKey.KeyField).%New()
-	
-	Set axKeyField.Field = "AccountNum"
-	Set axKeyField.Value = ##class(TECH.StringUtils).AlignRight($Extract(Id,4,*),0,5)
-	
-	Do axKeyData.KeyField.Insert(axKeyField)
-	Do axEntityKey.KeyData.Insert(axKeyData)	
-	Set axEntityKeyList.EntityKey = axEntityKey
-	
-	Quit axEntityKeyList
-]]></Implementation>
-</Method>
 </Class>