Index: APPS/TRANSP/GLS/Socket/impl/Factory.cls.xml
===================================================================
diff -u -r29059 -r40358
--- APPS/TRANSP/GLS/Socket/impl/Factory.cls.xml	(.../Factory.cls.xml)	(revision 29059)
+++ APPS/TRANSP/GLS/Socket/impl/Factory.cls.xml	(.../Factory.cls.xml)	(revision 40358)
@@ -68,15 +68,15 @@
 <FormalSpec>Request:APPS.TRANSP.GLS.Bericht.dto.Request</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (Request.T805 = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefGLSEigenschappen().GeefGebruikerID(##class(APPS.TRANSP.GLS.enu.Dienst).Freight()))
+<Implementation><![CDATA[	Quit (Request.T805 = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefGLSEigenschappen().GeefGebruikerID(##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Freight()))
 ]]></Implementation>
 </Method>
 
 <Method name="IsParcel">
 <FormalSpec>Request:APPS.TRANSP.GLS.Bericht.dto.Request</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (Request.T805 = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefGLSEigenschappen().GeefGebruikerID(##class(APPS.TRANSP.GLS.enu.Dienst).Parcel()))
+<Implementation><![CDATA[	Quit (Request.T805 = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefGLSEigenschappen().GeefGebruikerID(##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Parcel()))
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/TRANSP/GLS/impl/DienstBepalerDistributeurDataVisitor.cls.xml
===================================================================
diff -u -r29059 -r40358
--- APPS/TRANSP/GLS/impl/DienstBepalerDistributeurDataVisitor.cls.xml	(.../DienstBepalerDistributeurDataVisitor.cls.xml)	(revision 29059)
+++ APPS/TRANSP/GLS/impl/DienstBepalerDistributeurDataVisitor.cls.xml	(.../DienstBepalerDistributeurDataVisitor.cls.xml)	(revision 40358)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.TRANSP.GLS.impl.DienstBepalerDistributeurDataVisitor">
-<Super>DOM.TRANSP.DistributeurDataVisitor,%RegisteredObject</Super>
+<Super>TECH.RegisteredObject,DOM.TRANSP.DistributeurDataVisitor</Super>
 
 <Property name="Dienst">
-<Type>APPS.TRANSP.GLS.enu.Dienst</Type>
+<Type>APPS.TRANSP.GLS.GLSv1.enu.Dienst</Type>
 </Property>
 
 <Property name="DienstBepaler">
-<Type>APPS.TRANSP.GLS.DienstBepaler</Type>
+<Type>APPS.TRANSP.GLS.impl.DienstBepaler</Type>
 </Property>
 
 <Method name="%OnNew">
@@ -30,7 +30,7 @@
 </Method>
 
 <Method name="GeefDienst">
-<ReturnType>APPS.TRANSP.GLS.enu.Dienst</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.enu.Dienst</ReturnType>
 <Implementation><![CDATA[	Quit ..Dienst
 ]]></Implementation>
 </Method>
Index: APPS/TRANSP/GLS/impl/DienstBepaler.cls.xml
===================================================================
diff -u -r40355 -r40358
--- APPS/TRANSP/GLS/impl/DienstBepaler.cls.xml	(.../DienstBepaler.cls.xml)	(revision 40355)
+++ APPS/TRANSP/GLS/impl/DienstBepaler.cls.xml	(.../DienstBepaler.cls.xml)	(revision 40358)
@@ -5,13 +5,13 @@
 
 <Method name="GeefDienst">
 <FormalSpec>VerzendWijze:APPS.TRANSP.GLS.Bericht.enu.VerzendWijze</FormalSpec>
-<ReturnType>APPS.TRANSP.GLS.enu.Dienst</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.enu.Dienst</ReturnType>
 <Implementation><![CDATA[
-	#dim Dienst As APPS.TRANSP.GLS.enu.Dienst = ""
+	#dim Dienst As APPS.TRANSP.GLS.GLSv1.enu.Dienst = ""
  	if ##class(TECH.StringUtils).StartsWith(VerzendWijze,"Parcel") {
-	 	set Dienst = ##class(APPS.TRANSP.GLS.enu.Dienst).Parcel()
+	 	set Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Parcel()
  	} elseif ##class(TECH.StringUtils).StartsWith(VerzendWijze,"Freight") {
-	 	set Dienst = ##class(APPS.TRANSP.GLS.enu.Dienst).Freight()
+	 	set Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Freight()
  	}
  	quit Dienst
 ]]></Implementation>
Index: vhUnitTest/APPS/TRANSP/GLS/DienstBepaler/TestDienstBepaler.cls.xml
===================================================================
diff -u -r29059 -r40358
--- vhUnitTest/APPS/TRANSP/GLS/DienstBepaler/TestDienstBepaler.cls.xml	(.../TestDienstBepaler.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/TRANSP/GLS/DienstBepaler/TestDienstBepaler.cls.xml	(.../TestDienstBepaler.cls.xml)	(revision 40358)
@@ -6,16 +6,16 @@
 <Method name="Test">
 <Implementation><![CDATA[
 	
-	do ..AssertDienst(##class(APPS.TRANSP.GLS.Bericht.enu.VerzendWijze).Parcel(),##class(APPS.TRANSP.GLS.enu.Dienst).Parcel())
-	do ..AssertDienst(##class(APPS.TRANSP.GLS.Bericht.enu.VerzendWijze).ParcelCashOnDelivery(),##class(APPS.TRANSP.GLS.enu.Dienst).Parcel())
+	do ..AssertDienst(##class(APPS.TRANSP.GLS.Bericht.enu.VerzendWijze).Parcel(),##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Parcel())
+	do ..AssertDienst(##class(APPS.TRANSP.GLS.Bericht.enu.VerzendWijze).ParcelCashOnDelivery(),##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Parcel())
 	
-	do ..AssertDienst(##class(APPS.TRANSP.GLS.Bericht.enu.VerzendWijze).Freight(),##class(APPS.TRANSP.GLS.enu.Dienst).Freight())
-	do ..AssertDienst(##class(APPS.TRANSP.GLS.Bericht.enu.VerzendWijze).FreightCashOnDelivery(),##class(APPS.TRANSP.GLS.enu.Dienst).Freight())
+	do ..AssertDienst(##class(APPS.TRANSP.GLS.Bericht.enu.VerzendWijze).Freight(),##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Freight())
+	do ..AssertDienst(##class(APPS.TRANSP.GLS.Bericht.enu.VerzendWijze).FreightCashOnDelivery(),##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Freight())
 ]]></Implementation>
 </Method>
 
 <Method name="AssertDienst">
-<FormalSpec>VerzendWijze:APPS.TRANSP.GLS.Bericht.enu.VerzendWijze,RefDienst:APPS.TRANSP.GLS.enu.Dienst</FormalSpec>
+<FormalSpec>VerzendWijze:APPS.TRANSP.GLS.Bericht.enu.VerzendWijze,RefDienst:APPS.TRANSP.GLS.GLSv1.enu.Dienst</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim Commentaar As %String = VerzendWijze_" - "_RefDienst
Index: APPS/TRANSP/GLS/impl/GLSEigenschappen.cls.xml
===================================================================
diff -u -r34664 -r40358
--- APPS/TRANSP/GLS/impl/GLSEigenschappen.cls.xml	(.../GLSEigenschappen.cls.xml)	(revision 34664)
+++ APPS/TRANSP/GLS/impl/GLSEigenschappen.cls.xml	(.../GLSEigenschappen.cls.xml)	(revision 40358)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.TRANSP.GLS.impl.GLSEigenschappen">
-<Super>%RegisteredObject,APPS.TRANSP.GLS.GLSEigenschappen</Super>
+<Super>TECH.RegisteredObject,APPS.TRANSP.GLS.GLSEigenschappen</Super>
 
 <Parameter name="ParcelOndergrens">
 <Description>
@@ -68,7 +68,7 @@
 </Parameter>
 
 <Property name="DienstBepaler">
-<Type>APPS.TRANSP.GLS.DienstBepaler</Type>
+<Type>APPS.TRANSP.GLS.impl.DienstBepaler</Type>
 </Property>
 
 <Method name="%OnNew">
@@ -87,11 +87,11 @@
 <FormalSpec>VerzendWijze:APPS.TRANSP.GLS.Bericht.enu.VerzendWijze</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim GLSContactID As %String 
-	#dim Dienst As APPS.TRANSP.GLS.enu.Dienst = ..DienstBepaler.GeefDienst(VerzendWijze)
-	If (Dienst = ##class(APPS.TRANSP.GLS.enu.Dienst).Freight()){
+	#dim GLSContactID As %String
+	#dim Dienst As APPS.TRANSP.GLS.GLSv1.enu.Dienst = ..DienstBepaler.GeefDienst(VerzendWijze)
+	If (Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Freight()){
 		Set GLSContactID = ..#FreightGLSContactID
-	}ElseIf (Dienst = ##class(APPS.TRANSP.GLS.enu.Dienst).Parcel()){
+	}ElseIf (Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Parcel()){
 		Set GLSContactID = ..#ParcelGLSContactID	
 	}else {
 		set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Verzendwijze '"_VerzendWijze_"' is niet ondersteund.")
@@ -107,11 +107,11 @@
 <FormalSpec>VerzendWijze:APPS.TRANSP.GLS.Bericht.enu.VerzendWijze</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim GLSGebruikerID As %String 
-	#dim Dienst As APPS.TRANSP.GLS.enu.Dienst = ..DienstBepaler.GeefDienst(VerzendWijze)
-	If (Dienst = ##class(APPS.TRANSP.GLS.enu.Dienst).Freight()){
+	#dim GLSGebruikerID As %String
+	#dim Dienst As APPS.TRANSP.GLS.GLSv1.enu.Dienst = ..DienstBepaler.GeefDienst(VerzendWijze)
+	If (Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Freight()){
 		Set GLSGebruikerID = ..#FreightGLSGebruikerID
-	}ElseIf (Dienst = ##class(APPS.TRANSP.GLS.enu.Dienst).Parcel()){
+	}ElseIf (Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Parcel()){
 		Set GLSGebruikerID = ..#ParcelGLSGebruikerID
 	}else {
 		set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Verzendwijze '"_VerzendWijze_"' is niet ondersteund.")
@@ -127,11 +127,11 @@
 <FormalSpec>VerzendWijze:APPS.TRANSP.GLS.Bericht.enu.VerzendWijze</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim GebruikerID As %String 
-	#dim Dienst As APPS.TRANSP.GLS.enu.Dienst = ..DienstBepaler.GeefDienst(VerzendWijze)
-	If (Dienst = ##class(APPS.TRANSP.GLS.enu.Dienst).Freight()){
+	#dim GebruikerID As %String
+	#dim Dienst As APPS.TRANSP.GLS.GLSv1.enu.Dienst = ..DienstBepaler.GeefDienst(VerzendWijze)
+	If (Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Freight()){
 		Set GebruikerID = ..#FreightGebruikerID
-	}ElseIf (Dienst = ##class(APPS.TRANSP.GLS.enu.Dienst).Parcel()){
+	}ElseIf (Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Parcel()){
 		Set GebruikerID = ..#ParcelGebruikerID
 	}else {
 		set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Verzendwijze '"_VerzendWijze_"' is niet ondersteund.")
Index: APPS/TRANSP/GLS/Bericht/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r35164 -r40358
--- APPS/TRANSP/GLS/Bericht/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 35164)
+++ APPS/TRANSP/GLS/Bericht/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 40358)
@@ -90,12 +90,12 @@
 <ReturnType>APPS.TRANSP.GLS.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.enu.Dienst = CommunicatieService.GeefDienstBepaler().GeefDienst(VerzendData.VerzendWijze)
+	#dim Dienst As APPS.TRANSP.GLS.GLSv1.enu.Dienst = CommunicatieService.GeefDienstBepaler().GeefDienst(VerzendData.VerzendWijze)
 	
 	#dim ReleaseRequest As APPS.TRANSP.GLS.Bericht.dto.ReleaseRequest
-	if Dienst = ##class(APPS.TRANSP.GLS.enu.Dienst).Freight() {
+	if Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Freight() {
 		 set ReleaseRequest = ..MaakFreightReleaseRequest(VerzendData.ID,VerzendData.UnitID , IsLaatsteUnit)
-	} elseif Dienst = ##class(APPS.TRANSP.GLS.enu.Dienst).Parcel() {
+	} elseif Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Parcel() {
 		 set ReleaseRequest = ..MaakParcelReleaseRequest(VerzendData.ID,VerzendData.UnitID)
 	}
 	quit ReleaseRequest
@@ -109,7 +109,7 @@
 <Implementation><![CDATA[
 	set ReleaseRequest = ##class(APPS.TRANSP.GLS.Bericht.dto.FreightReleaseRequest).%New(VerzendDataID)
 	set ReleaseRequest.T090 = "DAYEND"_$select(IsLaatsteUnit:"-END",1:"")
-	set ReleaseRequest.T805 = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefGLSEigenschappen().GeefGebruikerID(##class(APPS.TRANSP.GLS.enu.Dienst).Freight())
+	set ReleaseRequest.T805 = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefGLSEigenschappen().GeefGebruikerID(##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Freight())
 	set ReleaseRequest.T400 = UnitID
 	quit ReleaseRequest
 ]]></Implementation>
@@ -122,7 +122,7 @@
 <Implementation><![CDATA[
 	set ReleaseRequest = ##class(APPS.TRANSP.GLS.Bericht.dto.ParcelReleaseRequest).%New(VerzendDataID)
 	set ReleaseRequest.T090 = "UPDATE"
-	set ReleaseRequest.T805 = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefGLSEigenschappen().GeefGebruikerID(##class(APPS.TRANSP.GLS.enu.Dienst).Parcel())
+	set ReleaseRequest.T805 = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefGLSEigenschappen().GeefGebruikerID(##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Parcel())
 	set ReleaseRequest.T400 = UnitID
 	set ReleaseRequest.T545 = ..GeefGeformateerdeDatum(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate())
 	quit ReleaseRequest
Index: APPS/TRANSP/GLS/GLSv1/enu/Dienst.cls.xml
===================================================================
diff -u -r29059 -r40358
--- APPS/TRANSP/GLS/GLSv1/enu/Dienst.cls.xml	(.../enu/Dienst.cls.xml)	(revision 29059)
+++ APPS/TRANSP/GLS/GLSv1/enu/Dienst.cls.xml	(.../GLSv1/enu/Dienst.cls.xml)	(revision 40358)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="APPS.TRANSP.GLS.enu.Dienst">
+<Class name="APPS.TRANSP.GLS.GLSv1.enu.Dienst">
 <ClassType>datatype</ClassType>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%EnumString</Super>
@@ -22,14 +22,14 @@
 
 <Method name="Parcel">
 <ClassMethod>1</ClassMethod>
-<ReturnType>APPS.TRANSP.GLS.enu.Dienst</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.enu.Dienst</ReturnType>
 <Implementation><![CDATA[	Quit "Parcel"
 ]]></Implementation>
 </Method>
 
 <Method name="Freight">
 <ClassMethod>1</ClassMethod>
-<ReturnType>APPS.TRANSP.GLS.enu.Dienst</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.enu.Dienst</ReturnType>
 <Implementation><![CDATA[	Quit "Freight"
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/TRANSP/GLS/Socket/impl/Factory/TestGeefSocket.cls.xml
===================================================================
diff -u -r29059 -r40358
--- vhUnitTest/APPS/TRANSP/GLS/Socket/impl/Factory/TestGeefSocket.cls.xml	(.../TestGeefSocket.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/TRANSP/GLS/Socket/impl/Factory/TestGeefSocket.cls.xml	(.../TestGeefSocket.cls.xml)	(revision 40358)
@@ -24,7 +24,7 @@
 
 <Method name="TestGeefFreight">
 <Implementation><![CDATA[
-	set ..Request.T805 = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefGLSEigenschappen().GeefGebruikerID(##class(APPS.TRANSP.GLS.enu.Dienst).Freight())
+	set ..Request.T805 = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefGLSEigenschappen().GeefGebruikerID(##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Freight())
 	#dim Socket As APPS.TRANSP.GLS.Socket.GLSSocket = ..Factory.GeefSocket(..Request)
 	
 	do $$$AssertContains(Socket.%ClassName(1),"Freight")
@@ -33,7 +33,7 @@
 
 <Method name="TestGeefParcel">
 <Implementation><![CDATA[
-	set ..Request.T805 = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefGLSEigenschappen().GeefGebruikerID(##class(APPS.TRANSP.GLS.enu.Dienst).Parcel())
+	set ..Request.T805 = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefGLSEigenschappen().GeefGebruikerID(##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Parcel())
 	#dim Socket As APPS.TRANSP.GLS.Socket.GLSSocket = ..Factory.GeefSocket(..Request)
 	
 	do $$$AssertContains(Socket.%ClassName(1),"Parcel")
Index: APPS/OV/impl/GLSTrackAndTrace.cls.xml
===================================================================
diff -u -r29059 -r40358
--- APPS/OV/impl/GLSTrackAndTrace.cls.xml	(.../GLSTrackAndTrace.cls.xml)	(revision 29059)
+++ APPS/OV/impl/GLSTrackAndTrace.cls.xml	(.../GLSTrackAndTrace.cls.xml)	(revision 40358)
@@ -47,13 +47,13 @@
 	#dim CommunicatieService As APPS.TRANSP.GLS.CommunicatieService = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefCommunicatieService(##class(DOM.TRANSP.enu.Transporteur).GLSBelgium())
 	#dim DienstBepaler As APPS.TRANSP.GLS.DienstBepaler = CommunicatieService.GeefDienstBepaler()
 	
-	#dim Dienst As APPS.TRANSP.GLS.enu.Dienst = DienstBepaler.GeefDienst(..GeefVerzendWijze(Levering))
+	#dim Dienst As APPS.TRANSP.GLS.GLSv1.enu.Dienst = DienstBepaler.GeefDienst(..GeefVerzendWijze(Levering))
 	
 	#dim URL As %String = ""
 	Set GLSTools = ##class(APPS.OV.impl.GLSTools).%New()
-	If Dienst = ##class(APPS.TRANSP.GLS.enu.Dienst).Freight() {
+	If Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Freight() {
 		set URL = ..GeefFreightTrackAndTraceURL(Levering,Taal)
-	} elseif  Dienst = ##class(APPS.TRANSP.GLS.enu.Dienst).Parcel() {
+	} elseif  Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Parcel() {
 		set URL = ..GeefParcelTrackAndTraceURL(Levering,Taal)
 	} else {
 		set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Voor dienst "_Dienst_" is Track And Trace mogelijk. Levering: "_Levering.GeefID())
FishEye: Tag 40358 refers to a dead (removed) revision in file `APPS/TRANSP/GLS/enu/Dienst.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?