--- a/symbian3/mw/uiresources/package_definition_3.0.xml	Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/uiresources/package_definition_3.0.xml	Wed Feb 03 20:06:22 2010 +0000
@@ -3,25 +3,32 @@
   <package id="uiresources" name="UI Resources" levels="compile plugin framework server generic data">
     <collection id="uiresources_info" name="UI Resources Info" level="data">
       <component id="uiresources_plat" filter="s60" name="UI Resources Platform Interfaces" class="api">
-      	<!-- can only have one unit, need to include these from main one -->
         <unit bldFile="uiresources_plat/group"/>
-        <unit bldFile="uiresources_plat/cdl_api/tsrc/group"/>
-        <unit bldFile="uiresources_plat/extended_fonts_api/tsrc/group"/>
-        <unit bldFile="uiresources_plat/extended_skins_api/tsrc/group"/>
-        <unit bldFile="uiresources_plat/graphic_configuration_api/tsrc/group"/>
-        <unit bldFile="uiresources_plat/layout_data_api/tsrc/group"/>
-        <unit bldFile="uiresources_plat/layout_system_private_api/tsrc/group"/>
-        <unit bldFile="uiresources_plat/skins_image_attributes_api/tsrc/group"/>
       </component>
       <component id="uiresources_pub" filter="s60" name="UI Resources Public Interfaces" class="api">
-      	<!-- can only have one unit, need to include these from main one -->
         <unit bldFile="uiresources_pub/group"/>
-        <unit bldFile="uiresources_pub/font_definition_api/tsrc/group"/>
-        <unit bldFile="uiresources_pub/graphics_api/tsrc/group"/>
-        <unit bldFile="uiresources_pub/pictograph_api/tsrc/group"/>
-        <unit bldFile="uiresources_pub/scalable_icons_api/tsrc/group"/>
-        <unit bldFile="uiresources_pub/skins_api/tsrc/group"/>
       </component>
+	  <component id="uiresources_test" filter="s60,api_test" name="UI Resources Tests" purpose="development">
+	  	<unit bldFile="tsrc/group" filter="uiresources_api_all" />
+	  </component>
+	  <!-- are these custom filters needed? -->
+	  <component id="uiresources_test_pat" filter="s60,api_test" name="UI Resources Platform API Tests" purpose="development">
+		<!-- can only have one unit. Need to #include from a common one -->
+		<unit bldFile="uiresources_plat/cdl_api/tsrc/group" filter="cdl_api" />
+		<unit bldFile="uiresources_plat/extended_fonts_api/tsrc/group" filter="extended_fonts_api" />
+		<unit bldFile="uiresources_plat/extended_skins_api/tsrc/group" filter="extended_skins_api" />
+		<unit bldFile="uiresources_plat/graphic_configuration_api/tsrc/group" filter="graphic_configuration_api" />
+		<unit bldFile="uiresources_plat/layout_data_api/tsrc/group" filter="layout_data_api" />
+		<unit bldFile="uiresources_plat/layout_system_private_api/tsrc/group" filter="layout_system_private_api" />
+	  </component>
+	  <component id="uiresources_test_pat" filter="s60,api_test" name="UI Resources Public API Tests" purpose="development">
+		<!-- can only have one unit. Need to #include from a common one -->
+		<unit bldFile="uiresources_plat/skins_image_attributes_api/tsrc/group" filter="skins_image_attributes_api" />
+		<unit bldFile="uiresources_pub/font_definition_api/tsrc/group" filter="font_definition_api" />
+		<unit bldFile="uiresources_pub/graphics_api/tsrc/group" filter="graphics_api" />
+		<unit bldFile="uiresources_pub/pictograph_api/tsrc/group" filter="pictograph_api" />
+		<unit bldFile="uiresources_pub/skins_api/tsrc/group" filter="skins_api" />
+	 </component>      
     </collection>
     <collection id="uigraphics" name="UI Graphics" level="generic">
       <component id="bitmaps2" filter="s60" name="Bitmaps 2" class="config">
