Index: JBL Product AMF.prj.xml
===================================================================
diff -u -r1542 -r1604
--- JBL Product AMF.prj.xml	(.../JBL Product AMF.prj.xml)	(revision 1542)
+++ JBL Product AMF.prj.xml	(.../JBL Product AMF.prj.xml)	(revision 1604)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="JBL Product AMF" LastModified="2011-06-27 14:27:24">
+<Project name="JBL Product AMF" LastModified="2011-07-06 08:23:12">
   <Items>
     <ProjectItem name="%Prod.Product.INC" type="MAC"/>
     <ProjectItem name="APPS.PM.KenmerkenService" type="CLS"/>
@@ -68,6 +68,7 @@
     <ProjectItem name="PRDUPLI.MAC" type="MAC"/>
     <ProjectItem name="PRODUKT.MAC" type="MAC"/>
     <ProjectItem name="Prod.Kenmerk.DataDefinitie" type="CLS"/>
+    <ProjectItem name="Prod.Kenmerk.DataIndex" type="CLS"/>
     <ProjectItem name="Prod.Kenmerk.MetaDefinitie" type="CLS"/>
     <ProjectItem name="Prod.Kenmerk.MetaGroep" type="CLS"/>
     <ProjectItem name="Prod.Kenmerk.Orgalux" type="CLS"/>
@@ -84,8 +85,8 @@
     <ProjectItem name="WS.PM.ProductService" type="CLS"/>
     <ProjectItem name="WS.Prod.Kenmerk" type="CLS"/>
     <ProjectItem name="WS.Prod.Select" type="CLS"/>
-    <ProjectItem name="svn.StudioHook" type="CLS"/>
     <ProjectItem name="vhDeploy.Deploy20110627x1157" type="CLS"/>
+    <ProjectItem name="vhDeploy.JBL.vhDeploy20110629x1147" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.PM.OL.MasterAutoGenerator" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.PM.TestKenmerkenService" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.PM.TestProductService" type="CLS"/>
@@ -98,6 +99,7 @@
     <ProjectItem name="vhUnitTest.TECH.Concurrency.TestTransactie" type="CLS"/>
     <ProjectItem name="vhUnitTest.TECH.Concurrency.TestTxScopeGenestRequired" type="CLS"/>
     <ProjectItem name="zJBLProduct.MAC" type="MAC"/>
+    <ProjectItem name="zJBLTestZoekKenmerken.mac" type="MAC"/>
     <ProjectItem name="zTryoutJBL.mac" type="MAC"/>
   </Items>
 </Project>
Index: WS/PM/ProductService.cls.xml
===================================================================
diff -u -r1074 -r1604
--- WS/PM/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 1074)
+++ WS/PM/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 1604)
@@ -4,7 +4,7 @@
 <Description>
 JBL + 2011-03-03</Description>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%SOAP.WebService</Super>
+<Super>WS.WebService</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="SERVICENAME">
@@ -21,7 +21,13 @@
 <FormalSpec>Criteria:APPS.PM.dto.ZoekCriteria</FormalSpec>
 <ReturnType>APPS.PM.dto.ProductIDsControleResult</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Quit ##class(APPS.PM.ProductService).%New().ZoekProducten(Criteria)
+<Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	$$$chkRequiredParameter(Criteria)
+	$$$chkIsObject(Criteria)
+	Set Result = ##class(APPS.PM.ProductService).%New().ZoekProducten(Criteria)
+	$$$TECHErrorTrapOff
+	Quit Result
 ]]></Implementation>
 </Method>
 
@@ -30,39 +36,67 @@
 De klassificatiestructuur voor producten terug geven in een boomstructuur.</Description>
 <ReturnType>APPS.PM.dto.Classificatie</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Quit ##class(APPS.PM.ProductService).%New().GeefClassificatieStructuur()
+<Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	Set Result = ##class(APPS.PM.ProductService).%New().GeefClassificatieStructuur()
+	$$$TECHErrorTrapOff
+	Quit Result
 ]]></Implementation>
 </Method>
 
 <Method name="ControleerPRNrs">
 <FormalSpec>PRNrs:%ListOfDataTypes</FormalSpec>
 <ReturnType>APPS.PM.dto.ProductIDsControleResult</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Quit ##class(APPS.PM.ProductService).%New().ControleerPRNrs(PRNrs)
+<Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	$$$chkRequiredParameter(PRNrs)
+	$$$chkIsObject(PRNrs)
+	Set Result = ##class(APPS.PM.ProductService).%New().ControleerPRNrs(PRNrs)
+	$$$TECHErrorTrapOff
+	Quit Result
 ]]></Implementation>
 </Method>
 
 <Method name="ControleerKortteksten">
 <FormalSpec>Kortteksten:%ListOfDataTypes</FormalSpec>
 <ReturnType>APPS.PM.dto.ProductIDsControleResult</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Quit ##class(APPS.PM.ProductService).%New().ControleerKortteksten(Kortteksten)
