Index: vhTest/Mock/APPS/TRANSP/GLS/CommunicatieService.cls.xml
===================================================================
diff -u -r40369 -r40503
--- vhTest/Mock/APPS/TRANSP/GLS/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40369)
+++ vhTest/Mock/APPS/TRANSP/GLS/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40503)
@@ -6,7 +6,7 @@
 Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
 Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>APPS.TRANSP.GLS.CommunicatieService,Tools.Mock.MockClassBase</Super>
+<Super>APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
 <Method name="GeefDienstBepaler">
Index: APPS/TRANSP/GLS/GLSv1/impl/CommunicatieServiceLocator.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/GLS/GLSv1/impl/CommunicatieServiceLocator.cls.xml	(revision 0)
+++ APPS/TRANSP/GLS/GLSv1/impl/CommunicatieServiceLocator.cls.xml	(revision 40503)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator">
+<Super>TECH.RegisteredObject,APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator</Super>
+
+<Method name="GeefVerzendWijzeBepaler">
+<ReturnType>APPS.TRANSP.GLS.GLSv1.VerzendWijzeBepaler</ReturnType>
+<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.GLSv1.impl.VerzendWijzeBepaler).%New()
+]]></Implementation>
+</Method>
+
+<Method name="GeefRequestBouwer">
+<ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.RequestDataBouwer</ReturnType>
+<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New()
+]]></Implementation>
+</Method>
+
+<Method name="GeefUnitIDBepaler">
+<ReturnType>APPS.TRANSP.GLS.GLSv1.UnitIdBepaler</ReturnType>
+<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.GLSv1.impl.UnitIdBepaler).%New()
+]]></Implementation>
+</Method>
+
+<Method name="GeefDienstBepaler">
+<ReturnType>APPS.TRANSP.GLS.GLSv1.DienstBepaler</ReturnType>
+<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.GLSv1.impl.DienstBepaler).%New()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/GLS/GLSv1/impl/GLSEigenschappen.cls.xml
===================================================================
diff -u -r40369 -r40503
--- APPS/TRANSP/GLS/GLSv1/impl/GLSEigenschappen.cls.xml	(.../GLSEigenschappen.cls.xml)	(revision 40369)
+++ APPS/TRANSP/GLS/GLSv1/impl/GLSEigenschappen.cls.xml	(.../GLSEigenschappen.cls.xml)	(revision 40503)
@@ -74,7 +74,7 @@
 <Method name="%OnNew">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	#dim CommunicatieService As APPS.TRANSP.GLS.impl.CommunicatieService = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefCommunicatieService(##class(DOM.TRANSP.enu.Transporteur).GLSBelgium())
+	#dim CommunicatieService As APPS.TRANSP.GLS.impl.CommunicatieServiceLocator = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New()
 	Set ..DienstBepaler = CommunicatieService.GeefDienstBepaler()
 	
 	Quit $$$OK
Index: APPS/TRANSP/GLS/impl/DienstBepalerDistributeurDataVisitor.cls.xml
===================================================================
diff -u -r40369 -r40503
--- APPS/TRANSP/GLS/impl/DienstBepalerDistributeurDataVisitor.cls.xml	(.../DienstBepalerDistributeurDataVisitor.cls.xml)	(revision 40369)
+++ APPS/TRANSP/GLS/impl/DienstBepalerDistributeurDataVisitor.cls.xml	(.../DienstBepalerDistributeurDataVisitor.cls.xml)	(revision 40503)
@@ -14,7 +14,7 @@
 <Method name="%OnNew">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	#dim CommunicatieService As APPS.TRANSP.GLS.CommunicatieService = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefCommunicatieService(##class(DOM.TRANSP.enu.Transporteur).GLSBelgium())
+	#dim CommunicatieService As APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefCommunicatieService(##class(DOM.TRANSP.enu.Transporteur).GLSBelgium())
 	Set ..DienstBepaler = CommunicatieService.GeefDienstBepaler()
 	Quit $$$OK
 ]]></Implementation>