@@ -36,41 +43,20 @@
       <component id="aknicon" filter="s60" name="Avkon Icon Framework">
         <unit bldFile="uigraphics/aknicon/group"/>
       </component>
-      <component id="palette" filter="s60" name="Palette Utils">
-      	<!-- should this really be commented out? why? -->
-        <!-- <unit bldFile="uigraphics/palette/group"/> -->
-      </component>
     </collection>
     <collection id="layouts" name="Layouts" level="plugin">
       <component id="cdl" filter="s60" name="Customization Definition Language">
-      	<!-- can only have one unti. Need to #include them or split into multiple components -->
+      	<!-- can only have one unit. Need to #include them or split into multiple components -->
         <unit bldFile="layouts/cdl/cdlengine/group"/>
         <unit bldFile="layouts/cdl/cdlserver/group"/>
-        <!-- <unit bldFile="layouts/cdl/cdlutils/cdlexplorer/group"/> -->
       </component>
       <component id="aknlayout2" filter="s60" name="Avkon Layout 2">
         <unit bldFile="layouts/aknlayout2/group"/>
-        <!-- need to do something with all these commented-out units -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/nhd_akn_app"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/nhd_uiaccel"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/qhd_touch_akn_app"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/qhd_touch_uiaccel"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/qvga2_akn_app"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/qvga2_uiaccel"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/qvga_akn_app"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/qvga_uiaccel"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/vga3_akn_app"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/vga3_uiaccel"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/vga_akn_app"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/vga_touch_akn_app"/> -->
-        <!-- <unit bldFile="layouts/aknlayout2/generated/vga_uiaccel"/> -->
       </component>
     </collection>
     <collection id="skins" name="Skins" level="data">
       <component id="aknskincontent" filter="s60" name="Avkon Skin Content" class="config">
         <unit bldFile="skins/aknskincontent/group"/>
-        <!-- <unit bldFile="skins/aknskincontent/srcdata/scalableseries60skin/mifindexdll"/> -->
       </component>
       <component id="aknskins" filter="s60" name="Avkon Skin Compiler">
         <unit bldFile="skins/aknskins/group"/>
@@ -79,7 +65,6 @@
     <collection id="pictographs" name="Pictographs" level="data">
       <component id="aknpictograph" filter="s60" name="Avkon Pictograph">
         <unit bldFile="pictographs/aknpictograph/group"/>
-        <!-- <unit bldFile="pictographs/aknpictograph/tools/aknpictobitmapbuilder/group"/> -->
       </component>
     </collection>
     <collection id="locales" name="Locales" level="framework">
@@ -101,27 +86,10 @@
       </component>
     </collection>
     <collection id="helpthemes" name="Help Themes" level="data">
+    	<!-- collection is really a component. Need to move down a directory -->
       <component id="helpthemes_build" filter="s60" name="Help Themes Build" class="config">
         <unit bldFile="helpthemes/group"/>
       </component>
     </collection>
-    <collection id="aknlayoutcompiler" name="Avkon Layout Compiler" level="compile">
-      <component id="aknlayoutcompiler_build" filter="s60" name="Avkon Layout Compiler Build">
-      	<!-- to be moved here -->
-        <unit bldFile="../uitools/aknlayoutcompiler/group"/>
-      </component>
-    </collection>
-    <collection id="cdlcompiler" name="CDL Compiler" level="compile">
-      <component id="cdlcompiler_build" filter="s60" name="CDL Compiler Build">
-      	<!-- to be moved here -->
-        <unit bldFile="../uitools/cdlcompiler/group"/>
-      </component>
-    </collection>
-    <collection id="cdlcompilertoolkit" name="CDL Compiler Toolkit" level="compile">
-      <component id="cdlcompilertoolkit_build" filter="s60" name="CDL Compiler Toolkit Build">
-      	<!-- to be moved here -->
-        <unit bldFile="../uitools/cdlcompilertoolkit/group"/>
-      </component>
-    </collection>
   </package>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file