diff -r e686773b3f54 -r 0ba2181d7c28 layers.sysdef.xml
--- a/layers.sysdef.xml	Tue Feb 02 10:12:17 2010 +0200
+++ b/layers.sysdef.xml	Fri Mar 19 09:27:18 2010 +0200
@@ -1,68 +1,18 @@
 <?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_5_0.dtd" [
   <!ENTITY layer_real_source_path "sf/app/contacts" >
 ]>
 
-<SystemDefinition name="contacts" schema="1.4.0">
+<SystemDefinition name="contacts" schema="1.5.0">
   <systemModel>
-    <layer name="bldfirst_app_layer">
-      <module name="contacts">
-        <unit unitID="contacts" mrp="" bldFile="&layer_real_source_path;/group" name="contacts" />
-      </module>
-    </layer>
-    
-    <layer name="api_test_layer">
-      <module name="contacts_plat">
-        <unit unitID="cms_contactor_api" mrp="" bldFile="&layer_real_source_path;/contacts_plat/cms_contactor_api/tsrc/group" name="cms_contactor_api" />
-        <unit unitID="cca_launch_api" mrp="" bldFile="&layer_real_source_path;/contacts_plat/cca_launch_api/tsrc/group" name="cca_launch_api" />
-        <unit unitID="cca_view_plugin_api" mrp="" bldFile="&layer_real_source_path;/contacts_plat/cca_view_plugin_api/tsrc/group" name="cca_view_plugin_api" />
-        <unit unitID="contactpresence_api" mrp="" bldFile="&layer_real_source_path;/contacts_plat/contactpresence_api/tsrc/group" name="contactpresence_api" />
-        <unit unitID="presence_cache_api" mrp="" bldFile="&layer_real_source_path;/contacts_plat/presence_cache_api/tsrc/group" name="clientsrvtester" />
-        <unit unitID="virtual_phonebook_policy_api" mrp="" bldFile="&layer_real_source_path;/contacts_plat/virtual_phonebook_policy_api/tsrc/group" name="virtual_phonebook_policy_api" />
-        <unit unitID="virtual_phonebook_sim_services_api" mrp="" bldFile="&layer_real_source_path;/contacts_plat/virtual_phonebook_sim_services_api/tsrc/group" name="virtual_phonebook_sim_services_api" />        
-        <unit unitID="virtual_phonebook_store_api" mrp="" bldFile="&layer_real_source_path;/contacts_plat/virtual_phonebook_store_api/tsrc/group" name="virtual_phonebook_store_api" />        
-        <unit unitID="virtual_phonebook_vcard_api" mrp="" bldFile="&layer_real_source_path;/contacts_plat/virtual_phonebook_vcard_api/tsrc/group" name="virtual_phonebook_vcard_api" />        
-        <unit unitID="virtual_phonebook_view_definition_api" mrp="" bldFile="&layer_real_source_path;/contacts_plat/virtual_phonebook_view_definition_api/tsrc/group" name="virtual_phonebook_view_definition_api" />     
-        <unit unitID="virtual_phonebook_engine_api" mrp="" bldFile="&layer_real_source_path;/contacts_plat/virtual_phonebook_engine_api/tsrc/group" name="virtual_phonebook_engine_api" />     
-        <unit unitID="predictivesearch_client_api" mrp="" bldFile="&layer_real_source_path;/contacts_plat/predictivesearch_client_api/tsrc/group" name="predictivesearch_client_api" />        
-        <unit unitID="predictivesearch_utils_api" mrp="" bldFile="&layer_real_source_path;/contacts_plat/predictivesearch_utils_api/tsrc/group" name="predictivesearch_utils_api" />     
-        <unit unitID="rcltestsuite" mrp="" bldFile="&layer_real_source_path;/contacts_plat/phonebook_2_rcl_api/tsrc/group" name="rcltestsuite" />     
-     	<unit unitID="phonebook_2_icon_api" mrp="" bldFile="&layer_real_source_path;/contacts_plat/phonebook_2_icon_api/tsrc/ut_CPbk2IconArray/group" name="phonebook_2_icon_api" />  
-      </module>
-    </layer>  
+    <layer name="app_layer">
     
