Index: APPS/TRANSP/GLS/impl/CommunicatieService.cls.xml
===================================================================
diff -u -r29059 -r40639
--- APPS/TRANSP/GLS/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 29059)
+++ APPS/TRANSP/GLS/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40639)
@@ -2,15 +2,32 @@
 <Export generator="Cache" version="24">
 <Class name="APPS.TRANSP.GLS.impl.CommunicatieService">
 <IncludeCode>vhLib.Macro</IncludeCode>
-<Super>APPS.TRANSP.impl.CommunicatieService,APPS.TRANSP.GLS.CommunicatieService</Super>
+<Super>APPS.TRANSP.impl.CommunicatieService</Super>
 
+<Property name="CommunicatieServiceLocator">
+<Type>APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>CommunicatieServiceLocator:APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..CommunicatieServiceLocator = $$$Inject(CommunicatieServiceLocator,##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="AnnuleerLevering">
 <FormalSpec>RitID:%String,LeveringID:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim Rit As DOM.TRANSP.Rit = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefRit(RitID)
 	#dim Levering As DOM.TRANSP.Levering = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefLevering(RitID,LeveringID)
-	set AnnuleerLevering = ##class(APPS.TRANSP.GLS.impl.CommunicatieService.AnnuleerLevering).%New($this,Rit, Levering)
+	set AnnuleerLevering = ##class(APPS.TRANSP.GLS.impl.CommunicatieService.AnnuleerLevering).%New(..CommunicatieServiceLocator,Rit, Levering)
 	do AnnuleerLevering.VoerUit()
 ]]></Implementation>
 </Method>
@@ -20,7 +37,7 @@
 <Implementation><![CDATA[
 	#dim Rit As DOM.TRANSP.Rit = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefRit(RitID)
 	#dim Levering As DOM.TRANSP.Levering = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefLevering(RitID,LeveringID)
-	set RegistreerLevering = ##class(APPS.TRANSP.GLS.impl.CommunicatieService.RegistreerLevering).%New($this,Rit, Levering)
+	set RegistreerLevering = ##class(APPS.TRANSP.GLS.impl.CommunicatieService.RegistreerLevering).%New(..CommunicatieServiceLocator,Rit, Levering)
 	do RegistreerLevering.VoerUit()
 ]]></Implementation>
 </Method>
@@ -35,89 +52,18 @@
 	#dim Rit As DOM.TRANSP.Rit = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefRit(RitID)
 	#dim itLevering As TECH.ListIterator = Rit.GeefLeveringIterator()
 	while itLevering.HasNext() {
-		set BevestigLevering = ##class(APPS.TRANSP.GLS.impl.CommunicatieService.BevestigLevering).%New($this,Rit,itLevering.Next())
+		set BevestigLevering = ##class(APPS.TRANSP.GLS.impl.CommunicatieService.BevestigLevering).%New(..CommunicatieServiceLocator,Rit,itLevering.Next())
 		do BevestigLevering.VoerUit()
 	}
 ]]></Implementation>
 </Method>
 
 <Method name="AnnuleerNietGelukteRequest">
 <Implementation><![CDATA[
-	Set AnnuleerNietGelukteRequests = ##class(APPS.TRANSP.GLS.impl.CommunicatieService.AnnuleerNietGelukteRequests).%New($this)
+	Set AnnuleerNietGelukteRequests = ##class(APPS.TRANSP.GLS.impl.CommunicatieService.AnnuleerNietGelukteRequests).%New(..CommunicatieServiceLocator)
 	Do AnnuleerNietGelukteRequests.VoerUit()
 ]]></Implementation>
 </Method>
-
-<Method name="ResponseBevatFout">
-<FormalSpec>Response:APPS.TRANSP.GLS.Bericht.dto.Response</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	#dim BevatFout As %Boolean = 0
-	set Filter = ##class(TECH.ClassUtils.PropertyFilter).%New()
-	set Filter.BeginnendMet = "E"
-	set Filter.SkipPrivate = 1
-	set itProperties = ##class(TECH.ListIterator).%New(##class(TECH.ClassUtils).GeefProperties(Response.%ClassName(1),Filter))
-	while itProperties.HasNext() && 'BevatFout {
-		#dim Property As %String = itProperties.Next()
-		#dim Waarde As %String = ##class(TECH.StringUtils).TrimWhitespaces($property(Response,Property))
-		If (Property = "E000"){
-			Set BevatFout = 0	
-			If ((Waarde '= "") && (Waarde '= "OK") && ('(##class(TECH.Integer).IsValid(Waarde)))) {
-				Do ##class(vhLib.Logger).%New("GLS").Warning("ResponseBevatFout",Waarde_$C(13,10)_$C(13,10)_$$ObjToText^vhLib(Response))		
-			}
-		}Else{
-			Set BevatFout = (Waarde '= "")
-		}
-	}
-	quit BevatFout
-]]></Implementation>
-</Method>
-
-<Method name="GeefFoutInResponse">
-<FormalSpec>Response:APPS.TRANSP.GLS.Bericht.dto.Response</FormalSpec>
-<ReturnType>APPS.TRANSP.GLS.Bericht.dto.Error</ReturnType>
-<Implementation><![CDATA[
-	set Fout = ##class(APPS.TRANSP.GLS.Bericht.dto.Error).%New()
-	
-	set Filter = ##class(TECH.ClassUtils.PropertyFilter).%New()
-	set Filter.BeginnendMet = "E"
-	set Filter.SkipPrivate = 1
-	set itProperties = ##class(TECH.ListIterator).%New(##class(TECH.ClassUtils).GeefProperties(Response.%ClassName(1),Filter))
-	while itProperties.HasNext() {
-		#dim Property As %String = itProperties.Next()
-		#dim Waarde As %String = $property(Response,Property)
-		if $length(Waarde) {
-			set Fout = ##class(APPS.TRANSP.GLS.Bericht.dto.Error).%New(Property,Waarde)
-		}
-	}
-	
-	quit Fout
-]]></Implementation>
-</Method>
-
-<Method name="GeefVerzendWijzeBepaler">
-<ReturnType>APPS.TRANSP.GLS.VerzendWijzeBepaler</ReturnType>
-<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.impl.VerzendWijzeBepaler).%New()
-]]></Implementation>
-</Method>
-
-<Method name="GeefRequestBouwer">
-<ReturnType>APPS.TRANSP.GLS.Bericht.RequestDataBouwer</ReturnType>
-<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.Bericht.impl.RequestDataBouwer).%New()
-]]></Implementation>
-</Method>
-
-<Method name="GeefUnitIDBepaler">
-<ReturnType>APPS.TRANSP.GLS.UnitIDBepaler</ReturnType>
-<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.impl.UnitIDBepaler).%New()
-]]></Implementation>
-</Method>
-
-<Method name="GeefDienstBepaler">
-<ReturnType>APPS.TRANSP.GLS.DienstBepaler</ReturnType>
-<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.impl.DienstBepaler).%New()
-]]></Implementation>
-</Method>
 </Class>