+<Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	$$$chkRequiredParameter(Kortteksten)
+	$$$chkIsObject(Kortteksten)
+	Set Result = ##class(APPS.PM.ProductService).%New().ControleerKortteksten(Kortteksten)
+	$$$TECHErrorTrapOff
+	Quit Result
 ]]></Implementation>
 </Method>
 
 <Method name="ControleerDossiernrs">
 <FormalSpec>Dossiernrs:%ListOfDataTypes</FormalSpec>
 <ReturnType>APPS.PM.dto.ProductIDsControleResult</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Quit ##class(APPS.PM.ProductService).%New().ControleerDossierNrs(Dossiernrs)
+<Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	$$$chkRequiredParameter(Dossiernrs)
+	$$$chkIsObject(Dossiernrs)
+	Set Result = ##class(APPS.PM.ProductService).%New().ControleerDossierNrs(Dossiernrs)
+	$$$TECHErrorTrapOff
+	Quit Result
 ]]></Implementation>
 </Method>
 
 <Method name="ControleerIdentnrs">
 <FormalSpec>Identnrs:%ListOfDataTypes</FormalSpec>
 <ReturnType>APPS.PM.dto.ProductIDsControleResult</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Quit ##class(APPS.PM.ProductService).%New().ControleerIdentNrs(Identnrs)
+<Implementation><![CDATA[
+	$$$TECHErrorTrapOn
+	$$$chkRequiredParameter(Identnrs)
+	$$$chkIsObject(Identnrs)
+	Set Result = ##class(APPS.PM.ProductService).%New().ControleerIdentNrs(Identnrs)
+	$$$TECHErrorTrapOff
+	Quit Result
 ]]></Implementation>
 </Method>
 </Class>
Index: WS/PM/KenmerkenService.cls.xml
===================================================================
diff -u -r1551 -r1604
--- WS/PM/KenmerkenService.cls.xml	(.../KenmerkenService.cls.xml)	(revision 1551)
+++ WS/PM/KenmerkenService.cls.xml	(.../KenmerkenService.cls.xml)	(revision 1604)
@@ -28,6 +28,8 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	$$$TECHErrorTrapOn
+	$$$chkRequiredParameter(PRNrs)
+	$$$chkIsObject(PRNrs)
 	Set Result = ##class(APPS.PM.KenmerkenService).%New().GeefProductKenmerken(PRNrs,KenmerkGroepen)
 	$$$TECHErrorTrapOff
 	quit Result
@@ -44,6 +46,8 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	$$$TECHErrorTrapOn
+	$$$chkRequiredParameter(KenmerkGroepen)
+	$$$chkIsObject(KenmerkGroepen)
 	Set Result = ##class(APPS.PM.KenmerkenService).%New().GeefMetadata(KenmerkGroepen)
 	$$$TECHErrorTrapOff
 	quit Result
@@ -59,6 +63,8 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	$$$TECHErrorTrapOn
+	$$$chkRequiredParameter(ProductenKenmerken)
+	$$$chkIsObject(ProductenKenmerken)
 	set Result = ##class(APPS.PM.KenmerkenService).%New().BewaarProductenKenmerken(ProductenKenmerken)
 	$$$TECHErrorTrapOff
 	quit Result
@@ -75,6 +81,9 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	$$$TECHErrorTrapOn
+	$$$chkRequiredParameter(KenmerkGroep)
+	$$$chkRequiredParameter(UnIDs)
+	$$$chkIsObject(UnIDs)
 	set Result = ##class(APPS.PM.KenmerkenService).%New().MaakNieuweKenmerkenSets(KenmerkGroep, UnIDs)
 	$$$TECHErrorTrapOff
 	quit Result
@@ -88,6 +97,9 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	$$$TECHErrorTrapOn
+	$$$chkRequiredParameter(KenmerkGroep)
+	$$$chkRequiredParameter(UnIDs)
+	$$$chkIsObject(UnIDs)
 	set Result = ##class(APPS.PM.KenmerkenService).%New().VerwijderKenmerkenSets(KenmerkGroep, UnIDs)
 	$$$TECHErrorTrapOff
 	quit Result
Index: APPS/PM/dto/ZoekCriteria.cls.xml
===================================================================
diff -u -r1388 -r1604
--- APPS/PM/dto/ZoekCriteria.cls.xml	(.../ZoekCriteria.cls.xml)	(revision 1388)
+++ APPS/PM/dto/ZoekCriteria.cls.xml	(.../ZoekCriteria.cls.xml)	(revision 1604)
@@ -48,10 +48,12 @@
 <Description>
 Zoek tekst</Description>
 <Type>%String</Type>
+<Required>1</Required>
 </Property>
 
 <Property name="SoortProductID">
 <Type>APPS.PM.enu.SoortProductID</Type>
+<Required>1</Required>
 </Property>
 
 <Property name="StockType">