-    <layer name="unit_test_layer">
-      <module name="Phonebook2">
-         <unit unitID="Phonebook2" mrp="" bldFile="&layer_real_source_path;/phonebookui/Phonebook2/tsrc/group" name="Phonebook2" />
-         <unit unitID="remotecontactlookup" mrp="" bldFile="&layer_real_source_path;/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/saveascontactplugin/tsrc/group" name="remotecontactlookup" />
-         <unit unitID="spbcontentprovider" mrp="" bldFile="&layer_real_source_path;/phonebookui/Phonebook2/spbcontentprovider/tsrc/ut_contentprovider/group" name="spbcontentprovider" />      
-         <unit unitID="NamesListExtension" mrp="" bldFile="&layer_real_source_path;/phonebookui/Phonebook2/NamesListExtension/tsrc/group" name="NamesListExtension" />      
-      </module>
-       <module name="UIControls_Presentation_USIMExtension_CCA">
-        <unit unitID="UIControls" mrp="" bldFile="&layer_real_source_path;/phonebookui/Phonebook2/UIControls/tsrc/group" name="UIControls" />
-        <unit unitID="Presentation" mrp="" bldFile="&layer_real_source_path;/phonebookui/Phonebook2/Presentation/tsrc/group" name="Presentation" />
-        <unit unitID="USIMExtension" mrp="" bldFile="&layer_real_source_path;/phonebookui/Phonebook2/USIMExtension/tsrc/group" name="USIMExtension" />
-        <unit unitID="xSPExtensionManager" mrp="" bldFile="&layer_real_source_path;/phonebookui/Phonebook2/xSPExtensionManager/tsrc/group" name="xSPExtensionManager" />
-        <unit unitID="ccacommlauncherplugin" mrp="" bldFile="&layer_real_source_path;/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/tsrc/group" name="ccacommlauncherplugin" />
-        <unit unitID="ccacontactorservice" mrp="" bldFile="&layer_real_source_path;/phonebookui/Phonebook2/ccapplication/ccacontactorservice/tsrc/group" name="ccacontactorservice" />
-        <unit unitID="ccapp" mrp="" bldFile="&layer_real_source_path;/phonebookui/Phonebook2/ccapplication/ccapp/tsrc/group" name="ccapp" />
-        <unit unitID="ccamycardplugin" mrp="" bldFile="&layer_real_source_path;/phonebookui/Phonebook2/ccapplication/ccamycardplugin/tsrc/group" name="ccamycardplugin" />
+      <module name="contacts">
+        <unit unitID="contacts" bldFile="&layer_real_source_path;" name="contacts" mrp="" proFile="contacts.pro"/>
       </module>
-      <module name="VirtualPhonebook_VPbkCntModel">
-         <unit unitID="VirtualPhonebook" mrp="" bldFile="&layer_real_source_path;/phonebookengines/VirtualPhonebook/tsrc/group" name="VirtualPhonebook" />
-         <unit unitID="VPbkCntModel" mrp="" bldFile="&layer_real_source_path;/phonebookengines/VirtualPhonebook/VPbkCntModel/tsrc/group" name="VPbkCntModel" />
-      </module>    
-      <module name="VPbk_cms_presencecache">
-         <unit unitID="VPbkEng" mrp="" bldFile="&layer_real_source_path;/phonebookengines/VirtualPhonebook/VPbkEng/tsrc/group" name="VPbkEng" />
-         <unit unitID="VPbkEngUtils" mrp="" bldFile="&layer_real_source_path;/phonebookengines/VirtualPhonebook/VPbkEngUtils/tsrc/group" name="VPbkEngUtils" />
-         <unit unitID="VPbkSimStoreImpl" mrp="" bldFile="&layer_real_source_path;/phonebookengines/VirtualPhonebook/VPbkSimStoreImpl/tsrc/group" name="VPbkSimStoreImpl" />
-         <unit unitID="VPbkSimStoreService" mrp="" bldFile="&layer_real_source_path;/phonebookengines/VirtualPhonebook/VPbkSimStoreService/tsrc/group" name="VPbkSimStoreService" />
-        <unit unitID="bpastester" mrp="" bldFile="&layer_real_source_path;/ccservices/cmsservices/bpas/tsrc/group" name="bpastester" />
-        <unit unitID="cmsengine" mrp="" bldFile="&layer_real_source_path;/ccservices/cmsservices/cmsengine/tsrc/group" name="cmsengine" />
-        <unit unitID="contactpresence" mrp="" bldFile="&layer_real_source_path;/ccservices/cmsservices/contactpresence/tsrc/group" name="contactpresence" />
-        <unit unitID="presencetrafficlights" mrp="" bldFile="&layer_real_source_path;/ccservices/cmsservices/presencetrafficlights/tsrc/group" name="presencetrafficlights" />
-        <unit unitID="utilstester" mrp="" bldFile="&layer_real_source_path;/presencecache/presencecacheutils/tsrc/group" name="utilstester" />
-      </module>	    
+      
     </layer>
+      
+          
   </systemModel>
 </SystemDefinition>