Index: CHUI/MN/TRANSPCLOE.cls.xml
===================================================================
diff -u -r29059 -r40503
--- CHUI/MN/TRANSPCLOE.cls.xml	(.../TRANSPCLOE.cls.xml)	(revision 29059)
+++ CHUI/MN/TRANSPCLOE.cls.xml	(.../TRANSPCLOE.cls.xml)	(revision 40503)
@@ -21,7 +21,7 @@
 		#dim RitID As %String = $P(DataR,"\",21)
 		#dim TransporteurNr As %String = $P(DataR,"\")
 	
-		#dim CommunicatieService As APPS.TRANSP.GLS.CommunicatieService = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefCommunicatieService(TransporteurNr)
+		#dim CommunicatieService As APPS.TRANSP.CommunicatieService = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefCommunicatieService(TransporteurNr)
 		Do CommunicatieService.ControleerRitVoorBevestiging(RitID)
 			
 		do CLOSVERV^TRANSPC(%J,.SelClose,"OT")
Index: APPS/TRANSP/GLS/GLSv1/Bericht/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r40477 -r40503
--- APPS/TRANSP/GLS/GLSv1/Bericht/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 40477)
+++ APPS/TRANSP/GLS/GLSv1/Bericht/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 40503)
@@ -89,8 +89,8 @@
 <FormalSpec>VerzendData:APPS.TRANSP.GLS.dto.VerzendData,IsLaatsteUnit:%Boolean=0</FormalSpec>
 <ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.dto.ParcelReleaseRequest</ReturnType>
 <Implementation><![CDATA[
-	#dim CommunicatieService As APPS.TRANSP.GLS.CommunicatieService = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefCommunicatieService(##class(DOM.TRANSP.enu.Transporteur).GLSBelgium())
-	#dim Dienst As APPS.TRANSP.GLS.GLSv1.enu.Dienst = CommunicatieService.GeefDienstBepaler().GeefDienst(VerzendData.VerzendWijze)
+	#dim CommunicatieServiceLocator As APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New()
+	#dim Dienst As APPS.TRANSP.GLS.GLSv1.enu.Dienst = CommunicatieServiceLocator.GeefDienstBepaler().GeefDienst(VerzendData.VerzendWijze)
 	
 	#dim ReleaseRequest As APPS.TRANSP.GLS.GLSv1.Bericht.dto.ReleaseRequest
 	if Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Freight() {
FishEye: Tag 40503 refers to a dead (removed) revision in file `APPS/TRANSP/GLS/CommunicatieService.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/OV/impl/GLSTrackAndTrace.cls.xml
===================================================================
diff -u -r40367 -r40503
--- APPS/OV/impl/GLSTrackAndTrace.cls.xml	(.../GLSTrackAndTrace.cls.xml)	(revision 40367)
+++ APPS/OV/impl/GLSTrackAndTrace.cls.xml	(.../GLSTrackAndTrace.cls.xml)	(revision 40503)
@@ -44,7 +44,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 
-	#dim CommunicatieService As APPS.TRANSP.GLS.CommunicatieService = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefCommunicatieService(##class(DOM.TRANSP.enu.Transporteur).GLSBelgium())
+	#dim CommunicatieService As APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefCommunicatieService(##class(DOM.TRANSP.enu.Transporteur).GLSBelgium())
 	#dim DienstBepaler As APPS.TRANSP.GLS.GLSv1.DienstBepaler = CommunicatieService.GeefDienstBepaler()
 	
 	#dim Dienst As APPS.TRANSP.GLS.GLSv1.enu.Dienst = DienstBepaler.GeefDienst(..GeefVerzendWijze(Levering))
Index: APPS/TRANSP/GLS/GLSv1/CommunicatieService.cls.xml
===================================================================
diff -u -r40369 -r40503
--- APPS/TRANSP/GLS/GLSv1/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40369)
+++ APPS/TRANSP/GLS/GLSv1/CommunicatieService.cls.xml	(.../GLSv1/CommunicatieServiceLocator.cls.xml)	(revision 40503)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="APPS.TRANSP.GLS.CommunicatieService">
+<Class name="APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator">
 <Abstract>1</Abstract>
-<Super>TECH.Interface,APPS.TRANSP.CommunicatieService</Super>
+<Super>TECH.Interface</Super>
 
 <Method name="GeefUnitIDBepaler">
 <Abstract>1</Abstract>
Index: APPS/TRANSP/GLS/impl/CommunicatieService.cls.xml
===================================================================
diff -u -r40426 -r40503
--- APPS/TRANSP/GLS/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40426)
+++ APPS/TRANSP/GLS/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40503)
@@ -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 = ##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.GLSv1.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.GLSv1.Bericht.dto.Response</FormalSpec>
-<ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.dto.Error</ReturnType>
-<Implementation><![CDATA[
-	set Fout = ##class(APPS.TRANSP.GLS.GLSv1.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.GLSv1.Bericht.dto.Error).%New(Property,Waarde)
-		}
-	}
-	
-	quit Fout
-]]></Implementation>
-</Method>
-
-<Method name="GeefVerzendWijzeBepaler">
-<ReturnType>APPS.TRANSP.GLS.GLSv1.VerzendWijzeBepaler</ReturnType>
-<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.GLSv1.impl.VerzendWijzeBepaler).%New()
-]]></Implementation>
-</Method>
-
-<Method name="GeefRequestBouwer">
-<ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.RequestDataBouwer</ReturnType>
-<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer).%New()
-]]></Implementation>
-</Method>
-
-<Method name="GeefUnitIDBepaler">
-<ReturnType>APPS.TRANSP.GLS.GLSv1.UnitIdBepaler</ReturnType>
-<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.GLSv1.impl.UnitIdBepaler).%New()
-]]></Implementation>
-</Method>
-
-<Method name="GeefDienstBepaler">
-<ReturnType>APPS.TRANSP.GLS.GLSv1.DienstBepaler</ReturnType>
-<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.GLSv1.impl.DienstBepaler).%New()
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: APPS/TRANSP/GLS/GLSv1/impl/CommunicatieService.cls.xml
===================================================================
diff -u -r40367 -r40503
--- APPS/TRANSP/GLS/GLSv1/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40367)
+++ APPS/TRANSP/GLS/GLSv1/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40503)
@@ -8,8 +8,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="CommunicatieService">
-<Type>APPS.TRANSP.GLS.CommunicatieService</Type>
+<Property name="CommunicatieServiceLocator">
+<Type>APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator</Type>
 <Private>1</Private>
 </Property>
 
@@ -19,14 +19,15 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>CommunicatieService:APPS.TRANSP.GLS.CommunicatieService</FormalSpec>
+<FormalSpec>CommunicatieServiceLocator:APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..RequestBouwer = CommunicatieService.GeefRequestBouwer()
-	set ..CommunicatieService = CommunicatieService
+	set ..CommunicatieServiceLocator = $$$Inject(CommunicatieServiceLocator,##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New())
+	set ..RequestBouwer = ..CommunicatieServiceLocator.GeefRequestBouwer()
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -96,7 +97,7 @@
 	
 	Try {
 		#dim Response As APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response = ..VerzendBericht(Request)
-	}Catch {
+	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Do ##class(vhLib.Logger).%New("GLS").ErrorMail("VerwerkRequest","Verzenden bericht mislukt."_$C(13,10)_$C(13,10)_Exception.ToString())
 		Set Error =##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.Error).%New("E999",Exception.GeefOmschrijving())
@@ -105,10 +106,10 @@
 
 	set VerzendData.Response = Response
 	
-	If ..CommunicatieService.ResponseBevatFout(Response) {
+	If ..ResponseBevatFout(Response) {
 		set VerzendData.Status = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.enu.Status).Failed()
 		do VerzendData.Save()
-		Set Error = ..CommunicatieService.GeefFoutInResponse(Response)
+		Set Error = ..GeefFoutInResponse(Response)
 		do ..ThrowError(Error, VerzendData)
 	}
 	
@@ -210,6 +211,53 @@
 	Quit BerichtVoorICT
 ]]></Implementation>
 </Method>
+
+<Method name="ResponseBevatFout">
+<FormalSpec>Response:APPS.TRANSP.GLS.GLSv1.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.GLSv1.Bericht.dto.Response</FormalSpec>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.dto.Error</ReturnType>
+<Implementation><![CDATA[
+	set Fout = ##class(APPS.TRANSP.GLS.GLSv1.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.GLSv1.Bericht.dto.Error).%New(Property,Waarde)
+		}
+	}
+	
+	quit Fout
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/TRANSP/GLS/impl/CommunicatieService/Template.cls.xml
===================================================================
diff -u -r40367 -r40503
--- APPS/TRANSP/GLS/impl/CommunicatieService/Template.cls.xml	(.../Template.cls.xml)	(revision 40367)
+++ APPS/TRANSP/GLS/impl/CommunicatieService/Template.cls.xml	(.../Template.cls.xml)	(revision 40503)
@@ -29,12 +29,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>CommunicatieService:APPS.TRANSP.GLS.CommunicatieService,Rit:DOM.TRANSP.Rit,Levering:DOM.TRANSP.Levering</FormalSpec>
+<FormalSpec>CommunicatieService:APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator,Rit:DOM.TRANSP.Rit,Levering:DOM.TRANSP.Levering</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New()
 	set ..Rit = Rit
 	set ..Levering = Levering
 	set ..LeveringInfo = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefTransportService().GeefLeveringInfo(Rit.GeefID(),Levering.GeefID())	
Index: vhUnitTest/APPS/TRANSP/GLS/CommunicatieService/TestResponse.cls.xml
===================================================================
diff -u -r40367 -r40503
--- vhUnitTest/APPS/TRANSP/GLS/CommunicatieService/TestResponse.cls.xml	(.../TestResponse.cls.xml)	(revision 40367)
+++ vhUnitTest/APPS/TRANSP/GLS/CommunicatieService/TestResponse.cls.xml	(.../TestResponse.cls.xml)	(revision 40503)
@@ -8,7 +8,7 @@
 	set Response = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response).%New()
 	set Response.E000 = "OK"
 	
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieService).%New()
 	do $$$AssertFalse(CommunicatieService.ResponseBevatFout(Response))
 ]]></Implementation>
 </Method>
@@ -18,7 +18,7 @@
 	set Response = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response).%New()
 	set Response.E000 = ""
 	
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieService).%New()
 	do $$$AssertFalse(CommunicatieService.ResponseBevatFout(Response))
 ]]></Implementation>
 </Method>
@@ -28,7 +28,7 @@
 	set Response = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response).%New()
 	set Response.E000 = "123456"
 	
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieService).%New()
 	do $$$AssertFalse(CommunicatieService.ResponseBevatFout(Response))
 ]]></Implementation>
 </Method>
@@ -38,11 +38,11 @@
 	set Response = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response).%New()
 	
 	set Response.E000 = "no errors have occured"	
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieService).%New()
 	do $$$AssertFalse(CommunicatieService.ResponseBevatFout(Response))
 	
 	set Response.E000 = "ADA"	
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieService).%New()
 	do $$$AssertFalse(CommunicatieService.ResponseBevatFout(Response))
 ]]></Implementation>
 </Method>
@@ -51,7 +51,7 @@
 <Implementation><![CDATA[
 	set Response = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.ParcelResponse).%New()
 	set Response.E013 = "ONBEKENDE FOUT"	
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieService).%New()
 	do $$$AssertTrue(CommunicatieService.ResponseBevatFout(Response))
 ]]></Implementation>
 </Method>
@@ -61,7 +61,7 @@
 	set Response = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response).%New()
 	set Response.E001 = "We hebben een error gekregen van GLS"
 	
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieService).%New()
 	do $$$AssertTrue(CommunicatieService.ResponseBevatFout(Response))
 ]]></Implementation>
 </Method>
@@ -71,7 +71,7 @@
 	set Response = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response).%New()
 	set Response.E006 = "Dit is een foutmelding."
 
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieService).%New()
 	#dim Error As APPS.TRANSP.GLS.GLSv1.Bericht.dto.Error = CommunicatieService.GeefFoutInResponse(Response)
 	do $$$AssertEquals("not able to make the routing : Dit is een foutmelding.",Error.Omschrijving)
 	do $$$AssertEquals("E006",Error.ErrorCode)
@@ -101,7 +101,7 @@
 <Method name="AssertFoutNiveau">
 <FormalSpec>Property:%String,VerwachtNiveau:TECH.Exceptions.enu.Niveau,Type:%String(VALUELIST=",P,F")="P"</FormalSpec>
 <Implementation><![CDATA[
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieService).%New()
 	#dim Response As APPS.TRANSP.GLS.GLSv1.Bericht.dto.ErrorResponse = $select(Type="P":##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.ParcelErrorResponse).%New(),1:##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.FreightErrorResponse).%New())
 	set $property(Response,Property)="Foutmelding"
 	#dim Error As APPS.TRANSP.GLS.GLSv1.Bericht.dto.Error = CommunicatieService.GeefFoutInResponse(Response)
Index: vhPowerTools/APPS/TRANSP/GLS/Bevestiger.cls.xml
===================================================================
diff -u -r38352 -r40503
--- vhPowerTools/APPS/TRANSP/GLS/Bevestiger.cls.xml	(.../Bevestiger.cls.xml)	(revision 38352)
+++ vhPowerTools/APPS/TRANSP/GLS/Bevestiger.cls.xml	(.../Bevestiger.cls.xml)	(revision 40503)
@@ -15,8 +15,8 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..QueryApi = ##class(TECH.Context).Instance().GeefQueryAPI()
-	set ..CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
-	set ..RequestBouwer = ..CommunicatieService.GeefRequestBouwer()
+	set ..CommunicatieServiceLocator = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New()
+	set ..RequestBouwer = ..CommunicatieServiceLocator.GeefRequestBouwer()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/APPS/TRANSP/GLS/GLSv1/CommunicatieServiceLocator.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/TRANSP/GLS/GLSv1/CommunicatieServiceLocator.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/TRANSP/GLS/GLSv1/CommunicatieServiceLocator.cls.xml	(revision 40503)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="GeefDienstBepaler">
+<ReturnType>APPS.TRANSP.GLS.GLSv1.DienstBepaler</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefDienstBepaler")
+]]></Implementation>
+</Method>
+
+<Method name="GeefRequestBouwer">
+<ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.RequestDataBouwer</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefRequestBouwer")
+]]></Implementation>
+</Method>
+
+<Method name="GeefUnitIDBepaler">
+<ReturnType>APPS.TRANSP.GLS.GLSv1.UnitIdBepaler</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefUnitIDBepaler")
+]]></Implementation>
+</Method>
+
+<Method name="GeefVerzendWijzeBepaler">
+<ReturnType>APPS.TRANSP.GLS.GLSv1.VerzendWijzeBepaler</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefVerzendWijzeBepaler")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/impl/CommunicatieService.cls.xml
===================================================================
diff -u -r29059 -r40503
--- APPS/TRANSP/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 29059)
+++ APPS/TRANSP/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40503)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.TRANSP.impl.CommunicatieService">
-<Super>%RegisteredObject,APPS.TRANSP.CommunicatieService</Super>
+<Super>TECH.RegisteredObject,APPS.TRANSP.CommunicatieService</Super>
 
 <Method name="AnnuleerLevering">
 <FormalSpec>RitID:%String,LeveringID:%String</FormalSpec>