Index: TECH/CSP/CSPApplicatie.cls.xml
===================================================================
diff -u -r1515 -r1533
--- TECH/CSP/CSPApplicatie.cls.xml	(.../CSPApplicatie.cls.xml)	(revision 1515)
+++ TECH/CSP/CSPApplicatie.cls.xml	(.../CSPApplicatie.cls.xml)	(revision 1533)
@@ -58,14 +58,13 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#if $system.Version.GetMajor()=5
-	set IsBeschikbaar = $data(^%SYS("CSP","Applications",ApplicatieNaam))
+		set IsBeschikbaar = $data(^%SYS("CSP","Applications",ApplicatieNaam))
 	#else
-	set HuidigeNamespace = $zutil(5)
-	znspace "%SYS"
-	set ApplicatieNaam = ..VervolledigApplicatieNaam(ApplicatieNaam)
-	set IsBeschikbaar = ##class(Security.Applications).%ExistsId(ApplicatieNaam)
-	znspace HuidigeNamespace
-	
+		set HuidigeNamespace = $zutil(5)
+		znspace "%SYS"
+		set ApplicatieNaam = ..VervolledigApplicatieNaam(ApplicatieNaam)
+		set IsBeschikbaar = ##class(Security.Applications).%ExistsId(ApplicatieNaam)
+		znspace HuidigeNamespace	
 	#endif
 	
 	quit IsBeschikbaar
@@ -77,23 +76,19 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#if $system.Version.GetMajor()=5
+		set result = $listget($get(^%SYS("CSP","Applications",CSPApplicatie)),9)
+	#else			
+		set HuidigeNamespace = $zutil(5)
 	
-	set result = $listget($get(^%SYS("CSP","Applications",CSPApplicatie)),9)
+		znspace "%SYS"
 	
-	#else
-		
-	set HuidigeNamespace = $zutil(5)
-	
-	znspace "%SYS"
-	
-	set result = ""
-	set CSPApplicatie = ..VervolledigApplicatieNaam(CSPApplicatie)
-	set Applicatie = ##class(Security.Applications).%OpenId(CSPApplicatie)
-	if $IsObject(Applicatie) {
-		set result = Applicatie.NameSpace
-	}
-	znspace HuidigeNamespace
-	
+		set result = ""
+		set CSPApplicatie = ..VervolledigApplicatieNaam(CSPApplicatie)
+		set Applicatie = ##class(Security.Applications).%OpenId(CSPApplicatie)
+		if $IsObject(Applicatie) {
+			set result = Applicatie.NameSpace
+		}
+		znspace HuidigeNamespace	
 	#endif
 	
 	quit result
@@ -106,7 +101,25 @@
 <Implementation><![CDATA[
 	if ($length(CSPApplicatie))&&($extract(CSPApplicatie)'="/") set CSPApplicatie="/"_CSPApplicatie
 	set CSPApplicatie=$zconvert(CSPApplicatie,"L")
-	quit $listget($get(^%SYS("CSP","Applications",CSPApplicatie)),2)
+	
+	set result = ""
+	
+	#if $system.Version.GetMajor()=5	
+		Set result = $listget($get(^%SYS("CSP","Applications",CSPApplicatie)),2)		
+	#else
+		set HuidigeNamespace = $zutil(5)
+	
+		znspace "%SYS"
+		
+		set CSPApplicatie = ..VervolledigApplicatieNaam(CSPApplicatie)
+		set Applicatie = ##class(Security.Applications).%OpenId(CSPApplicatie)
+		if $IsObject(Applicatie) {
+			set result = Applicatie.Path 
+		}
+		znspace HuidigeNamespace		
+	#endif
+	
+	Quit result
 ]]></Implementation>
 </Method>
 
@@ -115,18 +128,21 @@
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
 	set Namespace = $zconvert(Namespace,"U")
-	
+		
 	set listApplicaties = ##class(%ListOfDataTypes).%New()
 	
 	#if $system.Version.GetMajor()=5
+
 	set CSPApp = ""
 	for  { set CSPApp = $order(^%SYS("CSP","Applications",CSPApp))  
 		Quit:CSPApp=""
 		if $length(Namespace) { set IsValid = ..GetNameSpace(CSPApp)=Namespace }
 		else { set IsValid = 1 }
 		if IsValid do listApplicaties.Insert(CSPApp)
 	}
+	
 	#else
+
 	#endif
 
 	quit listApplicaties
@@ -174,7 +190,7 @@
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("De klasse "_CspClassName_" is geen CSP-klasse"))
 	}
 	
-	Set Server=$zconvert($zu(110),"L")
+	Set Server=$zconvert(##class(TECH.Context.RuntimeContext).Instance().GeefServerNaam(),"L")
 	Set CspClassURL=##class(TECH.ClassUtils).GetClassParameterValue(CspClassName,"CSPURL")
 	
 	Set QueryString=""