Index: Tools/CompileEnumerator.cls.xml
===================================================================
diff -u -r1518 -r1520
--- Tools/CompileEnumerator.cls.xml	(.../CompileEnumerator.cls.xml)	(revision 1518)
+++ Tools/CompileEnumerator.cls.xml	(.../CompileEnumerator.cls.xml)	(revision 1520)
@@ -11,7 +11,7 @@
 <Description>
 Do ##class(Tools.CompileEnumerator).Compile("DOM.PM.enu.Variant")</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>EnumeratorKlasse:%String,VraagBevestiging:%Boolean</FormalSpec>
+<FormalSpec>EnumeratorKlasse:%String,VraagBevestiging:%Boolean=1</FormalSpec>
 <Implementation><![CDATA[
 	w !,"=========================="_$Translate($J("",$Length(EnumeratorKlasse))," ","="),!
 	w "Compileren van enumerator "_EnumeratorKlasse,!
@@ -25,28 +25,79 @@
 	While ResultSet.Next()
 	{
 		Set ClassName = ResultSet.Data("Name")
+		//Set ClassName = "WS.PM.Maatwerk.Framework.ConfiguratieService"
 		
 		If ($Extract(ClassName,1,1) '= "%")
 		{
 			Set ClassDefinition = ##class(TECH.ClassInfo.ClassDefinition).%New(ClassName)
 			If (ClassDefinition.IsPersistent())
 			{
-				Set PropertiesIterator = ClassDefinition.GeefProperties()
-				While (PropertiesIterator.HasNext())
+				If (..BevatProperty(ClassDefinition, EnumeratorKlasse))
 				{
-					Set PropertyDefinition = PropertiesIterator.Next()
-					Set Type = PropertyDefinition.GeefType()
-					If (Type = EnumeratorKlasse)
+					Set ToCompile = ToCompile_","_ClassName_".cls"
+					w "Gebruikt in persistente klasse: "_ClassName,!
+				}
+			}
+			
+			If (ClassDefinition.IsWebservice())
+			{
+				Set IsTeCompileren = 0
+				Set TeControlerenLijst = ##class(%ListOfObjects).%New()
+				Set Gecontroleerd = ##class(%ArrayOfDataTypes).%New()
+				Do TeControlerenLijst.Insert(ClassDefinition)
+				Set i = 0
+				While ('IsTeCompileren) && (i<TeControlerenLijst.Count())
+				{
+					Set i = i + 1
+					Set TeControleren = TeControlerenLijst.GetAt(i)
+					If ($IsObject(TeControleren))
 					{
-						Set ToCompile = ToCompile_","_ClassName_".cls"
-						w "Gebruikt in: "_ClassName,!
+						If ('Gecontroleerd.IsDefined(TeControleren.GeefNaam()))
+						{
+							Do Gecontroleerd.SetAt("",TeControleren.GeefNaam())
+							If (..BevatProperty(TeControleren, EnumeratorKlasse))
+							{
+								Set ToCompile = ToCompile_","_ClassDefinition.GeefNaam()_".cls"
+								w "Gebruikt in webservice: "_ClassDefinition.GeefNaam(),!
+								Set IsTeCompileren = 1
+							}
+							Else
+							{
+								Set PropertiesIterator = TeControleren.GeefProperties()
+								While (PropertiesIterator.HasNext())
+								{
+									Set PropertyDefinition = PropertiesIterator.Next()
+									Do TeControlerenLijst.Insert(##class(TECH.ClassInfo.ClassDefinition).%New(PropertyDefinition.GeefType()))
+								}
+								
+								Set MethodsIterator = TeControleren.GeefMethods()
+								While (MethodsIterator.HasNext())
+								{
+									Set MethodDefinition = MethodsIterator.Next()
+									Do TeControlerenLijst.Insert(##class(TECH.ClassInfo.ClassDefinition).%New(MethodDefinition.GeefType()))
+									Set ParamatersIterator = MethodDefinition.GeefParameters()
+									While (ParamatersIterator.HasNext())
+									{
+										Set ParameterDefinition = ParamatersIterator.Next()
+										Do TeControlerenLijst.Insert(##class(TECH.ClassInfo.ClassDefinition).%New(ParameterDefinition.GeefType()))
+									}
+								}
+								
+								Set SuperKlassenIterator = TeControleren.GeefSuperKlassen()
+								While (SuperKlassenIterator.HasNext())
+								{
+									Set SuperKlasse = SuperKlassenIterator.Next()
+									Do TeControlerenLijst.Insert(##class(TECH.ClassInfo.ClassDefinition).%New(SuperKlasse))
+								}
+							}
+						}
 					}
 				}
 			}
 		}		
 	}
 	
-	If ($L(ToCompile) > 0)
+	If ($L(ToCompile) > $L(EnumeratorKlasse_".cls"))
 	{
 		If (VraagBevestiging)
 		{
@@ -58,14 +109,34 @@
 			}
 		}
 		
-		w !!,"Compileren ...",!!
-		Do $SYSTEM.OBJ.CompileList(ToCompile,"cfvko1",.ErrorLog)
+		If (Input = "Y")
+		{
+			w !!,"Compileren ...",!!
+			Do $SYSTEM.OBJ.CompileList(ToCompile,"cfvko1",.ErrorLog)
+		}
 	}
 	Else
 	{
 		w !!,"Niks gevonden ...",!!
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="BevatProperty">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ClassDefinition:%Dictionary.ClassDefinition,EnumeratorKlasse:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set BevatProperty = 0
+	Set PropertiesIterator = ClassDefinition.GeefProperties()
+	While ('BevatProperty) && (PropertiesIterator.HasNext())
+	{
+		Set PropertyDefinition = PropertiesIterator.Next()
+		Set Type = PropertyDefinition.GeefType()
+		Set BevatProperty = (Type = EnumeratorKlasse)
+	}
+	Quit BevatProperty
+]]></Implementation>
+</Method>
 </Class>
 </Export>