Index: WS/SOAPClientExt.cls.xml
===================================================================
diff -u -r2 -r8
--- WS/SOAPClientExt.cls.xml	(.../SOAPClientExt.cls.xml)	(revision 2)
+++ WS/SOAPClientExt.cls.xml	(.../SOAPClientExt.cls.xml)	(revision 8)
@@ -56,7 +56,7 @@
 De PeekSOAPServer() method bevat wel errortrapping. <BR>
 Het derde arg. MailParamType (="TBX_ERR") bepaald de mail die verzonden wordt in geval van fouten. <BR>]]></Description>
 <Abstract>1</Abstract>
-<IncludeCode>%VHMacro,%occInclude</IncludeCode>
+<IncludeCode>vhLib.Macro,%occInclude</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <ClassDefinitionError>0</ClassDefinitionError>
 
Index: WS/TBX/DataIOSoap.cls.xml
===================================================================
diff -u -r2 -r8
--- WS/TBX/DataIOSoap.cls.xml	(.../DataIOSoap.cls.xml)	(revision 2)
+++ WS/TBX/DataIOSoap.cls.xml	(.../DataIOSoap.cls.xml)	(revision 8)
@@ -98,5 +98,15 @@
 	Quit $S(locNdx<0:0, 1:1)
 ]]></Implementation>
 </Method>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	set ..Location = ##class(TECH.Config.ConfigMgr).Instance().GetString("WS.TBX.DataIOSoap_Location")
+	quit $$$OK
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: WS/TBX/CalcSoap.cls.xml
===================================================================
diff -u -r2 -r8
--- WS/TBX/CalcSoap.cls.xml	(.../CalcSoap.cls.xml)	(revision 2)
+++ WS/TBX/CalcSoap.cls.xml	(.../CalcSoap.cls.xml)	(revision 8)
@@ -5,12 +5,6 @@
 <Super>%SOAP.WebClient,WS.SOAPClientExt</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Parameter name="LOCATION">
-<Description>
-This is the URL used to access the web service.</Description>
-<Default>http://cache01/csp/admin1/WS.TBX.Calc.cls</Default>
-</Parameter>
-
 <Parameter name="NAMESPACE">
 <Description>
 This is the namespace used by the Service</Description>
@@ -81,6 +75,13 @@
 	Do ..SetLocation($LG(lbLocations,locNdx))
 	Do ..SetTimeOut(60)   ; Default
 	Quit $S(locNdx<0:0, 1:1)
+	
+	
+	Set WebServiceRoot = ##class(TECH.Config.ConfigMgr).Instance().GetString("SOAPlib_ProductieWebServiceLocation")
+	Set Location = ##class(TECH.Files).AppendFile(WebServiceRoot,"WS.TBX.Calc.cls")
+	Do ..SetLocation(Location)
+	Do ..SetTimeOut(60)   ; Default
+	Quit $$$True
 ]]></Implementation>
 </Method>
 </Class>
Index: WS/PR/KADWebSoap.cls.xml
===================================================================
diff -u -r2 -r8
--- WS/PR/KADWebSoap.cls.xml	(.../KADWebSoap.cls.xml)	(revision 2)
+++ WS/PR/KADWebSoap.cls.xml	(.../KADWebSoap.cls.xml)	(revision 8)
@@ -4,12 +4,6 @@
 <Super>%SOAP.WebClient,WS.SOAPClientExt</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Parameter name="LOCATION">
-<Description>
-This is the URL used to access the web service.</Description>
-<Default>http://cache02/csp/admin1/WS.PR.KADWeb.cls</Default>
-</Parameter>
-
 <Parameter name="NAMESPACE">
 <Description>
 This is the namespace used by the Service</Description>
@@ -57,5 +51,15 @@
 	Quit $S(locNdx<0:0, 1:1)
 ]]></Implementation>
 </Method>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	set ..Location = ##class(TECH.Config.ConfigMgr).Instance().GetString("WS.PR.KADWebSoap_Location")
+	quit $$$OK
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: WS/TBX/DataIOWWW.cls.xml
===================================================================
diff -u -r2 -r8
--- WS/TBX/DataIOWWW.cls.xml	(.../DataIOWWW.cls.xml)	(revision 2)
+++ WS/TBX/DataIOWWW.cls.xml	(.../DataIOWWW.cls.xml)	(revision 8)
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
 <Class name="WS.TBX.DataIOWWW">
-<Description>
-Web Service voor Import/Export van data
-Class WS.TBX.DataIOWWW Extends %VHSys.SOAP.WebService [ ProcedureBlock ]</Description>
-<IncludeCode>%VHMacro,BL.EC.Common</IncludeCode>
+<IncludeCode>vhLib.Macro,BL.EC.Common</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%SOAP.WebService</Super>
+<Super>WS.WebService</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="SERVICENAME">
@@ -15,19 +12,11 @@
 <Default>TBX.DataIOWWW</Default>
 </Parameter>
 
-<Parameter name="LOCATION">
-<Description>
-This is the URL used to access the web service. 
-  Location on CacheWWW/hadev  : "http://iserv.vanhoecke.be/csp/hadev"; 
-  Location on CacheWWW/demo   : "http://iserv.vanhoecke.be/csp/demo";  </Description>
-<Default>http://iserv.vanhoecke.be/csp/hadev</Default>
-</Parameter>
-
 <Parameter name="NAMESPACE">
 <Description>
 TODO: change this to actual SOAP namespace.
 SOAP Namespace for the WebService</Description>
-<Default>http://tempuri.org</Default>
+<Default>http://vhisie.vanhoecke.be</Default>
 </Parameter>
 
 <Method name="WSOrdToWWW">
@@ -83,11 +72,14 @@
 <ReturnType>%String</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	s ^zJCL(+$H,$zts)="Order Id "_WSOrderID_" Sec : "_SecureKey_" ProptName "_ProptName_" ProptValue : "_ProptValue
 	Quit:('$G(WSOrderID)) ""
 	// Check secure key and client's IP-address 
 	Set sc=$S('..CheckAccessWS(SecureKey):$$$ERROR($$$GeneralError,"No Access. SecureKey not accepted."), 1:$$$OK)
 	Quit:($$$ISERR(sc)) $$ParseStatus^vhLib(sc)
-	Quit ##class(BL.PR.GA.TandemBox).UpdateWSOrdPropts(.WSOrderID,.ProptName,.ProptValue)
+	set result = ##class(BL.PR.GA.TandemBox).UpdateWSOrdPropts(.WSOrderID,.ProptName,.ProptValue)
+	s ^zJCL(+$H,$zts)="result : "_result
+	quit result
 ]]></Implementation>
 </Method>