# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1257962604 0
# Node ID d58c47cf1f411aa5b02a705d32a0e04c1ec8db83
# Parent  71e33828c0aa5a04ef58043b4c66807332a1ad2f
Remove 3k and FCL codelines as no more used

diff -r 71e33828c0aa -r d58c47cf1f41 3k/adaptation/stubs/package_definition.xml
--- a/3k/adaptation/stubs/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="adaptation" long-name="Adaptation">
-<block name="stubs" long-name="Stubs" tech_domain="hb" levels="adaptation plugin mid engine">
-    <collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
-     <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" origin-model="foundation">
-      <!-- <unit bldFile="/sf/adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/audiovibracontrolcistub/group"/> -->
-      <!-- <unit bldFile="/sf/adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/custominterfaceproxyfactory_stub/group"/> -->
-      <!-- <unit bldFile="/sf/adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/messagehandlerfactory_stub/group"/> -->
-      <unit bldFile="/sf/adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
-     </component>
-     <component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
-     </component>
-    </collection>
-    <collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
-     <component name="drm_stubs_build" long-name="DRM Stubs Component" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/drm_stubs/group"/>
-     </component>
-    </collection>
-    <collection name="ptit9core_stub" long-name="PTI T9 Core Stub" level="plugin">
-     <component name="ptit9core_stub_build" long-name="PTI T9 Core Stub Component" origin-model="foundation"/>
-    </collection>
-    <collection name="btaudioadaptation_stub" long-name="BT Audio Adaptation Stub" level="adaptation">
-     <component name="btaudioadaptation_stub_build" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/btaudioadaptation_stub/group"/>
-     </component>
-    </collection>
-    <collection name="posmsgpluginreferenceimpl" long-name="Pos Msg Plugin Reference Implementation" level="plugin">
-     <component name="eposomasuplposrefapp" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
-     </component>
-    </collection>
-    <collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
-     <component name="asnimplementation" long-name="ASN Implementation" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
-     </component>
-    </collection>
-    <collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
-     <component name="power_save_display_mode_stub_build" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/power_save_display_mode_stub/group"/>
-     </component>
-    </collection>
-    <collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
-     <component name="adaptationhwdevice" long-name="Adaptation Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="/sf/adaptation/stubs/srsfenginestub/adaptationhwdevice/group"/> -->
-     </component>
-     <component name="grcompilerhwdevice" long-name="GR Compiler Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="/sf/adaptation/stubs/srsfenginestub/grcompilerhwdevice/group"/> -->
-     </component>
-     <component name="ttphwdevice" long-name="TTP Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="/sf/adaptation/stubs/srsfenginestub/ttphwdevice/group"/> -->
-     </component>
-     <component name="recognitionhwdevice" long-name="Recognition Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="/sf/adaptation/stubs/srsfenginestub/recognitionhwdevice/group"/> -->
-     </component>
-     <component name="vocmanhwdevice" long-name="Voc Man Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="/sf/adaptation/stubs/srsfenginestub/vocmanhwdevice/group"/> -->
-     </component>
-     <component name="ttshwdevice" long-name="TTS Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="/sf/adaptation/stubs/srsfenginestub/ttshwdevice/group"/> -->
-     </component>
-     <component name="nlphwdevice" long-name="NLP Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="/sf/adaptation/stubs/srsfenginestub/nlphwdevice/group"/> -->
-     </component>
-     <component unofficial="yes" name="srsfenginestub_build" long-name="SRSF Engine Stub Build" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/srsfenginestub/group"/>
-     </component>
-    </collection>
-    <collection name="systemswstubs" long-name="System SW Stubs" level="adaptation">
-     <component name="accessorypolicyreference" long-name="Accessory Policy Reference" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/systemswstubs/accessorypolicyreference/group"/>
-     </component>
-     <component name="asyreference" long-name="ASY Reference" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/systemswstubs/asyreference/group"/>
-     </component>
-     <component name="examplecommonisc" long-name="Example Common ISC" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/systemswstubs/examplecommonisc/group"/>
-     </component>
-     <component name="exampledsy" long-name="Example DSY" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/systemswstubs/exampledsy/group"/>
-     </component>
-     <component name="featuremanagerstub" long-name="Feature Manager Stub" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/systemswstubs/featuremanagerstub/group"/>
-     </component>
-     <component name="tvoutconfig" long-name="TVOut Config" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/systemswstubs/tvoutconfig/group"/>
-     </component>
-     <component name="hwrmstubplugins" long-name="HWRM Stub Plugins" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/systemswstubs/hwrmstubplugins/group"/>
-     </component>
-     <component name="hwrmhapticsstubplugin" long-name="HWRM Haptics Stub Plugin" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group"/>
-     </component>
-     <component name="sensorchannelsreference" long-name="Sensor Channels Reference" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/systemswstubs/sensorchannelsreference/group"/>
-     </component>
-     <component name="ssyreference" long-name="SSY Rreference" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/systemswstubs/ssyreference/group"/>
-     </component>
-     <component name="startupadaptationstub" long-name="Startup Adaptation Stub" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/systemswstubs/startupadaptationstub/group"/>
-     </component>
-     <component name="tiltcompensationstub" long-name="Tilt Compensation Stub" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/systemswstubs/tiltcompensationstub/group"/>
-     </component>
-     <component name="wiredbearerreference" long-name="Wired Bearer Teference" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/systemswstubs/wiredbearerreference/group"/>
-     </component>
-     <component unofficial="yes" name="systemswstubs_build" long-name="System SW Stubs Build" origin-model="foundation">
-      <!-- <unit bldFile="/sf/adaptation/stubs/systemswstubs/group"/> -->
-     </component>
-    </collection>
-    <collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
-     <component name="tactileclickplugin_build" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/tactileclickplugin_stub/group"/>
-     </component>
-    </collection>
-    <collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
-     <component name="wlanhwinit" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/wlanhwinit_stub/group"/>
-     </component>
-    </collection>
-    <collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
-     <component name="ocrsrv" origin-model="foundation">
-      <unit bldFile="/sf/adaptation/stubs/ocrsrv_stub/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
diff -r 71e33828c0aa -r d58c47cf1f41 3k/adaptation/stubs/sources.csv
--- a/3k/adaptation/stubs/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/camera/package_definition.xml
--- a/3k/app/camera/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="camera" long-name="Camera Apps" tech_domain="ma" level="apps" levels="empty 1">
-    <collection name="camerauis" long-name="Camera UIs" level="1">
-     <component name="activepalette" long-name="Active Palette" origin-model="foundation">
-      <unit bldFile="/sf/app/camera/camerauis/activepalette/group"/>
-     </component>
-     <component name="cameraapp" long-name="Camera Application" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/camera/camerauis/cameraapp/generic/camerauiconfigmanager/group"/> -->
-      <!-- <unit bldFile="/sf/app/camera/camerauis/cameraapp/generic/gscamcorderplugin/group"/> -->
-      <unit bldFile="/sf/app/camera/camerauis/cameraapp/group"/>
-      <!-- <unit bldFile="/sf/app/camera/camerauis/cameraapp/help/group"/> -->
-     </component>
-    </collection>
-    <collection name="camera_info" long-name="Camera Apps Info" level="1">
-     <component unofficial="yes" name="camera_build" long-name="Camera Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/camera/group"/>
-     </component>
-     <component unofficial="yes" name="camera_plat" long-name="Camera Apps Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/camera/camera_plat/active_palette_2_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/camera/camera_plat/camcorder_ui_constants_api/tsrc/group"/> -->
-      <unit bldFile="/sf/app/camera/camera_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/camera/sources.csv
--- a/3k/app/camera/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/commonemail/package_definition.xml
--- a/3k/app/commonemail/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="commonemail" long-name="Email Apps" tech_domain="pr" level="apps" levels="service support ui app">
-    <collection name="emailservices" long-name="Email Services" level="service">
-     <component name="emailframework" long-name="Email framework" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/emailservices/emailframework/group"/>
-     </component>
-     <component name="emailserver" long-name="Email Server" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/emailservices/emailserver/group"/>
-     </component>
-     <component name="psmruadapter" long-name="PSMRU Adapter" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/emailservices/psmruadapter/group"/>
-     </component>
-     <component name="emailstore" long-name="Email Store" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/emailservices/emailstore/group"/>
-     </component>
-     <component name="emaildebug" long-name="Email Debug" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/emailservices/emaildebug/group"/>
-     </component>
-     <component unofficial="yes" name="emailservices_build" long-name="Email Services Build" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/emailservices/group"/>
-     </component>
-    </collection>
-    <collection name="ipsservices" long-name="IPS Services" level="service">
-     <component name="ipssossettings" long-name="IPSSOS Settings" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/ipsservices/ipssossettings/group"/>
-     </component>
-     <component name="ipssosplugin" long-name="IPSSOS Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/ipsservices/ipssosplugin/group"/>
-     </component>
-     <component name="ipssosaoplugin" long-name="IPSSOS AO Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/ipsservices/ipssosaoplugin/group"/>
-     </component>
-     <component unofficial="yes" name="ipsservices_build" long-name="IPS Services Build" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/ipsservices/group"/>
-     </component>
-    </collection>
-    <collection name="emailcontacts" long-name="Email Contacts" level="support">
-     <component name="contactactionservice" long-name="Contact Action Service" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/emailcontacts/contactactionservice/group"/>
-     </component>
-     <component name="contactactionmenu" long-name="Contact Action Menu" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/emailcontacts/contactactionmenu/group"/>
-     </component>
-     <component name="remotecontactlookup" long-name="Remote Contact Lookup" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/emailcontacts/remotecontactlookup/group"/>
-     </component>
-     <component unofficial="yes" name="emailcontacts_build" long-name="Email Contacts Build" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/emailcontacts/group"/>
-     </component>
-    </collection>
-    <collection name="meetingrequest" long-name="Meeting Request" level="ui">
-     <component name="mrcommon" long-name="MR Common" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/mrcommon/group"/>
-     </component>
-     <component name="mrdb" long-name="MR Database" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/mrdb/group"/>
-     </component>
-     <component name="mrpolicy" long-name="MR Policy" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/mrpolicy/group"/>
-     </component>
-     <component name="mrservices" long-name="MR Services" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/mrservices/group"/>
-     </component>
-     <component name="mrgui" long-name="MR GUI" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/mrgui/group"/>
-     </component>
-     <component name="mrentry" long-name="MR Entry" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/mrentry/group"/>
-     </component>
-     <component name="mrtasks" long-name="MR Tasks" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/mrtasks/group"/>
-     </component>
-     <component name="mrutils" long-name="MR Utils" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/mrutils/group"/>
-     </component>
-     <component name="mrutilscalplugin" long-name="MR Utils Cal Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/mrutilscalplugin/group"/>
-     </component>
-     <component name="mrviewer" long-name="MR Viewer" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/mrviewer/group"/>
-     </component>
-     <component name="mrviewercalplugin" long-name="MR Viewer Cal Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/mrviewercalplugin/group"/>
-     </component>
-     <component name="mricalviewer" long-name="MR iCal Viewer" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/mricalviewer/group"/>
-     </component>
-     <component name="mrversit2" long-name="MR Versit2" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/mrversit2/group"/>
-     </component>
-     <component name="mragnversit2" long-name="MR Agenda Versit2" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/mragnversit2/group"/>
-     </component>
-     <component name="mrcasplugin" long-name="MR CAS Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/mrcasplugin/group"/>
-     </component>
-     <component name="mrurlparserplugin" long-name="MR URLParser Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/mrurlparserplugin/group"/>
-     </component>
-     <component unofficial="yes" name="meetingrequest_build" long-name="Meeting Request Build" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/meetingrequest/group"/>
-     </component>
-    </collection>
-    <collection name="emailuis" long-name="Email UIs" level="app">
-     <component name="emailui" long-name="Email UI" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/emailuis/emailui/group"/>
-     </component>
-     <component name="gsemailsettings" long-name="GSEmail Settings" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/emailuis/gsemailsettings/group"/>
-     </component>
-     <component name="uicomponents" long-name="UI Components" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/emailuis/uicomponents/group"/>
-     </component>
-     <component name="widget" long-name="Widget" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/emailuis/widget/group"/>
-     </component>
-     <component unofficial="yes" name="emailuis_build" long-name="Email UIs Build" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/emailuis/group"/>
-     </component>
-    </collection>
-    <collection name="emailhelp" long-name="Email Help" level="support">
-     <component name="emailhelp_build" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/commonemail/emailhelp/group"/> -->
-     </component>
-    </collection>
-    <collection name="legacy" long-name="Legacy Email" level="support">
-     <component name="iad_rofs" long-name="IAD ROFS" origin-model="foundation"/>
-     <component name="ls_pt_hack" long-name="ls pt hack" origin-model="foundation"/>
-     <component name="settingwizard" long-name="Setting Wizard" origin-model="foundation"/>
-     <!-- Empty duplicate component starter removed -->
-    </collection>
-    <collection name="commonemail_help" long-name="Email Help" level="support">
-     <component name="help" origin-model="foundation"/>
-    </collection>
-    <collection name="commonemail_info" long-name="Email Apps Info" level="app">
-     <component unofficial="yes" name="email_plat" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/email_plat/group"/>
-     </component>
-     <component unofficial="yes" name="commonemail_build" long-name="Email Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/commonemail/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/commonemail/sources.csv
--- a/3k/app/commonemail/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/conntools/package_definition.xml
--- a/3k/app/conntools/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
- <systemModel>
-  <layer name="app" long-name="Applications" levels="services apps">
-   <block name="conntools" long-name="Conn Tools" tech_domain="dc" level="services" levels="1 2">
-    <collection name="nettools" long-name="Net Tools" level="2">
-     <component name="conntest" long-name="Connection Test" origin-model="foundation">
-      <unit bldFile="/sf/app/conntools/nettools/conntest/group"/>
-     </component>
-     <component unofficial="yes" name="nettools_build" long-name="Net Tools Build" origin-model="foundation">
-      <unit bldFile="/sf/app/conntools/nettools/group"/>
-     </component>
-    </collection>
-    <collection name="emulatorlan" long-name="Emulator Lan" level="1">
-     <component name="emulatorlan_build" long-name="Emulator LAN Component" origin-model="foundation">
-      <unit bldFile="/sf/app/conntools/emulatorlan/group"/>
-     </component>
-    </collection>
-    <collection name="conntools_info" long-name="Conn Tools Info" level="2">
-     <component unofficial="yes" name="conntools_build" long-name="Conn Tools Build" origin-model="foundation">
-      <unit bldFile="/sf/app/conntools/group"/>
-     </component>
-    </collection>
-   </block>
-  </layer>
- </systemModel>
-</SystemDefinition>
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/conntools/sources.csv
--- a/3k/app/conntools/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/contacts/package_definition.xml
--- a/3k/app/contacts/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="contacts" long-name="Contacts Apps" tech_domain="pr" level="apps" span="2" levels="engine support services ui">
-    <collection name="contactextensions" long-name="Contact Extensions" level="services">
-     <component name="predefinedcontacts" long-name="Predefined Contacts" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/contactextensions/predefinedcontacts/group"/>
-     </component>
-     <component unofficial="yes" name="contactextensions_build" long-name="Contact Extensions Build" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/contactextensions/group"/>
-     </component>
-    </collection>
-    <collection name="logsui" long-name="Logs UI" level="ui">
-     <component name="logsui_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/logsui/help/group"/>
-     </component>
-     <component name="logsserviceextension" long-name="Logs Service Extension" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/logsui/logsserviceextension/group"/>
-     </component>
-     <component unofficial="yes" name="logsui_build" long-name="Logs UI Build" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/logsui/group"/>
-     </component>
-    </collection>
-    <collection name="phonebookui" long-name="Phonebook UI" level="ui">
-     <component name="phonebook" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/phonebookui/phonebook/group"/>
-     </component>
-     <component name="speeddial" long-name="Speed Dial" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/phonebookui/speeddial/group"/>
-     </component>
-     <component name="phonebook2" long-name="Phone Book 2" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/contacts/phonebookui/phonebook2/ccapplication/ccacommlauncherplugin/tsrc/ut_commlaunchercontacthandler/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/phonebookui/phonebook2/ccapplication/ccapp/tsrc/ut_cmscontactfetcher/group"/> -->
-      <unit bldFile="/sf/app/contacts/phonebookui/phonebook2/group"/>
-      <!-- <unit bldFile="/sf/app/contacts/phonebookui/phonebook2/tsrc/utilities/changepbk2cenrepkeyvaluestool/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/phonebookui/phonebook2/tsrc/ut_addfavoritiesvisibility/group"/> -->
-     </component>
-     <component unofficial="yes" name="phonebookui_build" long-name="Phonebook UI Build" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/contacts/phonebookui/group"/> -->
-     </component>
-    </collection>
-    <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
-     <component name="cntfindplugin" long-name="Cnt Find Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/phonebookengines/cntfindplugin/group"/>
-     </component>
-     <component name="cntsortplugin" long-name="Cnt Sort Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/phonebookengines/cntsortplugin/group"/>
-     </component>
-     <component name="virtualphonebook" long-name="Virtual Phonebook" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/phonebookengines/virtualphonebook/group"/>
-      <!-- <unit bldFile="/sf/app/contacts/phonebookengines/virtualphonebook/tsrc/mt_vpbkeng_selectorfactory/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/phonebookengines/virtualphonebook/tsrc/mt_vpbkeng_strcntanalyzer/group"/> -->
-     </component>
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="contactsmodel">
-       -  <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/cntmatchlog/group"/>  -
-       -  <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/group"/>  -
-       -  <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/tsrc/cntmatchlog/group"/>  -
-       -  <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/tsrc/fuzztest/group"/>  -
-       <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/tsrc/integration/cntperftest/groupsql"/>
-       <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/tsrc/integration/perffuncsuite/groupsql"/>
-       <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/tsrc/integration/tcntpolice/groupsql"/>
-       -  <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/tsrc/integration/testcontactsuite/group"/>  -
-       <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/tsrc/integration/testimpexvcard/groupsql"/>
-       -  <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/tsrc/integration/teststartup/group"/>  -
-     </component>-->
-     <component unofficial="yes" name="phonebookengines_build" long-name="Phonebook Engines Build" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/phonebookengines/group"/>
-     </component>
-    <component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/group" mrp="/sf/app/contacts/phonebookengines/contactsmodel/group/app-engines_cntmodel.mrp" version="1"/>
-     </component>
-    </collection>
-	<!-- Collection manually added due to faulty merge XSLT -->
-	<collection name="pimprotocols" long-name="PIM Protocols" level="services">
-	 <component name="phonebooksync" long-name="Phonebook Sync" purpose="optional" plugin="Y">
-	  <unit bldFile="/sf/app/contacts/pimprotocols/phonebooksync/group" mrp="/sf/app/contacts/pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
-	 </component>
-	 <component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
-	  <unit bldFile="/sf/app/contacts/pimprotocols/pbap/group" mrp="/sf/app/contacts/pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
-	 </component>
-	</collection>
-    <collection name="ccservices" long-name="CC Services" level="services">
-     <component name="cmsservices" long-name="CMS Services" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/contacts/ccservices/cmsservices/cmsengine/client/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/ccservices/cmsservices/cmsengine/server/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/ccservices/cmsservices/cmsengine/tsrc/contactcreator/client/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/ccservices/cmsservices/cmsengine/tsrc/contactcreator/server/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/ccservices/cmsservices/cmsengine/tsrc/contactcreator2/client/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/ccservices/cmsservices/cmsengine/tsrc/contactcreator2/server/group"/> -->
-      <unit bldFile="/sf/app/contacts/ccservices/cmsservices/group"/>
-     </component>
-    </collection>
-    <collection name="presencecache" long-name="Presence Cache" level="support">
-     <component name="presencecacheutils" long-name="Presence Cache Utils" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/contacts/presencecache/presencecacheutils/group"/> -->
-     </component>
-     <component name="presencecacheserver2" long-name="Presence Cache Server2" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/contacts/presencecache/presencecacheserver2/group"/> -->
-     </component>
-     <component name="presencecacheclient2" long-name="Presence Cache Client2" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/contacts/presencecache/presencecacheclient2/group"/> -->
-     </component>
-     <component unofficial="yes" name="presencecache_build" long-name="Presence Cache Build" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/presencecache/group"/>
-     </component>
-    </collection>
-    <collection name="predictivesearch" long-name="Predictive Search" level="support">
-     <component name="pcsutils" long-name="PCS Utils" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/predictivesearch/pcsutils/group"/>
-     </component>
-     <component name="pcsserverclientapi" long-name="PCS Server Client API" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/predictivesearch/pcsserverclientapi/group"/>
-     </component>
-     <component name="pcsserver" long-name="PCS Server" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/predictivesearch/pcsserver/group"/>
-     </component>
-     <component name="adapters" long-name="Adapters" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/predictivesearch/adapters/contacts/group"/>
-     </component>
-     <component name="pcsalgorithm" long-name="PCS Algorithm" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/predictivesearch/pcsalgorithm/group"/>
-     </component>
-     <component unofficial="yes" name="predictivesearch_build" long-name="Predictive Search Build" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/predictivesearch/group"/>
-     </component>
-    </collection>
-    <collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
-     <component unofficial="yes" name="contacts_build" long-name="Contacts Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/group"/>
-     </component>
-     <component unofficial="yes" name="contacts_plat" long-name="Contacts Apps Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/cca_launch_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/cca_view_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/contactpresence_api/tsrc/group"/> -->
-      <unit bldFile="/sf/app/contacts/contacts_plat/group"/>
-      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/predictivesearch_utils_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/presence_cache_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/speed_dial_dialogs_api/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_policy_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_sim_services_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_store_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_vcard_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/contacts_plat/virtual_phonebook_view_definition_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="contacts_pub" long-name="Contacts Apps Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/contacts/contacts_pub/group"/>
-      <!-- <unit bldFile="/sf/app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="/sf/app/contacts/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group"/> -->
-     </component>
-    <component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/app/contacts/contacts_info/contacts_metadata/contacts_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/contacts/sources.csv
--- a/3k/app/contacts/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/app/contacts/,/sf/app/contacts,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/contentcontrol/package_definition.xml
--- a/3k/app/contentcontrol/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="contentcontrol" long-name="Content Control Daemons" tech_domain="dm" level="services" levels="1 2">
-    <collection name="applicationmanagement" long-name="Application Management" level="1">
-     <component name="options" long-name="Options" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/applicationmanagement/options/group"/>
-     </component>
-     <component name="applicationmanagement_client" long-name="Client" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/applicationmanagement/client/group"/>
-     </component>
-     <component name="applicationmanagement_server" long-name="Server" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/applicationmanagement/server/group"/>
-     </component>
-     <component name="rfsplugin" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/applicationmanagement/rfsplugin/group"/>
-     </component>
-     <component name="amadapter2" long-name="AM Adapter2" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/applicationmanagement/amadapter2/group"/>
-     </component>
-    </collection>
-    <collection name="customization" long-name="Customization" level="2">
-     <component name="dmutils" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/customization/dmutils/bld"/>
-     </component>
-     <component name="uisettingssrv" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/customization/uisettingssrv/bld"/>
-     </component>
-     <component name="isadapter" long-name="IS Adapter" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/customization/isadapter/bld"/>
-     </component>
-     <component name="supadapter" long-name="SUPAdapter" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/customization/supadapter/bld"/>
-     </component>
-     <component name="wallpaperadapter" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/customization/wallpaperadapter/bld"/>
-     </component>
-     <component name="operatorlogoadapter" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/customization/operatorlogoadapter/bld"/>
-     </component>
-     <component name="screensaveradapter" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/customization/screensaveradapter/bld"/>
-     </component>
-     <component name="themesadapter" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/customization/themesadapter/bld"/>
-     </component>
-     <component name="embeddedlinkadapter" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/customization/embeddedlinkadapter/bld"/>
-     </component>
-    </collection>
-    <collection name="omads" long-name="OMA DS" level="1">
-     <component name="omadsappui" long-name="OMA DS App UI" origin-model="foundation">
-      <unit bldFile="/sf/app/contentcontrol/omads/omadsappui/group"/>
-     </component>
-     <component name="omadsextensions" long-name="OMA DS Extensions" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/contentcontrol/omads/omadsextensions/dsutils/emailxmlutils/bld"/> -->
-      <unit bldFile="/sf/app/contentcontrol/omads/omadsextensions/group"/>
-     </component>
-    </collection>
-    <collection name="contentcontrol_info" long-name="Content Control Daemons Info" level="2">
-     <component unofficial="yes" name="contentcontrol_build" long-name="Content Control Daemons Build" origin-model="foundation">
-      <unit bldFile="/sf/app/contentcontrol/group"/>
-     </component>
-     <component unofficial="yes" name="contentctrl_plat" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/contentcontrol/contentctrl_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/contentcontrol/sources.csv
--- a/3k/app/contentcontrol/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/conversations/package_definition.xml
--- a/3k/app/conversations/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="conversations" long-name="Conversation Apps" tech_domain="pr" level="apps" levels="settings utils ui">
-    <collection name="uiservicetabsettings" long-name="UI Service Tab Settings" level="settings">
-     <component name="vimpstsettings" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/uiservicetabsettings/group"/>
-     </component>
-    </collection>
-    <collection name="imstutils" long-name="IM Service Tab Utils" level="utils">
-     <component name="imstutils_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/imstutils/help/group"/>
-     </component>
-     <component name="imconnectionprovider" long-name="IM Connection Provider" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/imstutils/imconnectionprovider/group"/>
-      <!-- <unit bldFile="/sf/app/conversations/imstutils/imconnectionprovider/tsrc/imconnectionprovider_test/group"/> -->
-     </component>
-     <component name="xmppadapter" long-name="XMPP Adapter" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/imstutils/xmppadapter/group"/>
-      <!-- <unit bldFile="/sf/app/conversations/imstutils/xmppadapter/tsrc/xmppadapter_test/group"/> -->
-     </component>
-     <component name="imconversationview" long-name="IM Conversation View" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/imstutils/imconversationview/group"/>
-      <!-- <unit bldFile="/sf/app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/dummytestadaptation/group"/> -->
-      <!-- <unit bldFile="/sf/app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/group"/> -->
-     </component>
-     <component unofficial="yes" name="imstutils_build" long-name="IM Service Tab Utils Build" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/imstutils/group"/>
-     </component>
-    </collection>
-    <collection name="uiservicetab" long-name="UI Service Tab" level="ui">
-     <component name="vimpstutils" long-name="VIMP ST Utilities" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/uiservicetab/vimpstutils/group"/>
-     </component>
-     <component name="vimpststorage" long-name="VIMP ST Storage" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/uiservicetab/vimpststorage/group"/>
-      <!-- <unit bldFile="/sf/app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactlist_ut/group"/> -->
-      <!-- <unit bldFile="/sf/app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontactsorter_ut/group"/> -->
-      <!-- <unit bldFile="/sf/app/conversations/uiservicetab/vimpststorage/tsrc/vimpststorage_ut/cvimpststoragecontact_ut/group"/> -->
-     </component>
-     <component name="vimpstengine" long-name="VIMP ST Engine" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/uiservicetab/vimpstengine/group"/>
-      <!-- <unit bldFile="/sf/app/conversations/uiservicetab/vimpstengine/tsrc/group"/> -->
-     </component>
-     <component name="vimpstcmdprocess" long-name="VIMP ST Command Process" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/uiservicetab/vimpstcmdprocess/group"/>
-      <!-- <unit bldFile="/sf/app/conversations/uiservicetab/vimpstcmdprocess/tsrc/group"/> -->
-     </component>
-     <component name="vimpstui" long-name="VIMP ST UI" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/uiservicetab/vimpstui/group"/>
-     </component>
-     <component name="vimpstdetailsviewplugin" long-name="VIMP ST Details View Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/uiservicetab/vimpstdetailsviewplugin/group"/>
-     </component>
-     <component unofficial="yes" name="uiservicetab_build" long-name="UI Service Tab Build" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/uiservicetab/group"/>
-     </component>
-    </collection>
-    <collection name="servicewidget" long-name="Service Widget" level="ui">
-     <component name="servicewidgetactionhandler" long-name="Service Widget Action Handler" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/servicewidget/servicewidgetactionhandler/group"/>
-     </component>
-     <component name="servicewidgetdatapublisher" long-name="Service Widget Data Publisher" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/servicewidget/servicewidgetdatapublisher/group"/>
-     </component>
-     <component name="themes" long-name="Themes" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/servicewidget/themes/install-themes/install/servicewidget/group"/>
-     </component>
-     <component unofficial="yes" name="servicewidget_build" long-name="Service Widget Build" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/servicewidget/group"/>
-     </component>
-    </collection>
-    <collection name="conversations_info" long-name="Conversation Apps Info" level="ui">
-     <component unofficial="yes" name="conversations_plat" long-name="Conversation Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/conversations_plat/group"/>
-     </component>
-     <component unofficial="yes" name="conversations_build" long-name="Conversation Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/conversations/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/conversations/sources.csv
--- a/3k/app/conversations/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/app/conversations/,/sf/app/conversations,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/devicecontrol/package_definition.xml
--- a/3k/app/devicecontrol/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="devicecontrol" long-name="Device Control Daemons" tech_domain="dm" level="services" levels="oma mid app">
-    <collection name="devicediagnostics" long-name="Device Diagnostics" level="app">
-     <component name="devdiagapp" long-name="Dev Diag App" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/devicediagnostics/devdiagapp/group"/>
-     </component>
-     <component name="devdiaggsplugin" long-name="Dev Diag GS Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/devicediagnostics/devdiaggsplugin/group"/>
-     </component>
-     <component name="diagplugins" long-name="Diag Plugins" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/devicediagnostics/diagplugins/group"/>
-     </component>
-     <component name="diagsuites" long-name="Diag Suites" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/devicediagnostics/diagsuites/group"/>
-     </component>
-     <component unofficial="yes" name="devicediagnostics_build" long-name="Device Diagnostics Build" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/devicediagnostics/group"/>
-     </component>
-    </collection>
-    <collection name="fotaapplication" long-name="FOTA Application" level="app">
-     <component name="fotaserver" long-name="FOTA Server" origin-model="foundation">
-      <!-- <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fmsclient/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fmserver/group"/> -->
-      <!-- <unit bldFile="mw/remotemgmt/fotaapplication/fotaserver/fotarfsplugin/group"/> -->
-      <unit bldFile="/sf/mw/remotemgmt/fotaapplication/fotaserver/fotastartupextplg/group"/>
-      <unit bldFile="/sf/mw/remotemgmt/fotaapplication/fotaserver/group"/>
-     </component>
-     <component unofficial="yes" name="fotaapp" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/fotaapplication/group"/>
-     </component>
-    </collection>
-    <collection name="omadm" long-name="OMA Device Management" level="oma">
-     <component name="omadmappui" long-name="OMA DM App UI" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/omadm/omadmappui/group"/>
-      <!-- <unit bldFile="/sf/app/devicecontrol/omadm/omadmappui/tsrc/group"/> -->
-     </component>
-     <component name="omadmextensions" long-name="OMA DM Extensions" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/devicecontrol/omadm/omadmextensions/adapters/email/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/devicecontrol/omadm/omadmextensions/adapters/mms/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/devicecontrol/omadm/omadmextensions/adapters/syncmldm/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/devicecontrol/omadm/omadmextensions/adapters/syncmldm12/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/devicecontrol/omadm/omadmextensions/adapters/syncmlds/tsrc/group"/> -->
-      <unit bldFile="/sf/app/devicecontrol/omadm/omadmextensions/group"/>
-     </component>
-    </collection>
-    <collection name="pnpmobileservices" long-name="PnP Mobile Services" level="mid">
-     <component name="pnpms" long-name="PnP MS" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/pnpmobileservices/pnpms/group"/>
-      <!-- <unit bldFile="/sf/app/devicecontrol/pnpmobileservices/pnpms/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="omacp" long-name="OMA Content Provisioning" level="oma">
-     <component name="omacpadapters" long-name="OMA CP Adapters" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/omacp/omacpadapters/group"/>
-     </component>
-    </collection>
-    <collection name="devicecontrol_info" long-name="Device Control Daemons Info" level="app">
-     <component unofficial="yes" name="devicecontrol_build" long-name="Device Control Daemons Build" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/group"/>
-     </component>
-     <component unofficial="yes" name="customization_test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/devicecontrol/customization/tsrc/tarmcustomization/group"/> -->
-     </component>
-     <component unofficial="yes" name="applicationmanagement_build" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/applicationmanagement/group"/>
-     </component>
-     <component unofficial="yes" name="customization_build" origin-model="foundation">
-      <unit bldFile="/sf/app/devicecontrol/customization/group"/>
-     </component>
-     <component unofficial="yes" name="applicationmanagement_test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/devicecontrol/applicationmanagement/tsrc/tarmappmng/group"/> -->
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/devicecontrol/sources.csv
--- a/3k/app/devicecontrol/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/dictionary/package_definition.xml
--- a/3k/app/dictionary/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="dictionary" long-name="Dictionary" tech_domain="pr" level="services" levels="appl">
-    <collection name="userdict" long-name="User Dictionary" level="appl">
-     <component name="userdict_build" long-name="UserDict Client" origin-model="foundation">
-      <unit bldFile="/sf/app/dictionary/userdict/group"/>
-     </component>
-    </collection>
-    <collection name="dictionary_info" long-name="Dictionary Info" level="appl">
-     <component unofficial="yes" name="dictionary_plat" long-name="Dictionary Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/dictionary/dictionary_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/dictionary/sources.csv
--- a/3k/app/dictionary/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/files/package_definition.xml
--- a/3k/app/files/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="files" long-name="File Manager Apps" tech_domain="pr" level="apps" levels="support apps">
-    <collection name="filemanager" long-name="File Manager" level="apps">
-     <component name="filemanager_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/files/filemanager/help/group"/>
-     </component>
-     <component name="filemanager_build" origin-model="foundation">
-      <unit bldFile="/sf/app/files/filemanager/group"/>
-     </component>
-    </collection>
-    <collection name="filesystemuis" long-name="File System UIs" level="support">
-     <component name="memscaneng" long-name="Mem Scan Eng" origin-model="foundation">
-      <unit bldFile="/sf/app/files/filesystemuis/memscaneng/group"/>
-     </component>
-     <component name="memstatepopup" long-name="Mem State Popup" origin-model="foundation">
-      <unit bldFile="/sf/app/files/filesystemuis/memstatepopup/group"/>
-     </component>
-     <component unofficial="yes" name="filesystemuis_build" long-name="File System UIs Build" origin-model="foundation">
-      <unit bldFile="/sf/app/files/filesystemuis/group"/>
-     </component>
-    </collection>
-    <collection name="files_info" long-name="File Manager Apps Info" level="apps">
-     <component unofficial="yes" name="files_plat" long-name="File Manager Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/files/files_plat/group"/>
-     </component>
-     <component unofficial="yes" name="files_build" long-name="File Manager Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/files/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/files/sources.csv
--- a/3k/app/files/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/files/,/sf/app/files,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/gallery/package_definition.xml
--- a/3k/app/gallery/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="gallery" long-name="Gallery Apps" tech_domain="ma" level="apps" levels="app">
-    <collection name="mediagallery" long-name="Media Gallery" level="app">
-     <component name="mediagallery2" long-name="Media Gallery 2" origin-model="foundation">
-      <unit bldFile="/sf/app/gallery/mediagallery/mediagallery2/group"/>
-     </component>
-    </collection>
-    <collection name="gallery_info" long-name="Gallery Apps Info" level="app">
-     <component unofficial="yes" name="gallery_build" long-name="Gallery Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/gallery/group"/>
-     </component>
-     <component unofficial="yes" name="gallery_plat" long-name="Gallery Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/gallery/gallery_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/gallery/sources.csv
--- a/3k/app/gallery/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/gallery/,/sf/app/gallery,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/graphicsuis/package_definition.xml
--- a/3k/app/graphicsuis/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="graphicsuis" long-name="Graphics UIs" tech_domain="ui" level="services" levels="util ui">
-    <collection name="svgtviewer" long-name="SVGT Viewer" level="ui">
-     <component name="svgtviewerplugin" long-name="SVGT Viewer Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/graphicsuis/svgtviewer/svgtviewerplugin/group"/>
-     </component>
-     <component unofficial="yes" name="svgtviewer_build" long-name="SVGT Viewer Build" origin-model="foundation">
-      <unit bldFile="/sf/app/graphicsuis/svgtviewer/group"/>
-     </component>
-    </collection>
-    <collection name="graphicsuis_info" long-name="Graphics UIs Info" level="ui">
-     <component unofficial="yes" name="graphicsuis_build" long-name="Graphics UIs Build" origin-model="foundation">
-      <unit bldFile="/sf/app/graphicsuis/group"/>
-     </component>
-     <component unofficial="yes" name="graphicsuis_plat" long-name="Graphics UIs Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/graphicsuis/graphicsuis_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/graphicsuis/sources.csv
--- a/3k/app/graphicsuis/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/helps/package_definition.xml
--- a/3k/app/helps/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="helps" long-name="Help Apps" tech_domain="ui" level="apps" span="2" levels="eng tools unused  ui">
-    <collection name="csxhelp" long-name="Context Sensitive Extended Help" level="ui">
-     <component name="aiwhelpprovider" long-name="Aiw Help Provider" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/helps/csxhelp/aiwhelpprovider/group"/> -->
-     </component>
-     <component unofficial="yes" name="csxhelp_build" long-name="Context Sensitive Extended Help Build" origin-model="foundation">
-      <unit bldFile="/sf/app/helps/csxhelp/group"/>
-     </component>
-    </collection>
-   <collection name="n:symhelptools" long-name="Symbian Help Tools" level="tools">
-     <component name="n:mbmcodec" long-name="MBM Codec" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/app/helps/symhelp/mbmcodec/group" mrp="app/helps/symhelp/mbmcodec/group/tools_sdk_eng_mbmcodec.mrp"/> -->
-     </component>
-     <component name="n:cshlpcmpgui" long-name="CSHelp Compiler GUI" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/app/helps/symhelp/cshlpcmpgui/group" mrp="app/helps/symhelp/cshlpcmpgui/group/tools_sdk_eng_cshlpcmp_gui.mrp" priority="1010"/> -->
-     </component>
-     <component name="n:cshlpcmpfrontend" long-name="CSHelp Compiler Frontend" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/app/helps/symhelp/cshlpcmpfrontend/group" mrp="app/helps/symhelp/cshlpcmpfrontend/group/tools_sdk_eng_cshlpcmp_frontend.mrp"/> -->
-     </component>
-     <component name="n:cshlpcmpbackend" long-name="CSHelp Compiler Backend" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/app/helps/symhelp/cshlpcmpbackend/group/tools_sdk_eng_cshlpcmp_backend_srconly.mrp"/>
-     </component>
-    </collection>
-    <collection name="symhelp" long-name="Symbian Help" level="eng">
-     <component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/app/helps/symhelp/helpmodel/group" mrp="/sf/app/helps/symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
-     </component>
-    </collection>
-    <collection name="helps_info" long-name="Help Apps Info" level="ui">
-     <component name="helps_metadata" long-name="Help Apps Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/app/helps/helps_info/helps_metadata/helps_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/helps/sources.csv
--- a/3k/app/helps/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/helps/,/sf/app/helps,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/homescreen/package_definition.xml
--- a/3k/app/homescreen/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="homescreen" long-name="Home Screen Apps" tech_domain="ui" level="apps" levels="fw apps">
-    <collection name="idlehomescreen" long-name="Idle Homescreen" level="apps">
-     <component name="nativeuicontroller" long-name="Native UI Controller" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/nativeuicontroller/group"/>
-     </component>
-     <component name="exths" long-name="ExtHS" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/exths/group"/>
-     </component>
-     <component name="activeidle3" long-name="Active Idle 3" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/homescreen/idlehomescreen/activeidle3/data/group"/> -->
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/activeidle3/group"/>
-      <!-- <unit bldFile="/sf/app/homescreen/idlehomescreen/activeidle3/xmluirendering/uiengine/group"/> -->
-     </component>
-     <component name="hsplugins" long-name="HS Plugins" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/idlehomescreen/hsplugins/group"/>
-      <!-- <unit bldFile="/sf/app/homescreen/idlehomescreen/hsplugins/organizer/qhd_tch/organizer_2001f481/group"/> -->
-      <!-- <unit bldFile="/sf/app/homescreen/idlehomescreen/hsplugins/organizer/vga/organizer_2001f48d/group"/> -->
-      <!-- <unit bldFile="/sf/app/homescreen/idlehomescreen/hsplugins/organizer/vga/organizer_2001fdba/group"/> -->
-     </component>
-    </collection>
-    <collection name="menufw" long-name="Menu Framework" level="fw">
-     <component name="hierarchynavigator" long-name="Hierarchy Navigator" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/menufw/hierarchynavigator/group"/>
-     </component>
-     <component name="menufwui" long-name="Menu Framework UI" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/menufw/menufwui/group"/>
-     </component>
-     <component name="menusuites" long-name="Menu Suites" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/menufw/menusuites/group"/>
-     </component>
-     <component unofficial="yes" name="menufw_build" long-name="Menu Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/menufw/group"/>
-     </component>
-    </collection>
-    <collection name="homescreen_info" long-name="Home Screen Apps Info" level="apps">
-     <component unofficial="yes" name="homescreen_build" long-name="Home Screen Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/group"/>
-     </component>
-     <component unofficial="yes" name="homescreen_test" long-name="Home Screen Apps Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/homescreen/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="homescreen_plat" long-name="Home Screen Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/homescreen/homescreen_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/homescreen/sources.csv
--- a/3k/app/homescreen/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/homescreen/,/sf/app/homescreen,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/im/package_definition.xml
--- a/3k/app/im/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="im" long-name="Instant Messaging Apps" tech_domain="pr" level="apps" levels="support engine apps">
-    <collection name="impsengine" long-name="IMPS Engine" level="engine">
-     <component name="impsengine_utils" long-name="Utilities" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/impsengine/utils/group"/> -->
-     </component>
-     <component name="datautils" long-name="Data Utils" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/impsengine/datautils/group"/> -->
-     </component>
-     <component name="impsengine_client" long-name="Client" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/impsengine/client/group"/> -->
-     </component>
-     <component name="imapi" long-name="IM API" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/impsengine/imapi/group"/> -->
-     </component>
-     <component name="imlauncher" long-name="IM Launcher" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/impsengine/imlauncher/group"/> -->
-     </component>
-     <component name="impsdatachannel" long-name="Imps Data Channel" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/impsengine/impsdatachannel/group"/> -->
-     </component>
-     <component name="impsipcirwatcher" long-name="Imps Ip Cir Watcher" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/impsengine/impsipcirwatcher/group"/> -->
-     </component>
-     <component name="messageencoder" long-name="Message Encoder" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/impsengine/messageencoder/wbxml/group"/> -->
-     </component>
-     <component name="engsrv" long-name="Eng Srv" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/impsengine/engsrv/group"/> -->
-     </component>
-     <component name="impswatcher" long-name="Imps Watcher" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/impsengine/impswatcher/group"/> -->
-     </component>
-     <component name="wvotaparser" long-name="WV OTA Parser" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/impsengine/wvotaparser/group"/> -->
-     </component>
-     <component unofficial="yes" name="impsengine_test" long-name="IMPS Engine Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertimerprocess/group"/> -->
-      <!-- <unit bldFile="/sf/app/im/impsengine/tsrc/public/advance/group"/> -->
-      <!-- <unit bldFile="/sf/app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertest/group"/> -->
-      <!-- <unit bldFile="/sf/app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/group"/> -->
-      <!-- <unit bldFile="/sf/app/im/impsengine/tsrc/public/imlauncher_sdk_apis/basic/imlaunchertestplugin/group"/> -->
-     </component>
-     <component unofficial="yes" name="impsengine_build" long-name="IMPS Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/app/im/impsengine/group"/>
-     </component>
-    </collection>
-    <collection name="pecengine" long-name="Presence Engine" level="engine">
-     <component name="coreutilslib2" long-name="Core Utils Lib 2" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/pecengine/coreutilslib2/group"/> -->
-     </component>
-     <component name="storagemanager2" long-name="Storage Manager 2" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/pecengine/storagemanager2/group"/> -->
-     </component>
-     <component name="pecparser2" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/pecengine/parser2/group"/> -->
-     </component>
-     <component name="attributelibrary2" long-name="Attribute Library 2" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/pecengine/attributelibrary2/group"/> -->
-     </component>
-     <component name="listlibrary2" long-name="List Library 2" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/pecengine/listlibrary2/group"/> -->
-     </component>
-     <component name="transferadapter2" long-name="Transfer Adapter 2" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/pecengine/transferadapter2/group"/> -->
-     </component>
-     <component name="presenceserver2" long-name="Presence Server 2" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/pecengine/presenceserver2/group"/> -->
-     </component>
-     <component name="presencemanager2" long-name="Presence Manager 2" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/pecengine/presencemanager2/group"/> -->
-     </component>
-     <component name="janitorplugin2" long-name="Janitor Plugin 2" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/pecengine/janitorplugin2/group"/> -->
-     </component>
-     <component name="pluginserver2" long-name="Plugin Server 2" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/pecengine/pluginserver2/group"/> -->
-     </component>
-     <component unofficial="yes" name="pecengine_build" long-name="Presence Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/app/im/pecengine/group"/>
-     </component>
-    </collection>
-    <collection name="presadap12" long-name="Presence Adap 12" level="support">
-     <component name="presparser2" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/presadap12/parser2/group"/> -->
-     </component>
-     <component name="impsplugin" long-name="IMPS Plugin" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/presadap12/impsplugin/group"/> -->
-     </component>
-     <component unofficial="yes" name="presadap12_build" long-name="Presence Adap 12 Build" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/presadap12/group"/> -->
-     </component>
-    </collection>
-    <collection name="wvsettings20" long-name="WV Settings 20" level="support">
-     <component name="wvsapsettingsstore" origin-model="foundation">
-      <unit bldFile="/sf/app/im/wvsettings20/group"/>
-     </component>
-    </collection>
-    <collection name="wvuing" long-name="WV UI NG" level="apps">
-     <component name="imindicatorplugin" long-name="IM Indicator Plugin" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/wvuing/imindicatorplugin/group"/> -->
-     </component>
-     <component name="impsconnectionui" long-name="IMPS Connection UI" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/wvuing/impsconnectionui/group"/> -->
-     </component>
-     <component name="impsservicesettingsui" long-name="IMPS Service Settings UI" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/wvuing/impsservicesettingsui/group"/> -->
-     </component>
-     <component name="impsalwaysonlineplugin" long-name="IMPS Always Online Plugin" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/wvuing/impsalwaysonlineplugin/group"/> -->
-     </component>
-     <component name="wvvariant" long-name="Wvvariant" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/wvuing/wvvariant/group"/> -->
-     </component>
-     <component name="wvuiada" long-name="Wvuiada" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/wvuing/wvuiada/group"/> -->
-     </component>
-     <component name="wvuistorage" long-name="WV UI Storage" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/wvuing/wvuistorage/group"/> -->
-     </component>
-     <component name="wvuipresence" long-name="WV UI Presence" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/wvuing/wvuipresence/group"/> -->
-     </component>
-     <component name="wvlogger" long-name="Wvlogger" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/wvuing/wvlogger/group"/> -->
-     </component>
-     <component name="wvuieng" long-name="Wvuieng" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/wvuing/wvuieng/group"/> -->
-     </component>
-     <component name="imutils" long-name="Im Utils" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/wvuing/imutils/group"/> -->
-     </component>
-     <component name="wvuiprocess" long-name="WV UI Process" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/wvuing/wvuiprocess/group"/> -->
-     </component>
-     <component name="wvcommandutils" long-name="Wv Command Utils" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/wvuing/wvcommandutils/group"/> -->
-     </component>
-     <component name="wvaudiomanager" long-name="Wv Audio Manager" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/wvuing/wvaudiomanager/group"/> -->
-     </component>
-     <component name="wvuiave" long-name="Wvuiave" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/wvuing/wvuiave/group"/> -->
-     </component>
-     <component name="wvimlauncher" long-name="IM Launcher" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/im/wvuing/imlauncher/group"/> -->
-     </component>
-     <component unofficial="yes" name="wvuing_build" long-name="WV UI NG Build" origin-model="foundation">
-      <unit bldFile="/sf/app/im/wvuing/group"/>
-     </component>
-    </collection>
-    <collection name="im_info" long-name="Instant Messaging Apps Info" level="apps">
-     <component unofficial="yes" name="im_plat" long-name="Instant Messaging Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/im/im_plat/group"/>
-      <unit bldFile="/sf/app/im/im_plat/wv_sap_settings_api/tsrc"/>
-     </component>
-     <component unofficial="yes" name="im_pub" long-name="Instant Messaging Apps Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/im/im_pub/group"/>
-      <!-- <unit bldFile="/sf/app/im/im_pub/im_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/im/im_pub/im_application_launch_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/im/im_pub/im_application_launch_api/tsrc/imlaunchertest/group"/> -->
-      <!-- <unit bldFile="/sf/app/im/im_pub/im_application_launch_api/tsrc/imlaunchertestplugin/group"/> -->
-      <!-- <unit bldFile="/sf/app/im/im_pub/im_application_launch_api/tsrc/imlaunchertimerprocess/group"/> -->
-     </component>
-     <component unofficial="yes" name="im_help" long-name="Instant Messaging Apps Help" origin-model="foundation">
-      <unit bldFile="/sf/app/im/help/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/im/sources.csv
--- a/3k/app/im/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/im/,/sf/app/im,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/imgeditor/package_definition.xml
--- a/3k/app/imgeditor/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="imgeditor" long-name="Image Editor Apps" tech_domain="ma" level="apps" levels="engine ui">
-    <collection name="imageeditor" long-name="Image Editor" level="ui">
-     <component name="pb" origin-model="foundation">
-      <unit bldFile="/sf/app/imgeditor/imageeditor/pb/group"/>
-     </component>
-     <component name="iepb" origin-model="foundation">
-      <unit bldFile="/sf/app/imgeditor/imageeditor/iepb/group"/>
-     </component>
-     <component name="imageeditorui" long-name="Image Editor UI" origin-model="foundation">
-      <unit bldFile="/sf/app/imgeditor/imageeditor/imageeditorui/group"/>
-     </component>
-     <component name="imageeditormanager" long-name="Image Editor Manager" origin-model="foundation">
-      <unit bldFile="/sf/app/imgeditor/imageeditor/imageeditormanager/group"/>
-     </component>
-     <component name="imageeditorapp" long-name="Image Editor App" origin-model="foundation">
-      <unit bldFile="/sf/app/imgeditor/imageeditor/imageeditorapp/group"/>
-     </component>
-     <component name="imageeditor_plugins" long-name="Plugins" origin-model="foundation">
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/blackwhiteplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/brightnessplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/bubbleplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/cartoonizeplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/clipartplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/contrastplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/cropplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/drawplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/frameplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/negativeplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/redeyeplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/resizeplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/rotatelplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/rotaterplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/sepiaplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/sharpnessplugin/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditor/plugins/textplugin/group"/>
-     </component>
-     <component name="editorprovider" long-name="Editor Provider" origin-model="foundation">
-      <unit bldFile="/sf/app/imgeditor/imageeditor/editorprovider/group"/>
-     </component>
-     <component unofficial="yes" name="imageeditor_build" long-name="Image Editor Build" origin-model="foundation">
-      <unit bldFile="/sf/app/imgeditor/imageeditor/group"/>
-     </component>
-    </collection>
-    <collection name="imageeditorengine" long-name="Image Editor Engine" level="engine">
-     <component name="filters" long-name="Filters" origin-model="foundation">
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbrightness/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbubble/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterbuffer/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercartoon/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterclipart/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercontrast/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtercrop/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterdraw/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterframe/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtergrayscale/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtericlsource/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterjpegsource/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterjpegtarget/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filternegate/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterredeye/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterrotate/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filterscale/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtersepia/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtersharpness/group"/>
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/filters/filtertext/group"/>
-     </component>
-     <component name="imageeditorutils" long-name="Image Editor Utils" origin-model="foundation">
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/imageeditorutils/group"/>
-     </component>
-     <component name="systemparameters" long-name="System Parameters" origin-model="foundation">
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/systemparameters/group"/>
-     </component>
-     <component name="enginewrapper" long-name="Engine Wrapper" origin-model="foundation">
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/enginewrapper/group"/>
-     </component>
-     <component name="jpegrotator" long-name="Jpeg Rotator" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/imgeditor/imageeditorengine/jpegrotator/group"/> -->
-     </component>
-     <component name="jpegscaler" long-name="Jpeg Scaler" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/imgeditor/imageeditorengine/jpegscaler/group"/> -->
-     </component>
-     <component unofficial="yes" name="imageeditorengine_build" long-name="Image Editor Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/app/imgeditor/imageeditorengine/group"/>
-     </component>
-    </collection>
-    <collection name="imgeditor_info" long-name="Image Editor Apps Info" level="ui">
-     <component unofficial="yes" name="imgeditor_plat" long-name="Image Editor Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/imgeditor/imgeditor_plat/group"/>
-     </component>
-     <component unofficial="yes" name="imgeditor_build" long-name="Image Editor Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/imgeditor/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/imgeditor/sources.csv
--- a/3k/app/imgeditor/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/imgeditor/,/sf/app/imgeditor,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/imgvieweruis/package_definition.xml
--- a/3k/app/imgvieweruis/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="imgvieweruis" long-name="Image Viewer UIs" tech_domain="ma" level="services" levels="app">
-    <collection name="imageviewer" long-name="Image Viewer" level="app">
-     <component name="imageviewer_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/imgvieweruis/imageviewer/help/group"/>
-     </component>
-     <component name="imageviewer_build" origin-model="foundation">
-      <unit bldFile="/sf/app/imgvieweruis/imageviewer/group"/>
-     </component>
-    </collection>
-    <collection name="imgvieweruis_info" long-name="Image Viewer UIs Info" level="app">
-     <component unofficial="yes" name="imgvieweruis_build" long-name="Image Viewer UIs Build" origin-model="foundation">
-      <unit bldFile="/sf/app/imgvieweruis/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/imgvieweruis/sources.csv
--- a/3k/app/imgvieweruis/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/imgvieweruis/,/sf/app/imgvieweruis,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/iptelephony/package_definition.xml
--- a/3k/app/iptelephony/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="iptelephony" long-name="IP Telephony" tech_domain="vc" level="apps" levels="plugin eng ui">
-    <!-- Collection renamed to avoid duplicates -->
-    <collection name="iptelcommsconfig" long-name="IP Telephony Comms Config" level="ui">
-     <component name="cscgsplugin" long-name="CSCGS Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/commsconfig/cscgsplugin/group"/>
-     </component>
-     <component name="cscsipvoipcleanupplugin" long-name="CSC SIP VOIP Cleanup Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/commsconfig/cscsipvoipcleanupplugin/group"/>
-     </component>
-     <component name="cscengine" long-name="CSC Engine" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/commsconfig/cscengine/group"/>
-     </component>
-     <component name="cscsettingsui" long-name="CSC Settings UI" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/commsconfig/cscsettingsui/group"/>
-     </component>
-     <component name="cscapplicationui" long-name="CSC Application UI" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/commsconfig/cscapplicationui/group"/>
-     </component>
-     <component unofficial="yes" name="commsconfig_build" long-name="Comms Config Build" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/commsconfig/group"/>
-     </component>
-    </collection>
-    <collection name="convergedconnectionhandler" long-name="Converged Connection Handler" level="ui">
-     <component name="cchserver" long-name="CCH Server" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/convergedconnectionhandler/cchserver/group"/>
-     </component>
-     <component name="cchclient" long-name="CCH Client" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/convergedconnectionhandler/cchclient/group"/>
-     </component>
-     <component name="cchclientapi" long-name="CCH Clientapi" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/convergedconnectionhandler/cchclientapi/group"/>
-     </component>
-     <component unofficial="yes" name="convergedconnectionhandler_build" long-name="Converged Connection Handler Build" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/convergedconnectionhandler/group"/>
-     </component>
-    </collection>
-    <collection name="richcallsettingsengine" long-name="Rich Call Settings Engine" level="eng">
-     <component name="rcse2" long-name="Rcse2" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/richcallsettingsengine/rcse2/group"/>
-     </component>
-    </collection>
-    <collection name="sipvoipprovider" long-name="SIP VoIP Provider" level="eng">
-     <component name="svp" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/sipvoipprovider/group"/>
-     </component>
-    </collection>
-    <collection name="voipplugins" long-name="VoIP Plugins" level="plugin">
-     <component name="sipmxresolver" long-name="SIP MX Resolver" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/voipplugins/sipmxresolver/group"/>
-     </component>
-     <component name="sipconnectionprovider" long-name="SIP Connection Provider" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/voipplugins/sipconnectionprovider/group"/>
-      <unit bldFile="/sf/app/iptelephony/voipplugins/sipconnectionprovider/ipvoicemailengine/group"/>
-     </component>
-     <component name="ipapputils" long-name="IP App Utils" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/voipplugins/ipapputils/group"/>
-     </component>
-     <component name="voipadapters" long-name="VOIP Adapters" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/voipplugins/voipadapters/group"/>
-     </component>
-     <component name="accountcreationplugin" long-name="Account Creation Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/voipplugins/accountcreationplugin/group"/>
-     </component>
-     <component name="dhcppositionprovider" long-name="DHCP Position Provider" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/voipplugins/dhcppositionprovider/group"/>
-     </component>
-     <component name="svtmatching" long-name="SVT Matching" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/voipplugins/svtmatching/group"/>
-     </component>
-     <component name="svtlogging" long-name="SVT Logging" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/voipplugins/svtlogging/group"/>
-     </component>
-     <component name="svtcallmenu" long-name="SVT Call Menu" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/voipplugins/svtcallmenu/group"/>
-     </component>
-     <component unofficial="yes" name="voipplugins_build" long-name="VoIP Plugins Build" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/voipplugins/group"/>
-     </component>
-    </collection>
-    <collection name="callcontinuity" long-name="Call Continuity" level="eng">
-     <component name="vccutils" long-name="VCC Utils" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/callcontinuity/vccutils/group"/>
-     </component>
-     <component name="nsmldmvccadapter" long-name="NSML DM VCC Adapter" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/callcontinuity/nsmldmvccadapter/group"/>
-     </component>
-     <component name="vccclientprovisioningadapter" long-name="VCC Client Provisioning Adapter" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/callcontinuity/vccclientprovisioningadapter/group"/>
-     </component>
-     <component name="vccpropertyhandler" long-name="VCC Property Handler" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/callcontinuity/vccpropertyhandler/group"/>
-     </component>
-     <component name="vcchotrigger" long-name="VCC Hotrigger" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/callcontinuity/vcchotrigger/group"/>
-     </component>
-     <component name="vcc" long-name="VCC" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/callcontinuity/vcc/group"/>
-     </component>
-     <component name="settingsreader" long-name="Settings Reader" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/iptelephony/callcontinuity/settingsreader/group"/> -->
-     </component>
-     <component unofficial="yes" name="callcontinuity_build" long-name="Call Continuity Build" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/callcontinuity/group"/>
-     </component>
-    </collection>
-    <collection name="iptelephony_info" long-name="IP Telephony Info" level="ui">
-     <component unofficial="yes" name="iptelephony_build" long-name="IP Telephony Build" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/group"/>
-     </component>
-     <component unofficial="yes" name="iptel_plat" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/iptelephony/iptel_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/iptelephony/sources.csv
--- a/3k/app/iptelephony/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/iptelephony/,/sf/app/iptelephony,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/java/package_definition.xml
--- a/3k/app/java/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="java" long-name="Java" tech_domain="rt" level="services" levels="framework util generic rt">
-    <collection name="javaextensions" long-name="Java Extensions" level="generic">
-     <component name="eswt" long-name="Eswt" origin-model="foundation"/>
-     <component name="jsr" long-name="JSR" origin-model="foundation"/>
-     <component name="supplements" long-name="Supplements" origin-model="foundation"/>
-    </collection>
-    <collection name="javainstaller" long-name="Java Installer" level="generic">
-     <component name="javarightslistener" long-name="Java Rights Listener" origin-model="foundation"/>
-     <component name="installplugins" long-name="Install Plugins" origin-model="foundation"/>
-     <component name="midp2otadownloadplugin" long-name="MIDP2 OTA Download Plugin" origin-model="foundation"/>
-     <component name="installationfrontend" long-name="Installation Frontend" origin-model="foundation"/>
-     <component name="midp2iferecognizer" long-name="MIDP2 Interface Rrecognizer" origin-model="foundation"/>
-     <component name="iferecognizers" long-name="Ife Recognizers" origin-model="foundation"/>
-    </collection>
-    <collection name="javalegacy" long-name="Java Legacy" level="util">
-     <component name="jcfcommon" long-name="Jcf Common" origin-model="foundation"/>
-     <component name="j2me" long-name="J2ME" origin-model="foundation"/>
-    </collection>
-    <collection name="javamanager" long-name="Java Manager" level="framework">
-     <component name="javabackup" long-name="Java Backup" origin-model="foundation"/>
-     <!-- Empty duplicate component javaregistry removed -->
-     <component name="javadrmmanager" long-name="Java DRM Manager" origin-model="foundation"/>
-     <component name="javasettings" long-name="Java Settings" origin-model="foundation"/>
-    </collection>
-    <collection name="javaruntime" long-name="Java Runtime" level="rt">
-     <!-- Empty duplicate component common removed -->
-     <component name="temp_j2me_root" long-name="Temp J2me Root" origin-model="foundation"/>
-     <component name="jvm" long-name="JVM" origin-model="foundation"/>
-     <component name="eventserver" long-name="Event Server" origin-model="foundation"/>
-     <!-- Empty duplicate component utils removed -->
-     <component name="midp2ams" long-name="Midp2ams" origin-model="foundation"/>
-     <component name="redirserver" long-name="Redirect Server" origin-model="foundation"/>
-    </collection>
-    <collection name="javautils" long-name="Java Utils" level="util">
-     <component name="jarfiledecoder" long-name="JAR File Decoder" origin-model="foundation"/>
-     <component name="javareader" long-name="Java Reader" origin-model="foundation"/>
-     <component name="javapackagelookup" long-name="Java Package Lookup" origin-model="foundation"/>
-     <!-- Empty duplicate component common removed -->
-     <component name="integrityserver" long-name="Integrity Server" origin-model="foundation"/>
-     <!-- Empty duplicate component javadrmutils removed -->
-     <component name="javarecognizer" long-name="Java Recognizer" origin-model="foundation"/>
-     <component name="iconconverter" long-name="Icon Converter" origin-model="foundation"/>
-     <component name="adt" long-name="ADT" origin-model="foundation"/>
-     <!-- Empty duplicate component javaenvinfo removed -->
-    </collection>
-    <collection name="java_stubs" long-name="Java Stubs" level="util">
-     <!--component manually moved to javautils collection-->
-     <!--<component name="javadrmutils" long-name="Java DRM Utils">
-       <unit bldFile="/sf/app/java/java_stubs/javadrmutils/group"/>
-     </component>-->
-     <!--component manually moved to javautils collection-->
-     <!--<component name="javaenvinfo" long-name="Java Environment Info">
-       <unit bldFile="/sf/app/java/java_stubs/javaenvinfo/group"/>
-     </component>-->
-     <component name="javaregistry" long-name="Java Registry" origin-model="foundation">
-      <unit bldFile="/sf/app/java/java_stubs/javaregistry/clientserver/client/group"/>
-     </component>
-     <component unofficial="yes" name="java_stubs_build" origin-model="foundation">
-      <unit bldFile="/sf/app/java/java_stubs/group"/>
-     </component>
-    </collection>
-    <collection name="javatools" long-name="Java Tools" level="generic">
-     <component name="envupdater" long-name="Environment Updater" origin-model="foundation"/>
-    </collection>
-    <collection name="java_info" long-name="Java Info" level="rt">
-     <component unofficial="yes" name="java_build" long-name="Java Build" origin-model="foundation">
-      <unit bldFile="/sf/app/java/group"/>
-     </component>
-     <component unofficial="yes" name="java_plat" long-name="Java Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/java/java_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/java/sources.csv
--- a/3k/app/java/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/java/,/sf/app/java,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/location/package_definition.xml
--- a/3k/app/location/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="location" long-name="Location Apps" tech_domain="lo" level="apps" levels="engine ui apps">
-    <collection name="landmarksui" long-name="Landmarks UI" level="ui">
-     <component name="landmarksui_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/location/landmarksui/help/group"/>
-     </component>
-     <component name="landmarksui_engine" long-name="Engine" origin-model="foundation">
-      <unit bldFile="/sf/app/location/landmarksui/engine/group"/>
-     </component>
-     <component name="uicontrols" long-name="UI Controls" origin-model="foundation">
-      <unit bldFile="/sf/app/location/landmarksui/uicontrols/group"/>
-     </component>
-     <component name="landmarksui_commonui" long-name="Common UI" origin-model="foundation">
-      <unit bldFile="/sf/app/location/landmarksui/commonui/group"/>
-     </component>
-     <component name="landmarksui_app" long-name="Application" origin-model="foundation">
-      <unit bldFile="/sf/app/location/landmarksui/app/group"/>
-     </component>
-     <component name="msgviewer" long-name="Message Viewer" origin-model="foundation">
-      <unit bldFile="/sf/app/location/landmarksui/msgviewer/group"/>
-     </component>
-     <component unofficial="yes" name="landmarksui_build" long-name="Landmarks UI Build" origin-model="foundation">
-      <unit bldFile="/sf/app/location/landmarksui/group"/>
-     </component>
-    </collection>
-    <collection name="basiclocationinfodisplay" long-name="Basic Location Info Display" level="ui">
-     <component name="blid" long-name="Blid" origin-model="foundation">
-      <unit bldFile="/sf/app/location/basiclocationinfodisplay/blid/group"/>
-     </component>
-     <component unofficial="yes" name="basiclocationinfodisplay_build" long-name="Basic Location Info Display Build" origin-model="foundation">
-      <unit bldFile="/sf/app/location/basiclocationinfodisplay/group"/>
-     </component>
-    </collection>
-    <collection name="eventsui" long-name="Events UI" level="ui">
-     <component name="eventsui_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/location/eventsui/help/group"/>
-     </component>
-     <component name="eventsutils" long-name="Events Utils" origin-model="foundation">
-      <unit bldFile="/sf/app/location/eventsui/eventsutils/group"/>
-     </component>
-     <component name="eventsengine" long-name="Events Engine" origin-model="foundation">
-      <unit bldFile="/sf/app/location/eventsui/eventsengine/group"/>
-     </component>
-     <component name="eventshandlerui" long-name="Events Handler UI" origin-model="foundation">
-      <unit bldFile="/sf/app/location/eventsui/eventshandlerui/group"/>
-     </component>
-     <component name="eventseditor" long-name="Events Editor" origin-model="foundation">
-      <unit bldFile="/sf/app/location/eventsui/eventseditor/group"/>
-     </component>
-     <component name="eventsmgmtui" long-name="Events Mgmt UI" origin-model="foundation">
-      <unit bldFile="/sf/app/location/eventsui/eventsmgmtui/group"/>
-     </component>
-     <component unofficial="yes" name="eventsui_build" long-name="Events UI Build" origin-model="foundation">
-      <unit bldFile="/sf/app/location/eventsui/group"/>
-     </component>
-    </collection>
-    <collection name="locationlandmarksrefappfors60" long-name="Location Landmarks Reference App for S60" level="apps">
-     <component name="lmrefapp" origin-model="foundation">
-      <unit bldFile="/sf/app/location/locationlandmarksrefappfors60/group"/>
-     </component>
-    </collection>
-    <collection name="locationlandmarksuirefapp" long-name="Location Landmarks UI Reference App" level="apps">
-     <component name="lmuirefapp" origin-model="foundation">
-      <unit bldFile="/sf/app/location/locationlandmarksuirefapp/group"/>
-     </component>
-    </collection>
-    <collection name="locationsatviewrefapp" long-name="Location Sat View Reference App" level="apps">
-     <component name="satellitereference" origin-model="foundation">
-      <unit bldFile="/sf/app/location/locationsatviewrefapp/group"/>
-     </component>
-    </collection>
-    <collection name="simpsyconfigurator" long-name="SIM PSY Configurator" level="engine">
-     <component name="simpsyui" origin-model="foundation">
-      <unit bldFile="/sf/app/location/simpsyconfigurator/group"/>
-     </component>
-    </collection>
-    <collection name="mapnavproviderrefapp" long-name="Map Nav Provider Reference App" level="apps">
-     <component unofficial="yes" name="mapnavproviderrefapp_build" long-name="Map Nav Provider Reference App Build" origin-model="foundation">
-      <unit bldFile="/sf/app/location/mapnavproviderrefapp/group"/>
-     </component>
-    </collection>
-    <collection name="location_info" long-name="Location Apps Info" level="apps">
-     <component unofficial="yes" name="location_build" long-name="Location Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/location/group"/>
-     </component>
-     <component unofficial="yes" name="location_test" long-name="Location Apps Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/location/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="loc_pub" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/location/loc_pub/group"/>
-      <!-- <unit bldFile="/sf/app/location/loc_pub/landmarks_ui_addedit_api/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="/sf/app/location/loc_pub/landmarks_ui_addedit_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/location/loc_pub/landmarks_ui_selector_api/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="/sf/app/location/loc_pub/landmarks_ui_selector_api/tsrc/group"/> -->
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/location/sources.csv
--- a/3k/app/location/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/location/,/sf/app/location,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/messaging/package_definition.xml
--- a/3k/app/messaging/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="messaging" long-name="Messaging Apps" tech_domain="pr" level="apps" span="2" levels="mail eng base ui">
-    <collection name="mobilemessaging" long-name="Mobile Messaging" level="ui">
-     <component name="audiomsg" long-name="Audio Message" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/mobilemessaging/audiomsg/group"/>
-     </component>
-     <component name="msgmedia" long-name="Message Media" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/mobilemessaging/msgmedia/group"/>
-     </component>
-     <component name="unieditor" long-name="Uni Editor" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/mobilemessaging/unieditor/group"/>
-     </component>
-     <component name="mmsui" long-name="MMS UI" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/mobilemessaging/mmsui/group"/>
-     </component>
-     <component name="postcard" long-name="Postcard" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/mobilemessaging/postcard/group"/>
-     </component>
-     <component name="smilui" long-name="SMIL UI" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/mobilemessaging/smilui/group"/>
-     </component>
-     <component name="smum" long-name="Smum" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/mobilemessaging/smum/group"/>
-     </component>
-     <component name="smsui" long-name="SMS UI" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/mobilemessaging/smsui/group"/>
-      <!-- <unit bldFile="/sf/app/messaging/mobilemessaging/smsui/viewer"/> -->
-     </component>
-     <!--Component manually removed as already declared in OS-->
-     <!--<component name="smsmtm">
-       <unit bldFile="/sf/app/messaging/mobilemessaging/smsmtm/multimode/group"/>
-       -  <unit bldFile="/sf/app/messaging/mobilemessaging/smsmtm/test/testrom"/>  -
-     </component>-->
-    <component name="smsmtm" long-name="SMS MTM" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/app/messaging/mobilemessaging/smsmtm/multimode/Group" mrp="/sf/app/messaging/mobilemessaging/smsmtm/multimode/Group/messaging_sms_multimode.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmsengine" long-name="MMS Engine" level="eng">
-     <component name="mmsconninit" long-name="MMS Connection Init" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmsconninit/bld"/> -->
-     </component>
-     <component name="genutils" long-name="General Utils" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/messaging/mmsengine/genutils/bld"/> -->
-     </component>
-     <component name="mmsserversettings" long-name="MMS Server Aettings" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmsserversettings/bld"/> -->
-     </component>
-     <component name="mmsmessage" long-name="MMS Message" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmsmessage/bld"/> -->
-     </component>
-     <component name="mmshttptransport" long-name="MMS HTTP Transport" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmshttptransport/bld"/> -->
-     </component>
-     <component name="mmscodec" long-name="MMS Codec" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmscodec/bld"/> -->
-     </component>
-     <component name="mmsserver" long-name="MMS Server" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmsserver/bld"/> -->
-     </component>
-     <component name="clientmtm" long-name="Client MTM" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/messaging/mmsengine/clientmtm/bld"/> -->
-     </component>
-     <component name="mmswatcher" long-name="MMS Watcher" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmswatcher/bld"/> -->
-     </component>
-     <component name="mmspushhandler" long-name="MMS Push Handler" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmspushhandler/bld"/> -->
-     </component>
-     <component name="applicationadapter" long-name="Application Adapter" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/messaging/mmsengine/applicationadapter/bld"/> -->
-     </component>
-     <component name="mmscodecclient" long-name="MMS Codec Client" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/messaging/mmsengine/mmscodecclient/bld"/> -->
-     </component>
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="mmssettings">
-       <unit bldFile="/sf/app/messaging/mmsengine/mmssettings/test/group"/>
-     </component>-->
-     <component unofficial="yes" name="mmsengine_build" long-name="MMS Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/mmsengine/group"/>
-     </component>
-    <component name="mmssettings" long-name="MMS Settings" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/app/messaging/mmsengine/mmssettings/group" mrp="/sf/app/messaging/mmsengine/mmssettings/group/messaging_mmssettings.mrp"/>
-     </component>
-     <component name="mmsconf" long-name="MMS Configuration" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/app/messaging/mmsengine/mmsconf" mrp="/sf/app/messaging/mmsengine/mmsconf/messaging_mmssettings-config.mrp"/>
-     </component>
-    </collection>
-    <collection name="messagingappbase" long-name="Messaging App Base" level="base">
-     <component name="msgavkon" long-name="Messaging Avkon" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/messagingappbase/msgavkon/group"/>
-     </component>
-     <component name="mce" long-name="MCE" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/messagingappbase/mce/group"/>
-     </component>
-     <component name="mceextraitems" long-name="Mce Extra Items" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/messagingappbase/mceextraitems/group"/>
-     </component>
-     <component name="mcesettings" long-name="MCE Settings" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/messagingappbase/mcesettings/group"/>
-     </component>
-     <component name="msgerrorwatcher" long-name="Msg Error Watcher" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/messagingappbase/msgerrorwatcher/group"/>
-     </component>
-     <component name="ncnlist" long-name="NCN List" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/messagingappbase/ncnlist/group"/>
-     </component>
-     <component name="schemeplugin" long-name="Scheme Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/messagingappbase/schemeplugin/group"/>
-     </component>
-     <component name="sendui" long-name="Send UI" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/messaging/messagingappbase/sendui/drmlinksender/group"/> -->
-      <!-- <unit bldFile="/sf/app/messaging/messagingappbase/sendui/genericmtmplugin/group"/> -->
-      <unit bldFile="/sf/app/messaging/messagingappbase/sendui/group"/>
-      <!-- <unit bldFile="/sf/app/messaging/messagingappbase/sendui/meetingrequestsender/group"/> -->
-     </component>
-     <component name="smilengine" long-name="SMIL Engine" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/messagingappbase/smilengine/group"/>
-     </component>
-     <component name="bium" long-name="Bium" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/messagingappbase/bium/group"/>
-     </component>
-     <component name="smartmessaging" long-name="Smart Messaging" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/messagingappbase/smartmessaging/group"/>
-     </component>
-     <component name="msgeditor" long-name="Messaging Editor" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/messagingappbase/msgeditor/group"/>
-     </component>
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="smilparser">
-       <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/rom"/>
-       <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/smildtd/group"/>
-       <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/xmldom/group"/>
-       <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/xmlparser/group"/>
-     </component>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="obexmtms">
-       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/btmtm/btclient/group"/>
-       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/btmtm/btserver/group"/>
-       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/irmtm/irclient/group"/>
-       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/irmtm/irserver/group"/>
-       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/obexmtm/obexclient/group"/>
-       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/obexmtm/obexserver/group"/>
-       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/obexmtm/obexutil/group"/>
-       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/rom"/>
-       <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/tobexmtm/group"/>
-       -  <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/tobexmtm/obexstub/bluetoothsdpstub/sdp"/>  -
-       -  <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/tobexmtm/obexstub/irobexstub/group"/>  -
-       -  <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/tobexmtm/testutils/msgth/group"/>  -
-     </component>-->
-    <component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/app/messaging/messagingappbase/smilparser/GROUP" mrp="/sf/app/messaging/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp"/>
-     </component>
-     <component name="obexmtms" long-name="OBEX MTMs" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/app/messaging/messagingappbase/obexmtms/Group" mrp="/sf/app/messaging/messagingappbase/obexmtms/Group/messaging_obex.mrp"/>
-     </component>
-    </collection>
-    <collection name="email" long-name="Email" level="mail">
-     <component name="alwaysonlineemailplugin" long-name="Always Online Mail Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/email/alwaysonlineemailplugin/group"/>
-     </component>
-     <component name="emailnotificationhandler" long-name="Email Notification Handler" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/email/emailnotificationhandler/group"/>
-     </component>
-     <component name="imum" long-name="IMUM" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/messaging/email/imum/domainapi/group"/> -->
-      <unit bldFile="/sf/app/messaging/email/imum/group"/>
-      <!-- <unit bldFile="/sf/app/messaging/email/imum/mtms/group"/> -->
-      <!-- <unit bldFile="/sf/app/messaging/email/imum/utils/group"/> -->
-     </component>
-     <component name="mail" long-name="Mail" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/email/mail/group"/>
-     </component>
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="pop3andsmtpmtm">
-       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/autosend/group"/>
-       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/clientmtms/group"/>
-       -  <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/clientmtms/test/testrom"/>  -
-       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/popservermtm/group"/>
-       -  <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/popservermtm/test/testrom"/>  -
-       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/servermtmutils/group"/>
-       -  <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/servermtmutils/test/testrom"/>  -
-       <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/smtpservermtm/group"/>
-       -  <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/smtpservermtm/test/testrom"/>  -
-     </component>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="imap4mtm">
-       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapmailstore/group"/>
-       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapofflinecontrol/group"/>
-       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapprotocolcontroller/group"/>
-       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapservermtm/group"/>
-       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapsession/group"/>
-       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapsettings/group"/>
-       <unit bldFile="/sf/app/messaging/email/imap4mtm/imapsyncmanager/group"/>
-       <unit bldFile="/sf/app/messaging/email/imap4mtm/imaptransporthandler/group"/>
-       <unit bldFile="/sf/app/messaging/email/imap4mtm/imaputils/group"/>
-     </component>-->
-    <component name="pop3andsmtpmtm" long-name="POP3 and SMTP MTM" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/app/messaging/email/pop3andsmtpmtm/group" mrp="/sf/app/messaging/email/pop3andsmtpmtm/group/messaging_email.mrp"/>
-     </component>
-     <component name="imap4mtm" long-name="IMAP4 MTM" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/app/messaging/email/imap4mtm/group" mrp="/sf/app/messaging/email/imap4mtm/group/messaging_email_imap.mrp"/>
-     </component>
-    </collection>
-    <collection name="messaging_info" long-name="Messaging Apps Info" level="ui">
-     <component unofficial="yes" name="messaging_test" long-name="Messaging Apps Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/messaging/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="msg_plat" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/messaging/msg_plat/email_domain_utilities_api/tsrc/group"/> -->
-      <unit bldFile="/sf/app/messaging/msg_plat/group"/>
-      <unit bldFile="/sf/app/messaging/msg_plat/messaging_center_ui_utilities_api/tsrc/group"/>
-      <unit bldFile="/sf/app/messaging/msg_plat/messaging_editor_api/tsrc/group"/>
-      <unit bldFile="/sf/app/messaging/msg_plat/messaging_media_resolver_api/tsrc/group"/>
-      <unit bldFile="/sf/app/messaging/msg_plat/mms_application_api/tsrc/group"/>
-      <unit bldFile="/sf/app/messaging/msg_plat/mms_codec_client_api/tsrc/group"/>
-      <unit bldFile="/sf/app/messaging/msg_plat/mms_conformance_api/tsrc/group"/>
-      <unit bldFile="/sf/app/messaging/msg_plat/mms_server_settings_api/tsrc/group"/>
-      <!-- <unit bldFile="/sf/app/messaging/msg_plat/send_ui_meeting_request_api/tsrc/group"/> -->
-      <unit bldFile="/sf/app/messaging/msg_plat/smil_engine_api/tsrc/group"/>
-      <unit bldFile="/sf/app/messaging/msg_plat/unified_editor_video_conversion_api/tsrc/group"/>
-     </component>
-     <component unofficial="yes" name="msg_pub" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/msg_pub/group"/>
-      <!-- <unit bldFile="/sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/> -->
-      <unit bldFile="/sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/group"/>
-      <!-- <unit bldFile="/sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/> -->
-      <unit bldFile="/sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/group"/>
-     </component>
-     <component unofficial="yes" name="messaging_build" long-name="Messaging Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/messaging/group"/>
-     </component>
-    <component name="messaging_metadata" long-name="Messaging Apps Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/app/messaging/messaging_info/messaging_metadata/messaging_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/messaging/sources.csv
--- a/3k/app/messaging/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/messaging/,/sf/app/messaging,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/mmsharinguis/package_definition.xml
--- a/3k/app/mmsharinguis/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="mmsharinguis" long-name="Multimedia Sharing UIs" tech_domain="vc" level="services" levels="base plugin">
-    <collection name="mmsharing" long-name="MM Sharing" level="base">
-     <component name="mmshavailability" long-name="Multimedia Sharing Availability" origin-model="foundation">
-      <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshavailability/group"/>
-      <!-- <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshavailability/tsrc/ut_availability/group"/> -->
-     </component>
-     <component name="mmshindicator" long-name="Multimedia Sharing Indicator" origin-model="foundation">
-      <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshindicator/group"/>
-      <!-- <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshindicator/tsrc/indicatortestapp/group"/> -->
-      <!-- <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshindicator/tsrc/ut_indicator/group"/> -->
-     </component>
-     <component name="mmshmanagercli" long-name="Multimedia Sharing Manager Client" origin-model="foundation">
-      <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagercli/group"/>
-      <!-- <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagercli/tsrc/ut_managercli/group"/> -->
-     </component>
-     <component name="mmshmanagersrv" long-name="Multimedia Sharing Manager Server" origin-model="foundation">
-      <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagersrv/group"/>
-      <!-- <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshmanagersrv/tsrc/ut_managersrv/group"/> -->
-     </component>
-     <component name="mmshengine" long-name="Multimedia Sharing Engine" origin-model="foundation">
-      <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshengine/group"/>
-      <!-- <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshengine/tsrc/ut_engine/group"/> -->
-     </component>
-     <component name="mmshui" long-name="Multimedia Sharing UI" origin-model="foundation">
-      <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/group"/>
-      <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/help/group"/>
-      <!-- <unit bldFile="/sf/app/mmsharinguis/mmsharing/mmshui/tsrc/ut_ui/group"/> -->
-     </component>
-     <component unofficial="yes" name="mmsharing_build" long-name="MM Sharing Build" origin-model="foundation">
-      <unit bldFile="/sf/app/mmsharinguis/mmsharing/group"/>
-     </component>
-    </collection>
-    <collection name="mmshplugins" long-name="MM Sharing Plugins" level="plugin">
-     <component name="mmshaoplugin" long-name="Multimedia Sharing Always Online Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshaoplugin/group"/>
-      <!-- <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshaoplugin/tsrc/ut_aoplugin/group"/> -->
-     </component>
-     <component name="mmshaiwplugin" long-name="Multimedia Sharing AIW Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshaiwplugin/group"/>
-      <!-- <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshaiwplugin/tsrc/ut_aiwplugin/group"/> -->
-     </component>
-     <component name="mmshsipcrplugin" long-name="Multimedia Sharing SIP Client Resolver Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshsipcrplugin/group"/>
-      <!-- <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshsipcrplugin/tsrc/ut_sipcrplugin/group"/> -->
-     </component>
-     <component name="mmshsettingsuiplugin" long-name="Multimedia Sharing Settings UI Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshsettingsuiplugin/group"/>
-     </component>
-     <component name="mmshwpadapterplugin" long-name="Multimedia Sharing WP Adapter Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshwpadapterplugin/group"/>
-      <!-- <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmshwpadapterplugin/tsrc/ut_wpadapterplugin/group"/> -->
-     </component>
-     <component name="mmcctranscoder" long-name="MMCC Transcoder" origin-model="foundation">
-      <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmcctranscoder/group"/>
-      <!-- <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmcctranscoder/tsrc/stubs/group"/> -->
-      <!-- <unit bldFile="/sf/app/mmsharinguis/mmshplugins/mmcctranscoder/tsrc/ut_transcoder/group"/> -->
-     </component>
-     <component unofficial="yes" name="mmshplugins_build" long-name="MM Sharing Plugins Build" origin-model="foundation">
-      <unit bldFile="/sf/app/mmsharinguis/mmshplugins/group"/>
-     </component>
-    </collection>
-    <collection name="mmsharinguis_info" long-name="Multimedia Sharing UIs Info" level="plugin">
-     <component unofficial="yes" name="scripts" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/mmsharinguis/tsrc/scripts"/> -->
-     </component>
-     <component unofficial="yes" name="mceclientstub" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/mmsharinguis/tsrc/mceclientstub/group"/> -->
-     </component>
-     <component unofficial="yes" name="mmsharinguis_build" long-name="Multimedia Sharing UIs Build" origin-model="foundation">
-      <unit bldFile="/sf/app/mmsharinguis/group"/>
-     </component>
-     <component unofficial="yes" name="musenginestub" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/mmsharinguis/tsrc/musenginestub/group"/> -->
-     </component>
-     <component unofficial="yes" name="ututils" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/mmsharinguis/tsrc/ututils/group"/> -->
-     </component>
-     <component unofficial="yes" name="cenrepeditor" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/mmsharinguis/tsrc/cenrepeditor/group"/> -->
-     </component>
-     <component unofficial="yes" name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/mmsharinguis/mmsharinguis_plat/group"/>
-      <!-- <unit bldFile="/sf/app/mmsharinguis/mmsharinguis_plat/multimedia_sharing_manager_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="mustestapp" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/mmsharinguis/tsrc/mustestapp/group"/> -->
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/mmsharinguis/sources.csv
--- a/3k/app/mmsharinguis/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/musicplayer/package_definition.xml
--- a/3k/app/musicplayer/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="musicplayer" long-name="Music Player Apps" tech_domain="ma" level="apps" levels="plugins support apps">
-    <collection name="musicvisualization" long-name="Music Visualization" level="plugins">
-     <component name="musicvisualizationplugin" long-name="Music Visualization Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/musicvisualization/musicvisualizationplugin/group"/>
-     </component>
-     <component name="mpxvisualizationplugins" long-name="MPX Visualization Plugins" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/musicvisualization/mpxvisualizationplugins/group"/>
-     </component>
-    </collection>
-    <collection name="mpxmusicplayer" long-name="MPX Music Player" level="apps">
-     <component name="mpxmusicplayer_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/mpxmusicplayer/help/group"/>
-     </component>
-     <component name="mpxmusicplayer_commonui" long-name="Common UI" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/mpxmusicplayer/commonui/group"/>
-     </component>
-     <component name="activeidle" long-name="Active Idle" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/mpxmusicplayer/activeidle/group"/>
-     </component>
-     <component name="metadatahandler" long-name="Metadata Handler" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/mpxmusicplayer/metadatahandler/group"/>
-     </component>
-     <component name="mediakeyhandler" long-name="Mediakey Handler" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/mpxmusicplayer/mediakeyhandler/group"/>
-     </component>
-     <component name="mpxmusicplayer_app" long-name="Application" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/mpxmusicplayer/app/group"/>
-     </component>
-     <component unofficial="yes" name="mpxmusicplayer_build" long-name="MPX Music Player Build" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/mpxmusicplayer/group"/>
-     </component>
-    </collection>
-    <collection name="musichomescreen" long-name="Music Homescreen" level="apps">
-     <component name="mpxcollectionpublisher" long-name="MPX Collection Publisher" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/musichomescreen/mpxcollectionpublisher/group"/>
-     </component>
-     <component name="musiccontentpublisher" long-name="Music Content Publisher" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/musichomescreen/musiccontentpublisher/group"/>
-     </component>
-     <component name="mcpmusicplayer" long-name="MCP Music Player" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/musichomescreen/mcpmusicplayer/group"/>
-     </component>
-     <component name="musicplayeractionhandlerplugin" long-name="Music Player Action Handler Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/musichomescreen/musicplayeractionhandlerplugin/group"/>
-     </component>
-     <component name="data" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/musichomescreen/data/themes/default/group"/>
-     </component>
-     <component unofficial="yes" name="musichomescreen_build" long-name="Music Homescreen Build" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/musichomescreen/group"/>
-     </component>
-    </collection>
-    <collection name="mpxplugins" long-name="MPX Plugins" level="plugins">
-     <component name="serviceplugins" long-name="service Plugins" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/mpxplugins/serviceplugins/group"/>
-     </component>
-     <component name="viewplugins" long-name="View Plugins" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/mpxplugins/viewplugins/group"/>
-     </component>
-     <component unofficial="yes" name="mpxplugins_build" long-name="MPX Plugins Build" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/mpxplugins/group"/>
-     </component>
-    </collection>
-    <collection name="musicplayer_info" long-name="Music Player Apps Info" level="apps">
-     <component unofficial="yes" name="musicplayer_plat" long-name="Music Player Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/musicplayer_plat/group"/>
-      <unit bldFile="/sf/app/musicplayer/musicplayer_plat/mpx_music_player_app_api/tsrc/group"/>
-      <unit bldFile="/sf/app/musicplayer/musicplayer_plat/mpx_music_player_commonui_api/tsrc/group"/>
-      <unit bldFile="/sf/app/musicplayer/musicplayer_plat/mpx_music_player_media_key_handler_api/tsrc/group"/>
-      <unit bldFile="/sf/app/musicplayer/musicplayer_plat/mpx_music_store_api/tsrc/group"/>
-      <unit bldFile="/sf/app/musicplayer/musicplayer_plat/music_visualization_plugin_api/tsrc/group"/>
-     </component>
-     <component unofficial="yes" name="musicplayer_test" long-name="Music Player Apps Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/musicplayer/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="musicplayer_build" long-name="Music Player Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/musicplayer/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/musicplayer/sources.csv
--- a/3k/app/musicplayer/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/organizer/package_definition.xml
--- a/3k/app/organizer/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="organizer" long-name="Organizer Application Suite" tech_domain="pr" level="apps" span="2" levels="support services engine ui">
-    <collection name="alarmui" long-name="Alarm UI" level="ui">
-     <component unofficial="yes" name="alarmui_build" long-name="Alarm UI Build" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/alarmui/group"/>
-     </component>
-    </collection>
-    <collection name="calendarui" long-name="Calendar UI" level="ui">
-     <component name="calendarui_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarui/help/group"/>
-     </component>
-     <component name="commonutils" long-name="Common Utils" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarui/commonutils/group"/>
-     </component>
-     <component name="globaldata" long-name="Global Data" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarui/globaldata/group"/>
-     </component>
-     <component name="settings" long-name="Settings" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarui/settings/gsplugin/group"/>
-      <unit bldFile="/sf/app/organizer/calendarui/settings/settingsui/group"/>
-     </component>
-     <component name="customisation" long-name="Customisation" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarui/customisation/group"/>
-     </component>
-     <component name="customisationmanager" long-name="Customisation Manager" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarui/customisationmanager/group"/>
-     </component>
-     <component name="views" long-name="Views" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarui/views/group"/>
-     </component>
-     <component name="calendarui_controller" long-name="Controller" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarui/controller/group"/>
-     </component>
-     <component name="editors" long-name=" Editors" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarui/editors/group"/>
-     </component>
-     <component name="application" long-name="Application" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarui/application/group"/>
-     </component>
-     <component name="missedalarmindicatorplugin" long-name="Missed Alarm Indicator Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarui/missedalarmindicatorplugin/group"/>
-     </component>
-     <component name="calendarui_server" long-name="Server" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarui/server/calensvr/group"/>
-      <unit bldFile="/sf/app/organizer/calendarui/server/calensvrclient/group"/>
-     </component>
-     <component name="regionalplugins" long-name="Regional Plugins" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarui/regionalplugins/calenregionalutil/group"/>
-      <unit bldFile="/sf/app/organizer/calendarui/regionalplugins/lunarchinese/group"/>
-      <unit bldFile="/sf/app/organizer/calendarui/regionalplugins/lunarvietnamese/group"/>
-      <unit bldFile="/sf/app/organizer/calendarui/regionalplugins/thai/group"/>
-     </component>
-     <!-- Empty duplicate component inc removed -->
-     <component unofficial="yes" name="calendarui_build" long-name="Calendar UI Build" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarui/group"/>
-     </component>
-    </collection>
-    <collection name="clock2" long-name="Clock2" level="ui">
-     <component name="clockengines" long-name="Clock Engines" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/clock2/clockengines/group"/>
-     </component>
-     <component name="clockui" long-name="Clock UI" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/clock2/clockui/group"/>
-      <!-- <unit bldFile="/sf/app/organizer/clock2/clockui/plugins/datetimeviewplugin/group"/> -->
-     </component>
-     <component name="clock2_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/clock2/help/group"/>
-     </component>
-     <component unofficial="yes" name="clock2_build" long-name="Clock2 Build" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/clock2/group"/>
-     </component>
-    </collection>
-    <collection name="meetingui" long-name="Meeting UI" level="ui">
-     <component name="attendeeview" long-name="Attendee View" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/meetingui/attendeeview/group"/>
-     </component>
-     <component name="agnentryui" long-name="Agn Entry UI" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/meetingui/agnentryui/group"/>
-     </component>
-     <component name="meetingrequestutils" long-name="Meeting Request Utils" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/meetingui/meetingrequestutils/group"/>
-     </component>
-     <component name="meetingrequestviewers" long-name="Meeting Request Viewers" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/meetingui/meetingrequestviewers/group"/>
-     </component>
-     <component unofficial="yes" name="meetingui_build" long-name="Meeting UI Build" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/meetingui/group"/>
-     </component>
-    </collection>
-    <collection name="notepad" long-name="Notepad" level="ui">
-     <component name="notepad_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/notepad/help/group"/>
-     </component>
-     <component name="notepad1" long-name="Notepad1" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/notepad/notepad1/group"/>
-      <!-- <unit bldFile="/sf/app/organizer/notepad/notepad1/syncmladapter/group"/> -->
-     </component>
-     <component name="txtrecog" long-name="Txt Recog" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/notepad/txtrecog/group"/>
-     </component>
-     <component unofficial="yes" name="notepad_build" long-name="Notepad Build" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/notepad/group"/>
-     </component>
-    </collection>
-    <collection name="searchui" long-name="Search UI" level="ui">
-     <component name="searchui_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/searchui/help/group"/>
-     </component>
-     <component name="searchapp" long-name="Search App" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/searchui/searchapp/group"/>
-      <!-- <unit bldFile="/sf/app/organizer/searchui/searchapp/plugins/searchsettingsplugin/group"/> -->
-      <!-- <unit bldFile="/sf/app/organizer/searchui/searchapp/plugins/srchuisettingsplugin/group"/> -->
-     </component>
-     <component unofficial="yes" name="searchui_build" long-name="Search UI Build" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/searchui/group"/>
-     </component>
-    </collection>
-    <collection name="calendarengines" long-name="Calendar Engines" level="engine">
-     <component name="versit2" long-name="Versit 2" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarengines/versit2/group"/>
-     </component>
-     <component name="agnversit2" long-name="Agenda Versit2" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarengines/agnversit2/group"/>
-     </component>
-     <component name="caleninterimutils" long-name="Calen Interim Utils" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarengines/caleninterimutils/group"/>
-     </component>
-     <component name="calenimp" long-name="Calen Imp" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarengines/calenimp/group"/>
-     </component>
-     <component name="calenlauncher" long-name="Calen Launcher" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarengines/calenlauncher/group"/>
-     </component>
-     <component unofficial="yes" name="calendarengines_build" long-name="Calendar Engines Build" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/calendarengines/group"/>
-     </component>
-    </collection>
-    <collection name="meetingrequestengines" long-name="Meeting Request Engines" level="engine">
-     <component name="mrmailbox" long-name="MR Mailbox" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/meetingrequestengines/mrmailbox/group"/>
-     </component>
-     <component name="mrmailboxutils" long-name="MR Mailbox Utils" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/meetingrequestengines/mrmailboxutils/group"/>
-     </component>
-    </collection>
-    <collection name="alarmengines" long-name="Alarm Engines" level="engine">
-     <component name="missedalarmstore" long-name="Missed Alarm Store" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/alarmengines/missedalarmstore/group"/>
-     </component>
-     <component unofficial="yes" name="alarmengines_build" long-name="Alarm Engines Build" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/alarmengines/group"/>
-     </component>
-    </collection>
-    <collection name="searchfw" long-name="Search Framework" level="services">
-     <component name="coresearchfw" long-name="Core Search Framework" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/searchfw/coresearchfw/group"/>
-     </component>
-     <component name="searchfw_plugins" long-name="Plugins" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/searchfw/plugins/group"/>
-     </component>
-     <component unofficial="yes" name="searchfw_build" long-name="Search Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/searchfw/group"/>
-     </component>
-    </collection>
-    <collection name="pimappservices" long-name="PIM App Services" level="services">
-     <component name="calendar" long-name="Calendar" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/app/organizer/pimappservices/calendar/group" mrp="/sf/app/organizer/pimappservices/calendar/group/app-engines_calendar.mrp" version="2"/>
-     </component>
-     <component name="calendarvcalplugin" long-name="Calendar vCal Plugin" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/app/organizer/pimappservices/calendarvcalplugin/group" mrp="/sf/app/organizer/pimappservices/calendarvcalplugin/group/app-engines_agnversit2.mrp" version="2"/>
-     </component>
-     <component name="agendamodeltest" long-name="Agenda Model Test" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/app/organizer/pimappservices/agendamodeltest/TestAgendaSrv" mrp="/sf/app/organizer/pimappservices/agendamodeltest/TestAgendaSrv/app-engines_testagendasrv.mrp"/>
-     </component>
-     <component name="appenginesdocs" long-name="Application Engines Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/app/organizer/pimappservices/appenginesdocs/app-engines_documentation.mrp"/>
-     </component>
-    </collection>
-    <collection name="officeappeng" long-name="Office App Engines" level="engine">
-     <component name="datamodel" long-name="Data Engine" introduced="ER5" deprecated="9.3" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/app/organizer/officeappeng/datamodel/group" mrp="/sf/app/organizer/officeappeng/datamodel/group/app-engines_damodel.mrp"/>
-     </component>
-     <component name="sheeteng" long-name="Sheet Engine" introduced="ER5" deprecated="9.3" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/app/organizer/officeappeng/sheeteng/group" mrp="/sf/app/organizer/officeappeng/sheeteng/group/app-engines_sheng.mrp"/>
-     </component>
-     <component name="charteng" long-name="Chart" introduced="ER5" deprecated="9.3" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/app/organizer/officeappeng/charteng/group/app-engines_chart.mrp"/>
-     </component>
-     <component name="wordeng" long-name="Word Engine" introduced="ER5" deprecated="9.3" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/app/organizer/officeappeng/wordeng/group" mrp="/sf/app/organizer/officeappeng/wordeng/group/app-engines_wpeng.mrp"/>
-     </component>
-    </collection>
-    <collection name="pimappsupport" long-name="PIM Application Support" level="support">
-     <component name="vcardandvcal" long-name="vCard and vCal" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/app/organizer/pimappsupport/vcardandvcal/group" mrp="/sf/app/organizer/pimappsupport/vcardandvcal/group/app-services_versit.mrp"/>
-     </component>
-     <component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/app/organizer/pimappsupport/chinesecalendarconverter/group" mrp="/sf/app/organizer/pimappsupport/chinesecalendarconverter/group/app-services_calcon.mrp"/>
-     </component>
-     <component name="n:chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/app/organizer/pimappsupport/chinesecalendaralg/group" mrp="app/organizer/pimappsupport/chinesecalendaralg/group/app-services_chinesecalendaralgorithm.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="organizer_info" long-name="Organizer Application Suite Info" level="ui">
-     <component unofficial="yes" name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/organizer/organizer_pub/calendar_interim_utils2_api/tsrc/group"/> -->
-      <unit bldFile="/sf/app/organizer/organizer_pub/group"/>
-      <!-- <unit bldFile="/sf/app/organizer/organizer_pub/notepad_library_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="organizer_build" long-name="Organizer Application Suite Build" origin-model="foundation">
-      <unit bldFile="/sf/app/organizer/group"/>
-     </component>
-     <component unofficial="yes" name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/organizer/organizer_plat/agenda_versit_2_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/organizer/organizer_plat/calendar_exporter_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/organizer/organizer_plat/calendar_importer_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/organizer/organizer_plat/common_alarm_editor_api/tsrc/group"/> -->
-      <unit bldFile="/sf/app/organizer/organizer_plat/group"/>
-      <!-- <unit bldFile="/sf/app/organizer/organizer_plat/meeting_request_mailbox_utilities_api/tsrc/group"/> -->
-     </component>
-    <component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/app/organizer/organizer_info/organizer_metadata/organizer_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/organizer/sources.csv
--- a/3k/app/organizer/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/organizer/,/sf/app/organizer,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/phone/package_definition.xml
--- a/3k/app/phone/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="phone" long-name="Phone Apps" tech_domain="vc" level="apps" span="2" levels="engine plugin ui apps">
-    <collection name="phoneapp" long-name="Phone App" level="apps">
-     <component name="blacklist" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneapp/blacklist/group"/>
-     </component>
-     <component name="phoneui" long-name="Phone UI" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneapp/phoneui/group"/>
-      <!-- <unit bldFile="/sf/app/phone/phoneapp/phoneui/tsrc/public/basic/3dringingtoneinterface_tests/group"/> -->
-      <!-- <unit bldFile="/sf/app/phone/phoneapp/phoneui/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="phoneuicontrol" long-name="Phone UI Control" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneapp/phoneuicontrol/group"/>
-     </component>
-     <component name="phoneuistates" long-name="Phone UI States" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneapp/phoneuistates/group"/>
-     </component>
-     <component name="phoneuiutils" long-name="Phone UI Utils" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneapp/phoneuiutils/group"/>
-     </component>
-     <component name="phoneuiview" long-name="Phone UI View" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneapp/phoneuiview/group"/>
-     </component>
-     <component name="phoneuivoipextension" long-name="Phone UI VOIP Extension" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneapp/phoneuivoipextension/group"/>
-     </component>
-     <component name="silenceactionplugin" long-name="Silence Action Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneapp/silenceactionplugin/group"/>
-     </component>
-     <component name="phonemediatorcenter" long-name="Phone Mediator Center" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneapp/phonemediatorcenter/group"/>
-     </component>
-    </collection>
-    <collection name="phoneengine" long-name="Phone Engine" level="engine">
-     <component name="phonecntfinder" long-name="Phone Contact Finder" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneengine/phonecntfinder/group"/>
-     </component>
-     <component name="audiohandling" long-name="Audio Handling" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneengine/audiohandling/group"/>
-     </component>
-     <component name="callhandling" long-name="Call Handling" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneengine/callhandling/group"/>
-     </component>
-     <component name="contacthandling" long-name="Contact Handling" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneengine/contacthandling/group"/>
-     </component>
-     <component name="loghandling" long-name="Log Handling" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneengine/loghandling/group"/>
-     </component>
-     <component name="engineinfo" long-name="Engine Info" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneengine/engineinfo/group"/>
-     </component>
-     <component name="phonemodel" long-name="Phone Model" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneengine/phonemodel/group"/>
-     </component>
-     <component name="servicehandling" long-name="Service Handling" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneengine/servicehandling/group"/>
-     </component>
-    </collection>
-    <collection name="phonesettings" long-name="Phone Settings" level="ui">
-     <component name="aiwcallimageplugin" long-name="Aiw Call Image Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phonesettings/aiwcallimageplugin/group"/>
-     </component>
-     <component name="pslncallimageplugin" long-name="Personalization Call Image Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phonesettings/pslncallimageplugin/group"/>
-     </component>
-    </collection>
-    <collection name="phoneuis" long-name="Phone UIs" level="ui">
-     <component name="dialer" long-name="Dialer" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneuis/dialer/group"/>
-      <!-- <unit bldFile="/sf/app/phone/phoneuis/dialer/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="bubblemanager" long-name="Bubble Manager" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneuis/bubblemanager/group"/>
-     </component>
-     <component name="connectutil" long-name="Connect Util" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneuis/connectutil/group"/>
-     </component>
-     <component name="sfiutils" long-name="SFI Utils" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneuis/sfiutils/group"/>
-      <!-- <unit bldFile="/sf/app/phone/phoneuis/sfiutils/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="ussd" long-name="USSD" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneuis/ussd/group"/>
-     </component>
-     <component name="vmbx" long-name="Vmbx" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneuis/vmbx/group"/>
-     </component>
-     <component name="telephonydevicemode" long-name="Telephony Device Mode" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneuis/telephonydevicemode/group"/>
-     </component>
-    </collection>
-    <collection name="phoneplugins" long-name="Phone Plugins" level="plugin">
-     <component name="telbranding" long-name="Tel Branding" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phoneplugins/telbranding/group"/>
-     </component>
-    </collection>
-    <collection name="phone_info" long-name="Phone Apps Info" level="apps">
-     <component unofficial="yes" name="phone_build" long-name="Phone Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/group"/>
-     </component>
-     <component unofficial="yes" name="phone_plat" long-name="Phone Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/phone/phone_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/phone/sources.csv
--- a/3k/app/phone/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/app/phone/,/sf/app/phone,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/photos/package_definition.xml
--- a/3k/app/photos/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="photos" long-name="Photos" tech_domain="ma" level="apps" levels="support fw ui app">
-    <collection name="photosgallery" long-name="Photos Gallery" level="app">
-     <component name="photosgallery_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/photos/photosgallery/help/group"/>
-     </component>
-     <component name="logging" long-name="Logging" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/logging/app/group"/> -->
-      <unit bldFile="/sf/app/photos/photosgallery/logging/group"/>
-     </component>
-     <component name="photosgallery_common" long-name="Common" origin-model="foundation">
-      <unit bldFile="/sf/app/photos/photosgallery/common/group"/>
-     </component>
-     <component name="photosgallery_commonui" long-name="Common UI" origin-model="foundation">
-      <unit bldFile="/sf/app/photos/photosgallery/commonui/group"/>
-     </component>
-     <component name="photoscollectionfw" long-name="Collection Framework" origin-model="foundation">
-      <unit bldFile="/sf/app/photos/photosgallery/collectionframework/group"/>
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/collectionframework/plugins/glxcollectionpluginalbums/group"/> -->
-     </component>
-     <component name="photosviewfw" long-name="View Framework" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/commandhandlerbase/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/commandhandlerupnp/tsrc/t_glxupnprenderer/group"/> -->
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/tsrc/t_cglxaiwservicehandler/group"/> -->
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/commoncommandhandlers/tsrc/t_glxcommandhandlerback/group"/> -->
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/tsrc/ut_commandhandlerdrm/group"/> -->
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/tsrc/ut_commandhandlermoreinfo/group"/> -->
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/commandhandlers/tsrc/ut__commandhandlermarking/group"/> -->
-      <unit bldFile="/sf/app/photos/photosgallery/viewframework/group"/>
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/plugins/metadataviewplugin/group"/> -->
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/views/listview/group"/> -->
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/views/metadataview/group"/> -->
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/viewframework/views/viewbase/group"/> -->
-     </component>
-     <component name="controllers" long-name="Controllers" origin-model="foundation">
-      <unit bldFile="/sf/app/photos/photosgallery/controllers/group"/>
-     </component>
-     <component name="photogallery" long-name="Gallery" origin-model="foundation">
-      <unit bldFile="/sf/app/photos/photosgallery/gallery/group"/>
-     </component>
-     <component name="slideshow" long-name="Slideshow" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/photos/photosgallery/slideshow/engine/tsrc/group"/> -->
-      <unit bldFile="/sf/app/photos/photosgallery/slideshow/group"/>
-     </component>
-     <component name="contentharvesterplugin" long-name="Content Harvester Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/photos/photosgallery/contentharvesterplugin/group"/>
-     </component>
-     <component name="photossuite" long-name="Photos Suite" origin-model="foundation">
-      <unit bldFile="/sf/app/photos/photosgallery/photossuite/group"/>
-     </component>
-     <!--Component manually removed as empty and name conflicts with another component-->
-     <!--<component name="memoryplugin" long-name="Memory Plugin">
-       <unit bldFile="/sf/app/photos/photosgallery/memoryplugin/group"/>
-     </component>-->
-     <component unofficial="yes" name="photosicons" origin-model="foundation">
-      <unit bldFile="/sf/app/photos/photosgallery/icons"/>
-     </component>
-     <component unofficial="yes" name="photosgallery_build" long-name="Photos Gallery Build" origin-model="foundation">
-      <unit bldFile="/sf/app/photos/photosgallery/group"/>
-     </component>
-    </collection>
-    <collection name="photos_info" long-name="Photos Info" level="app">
-     <component unofficial="yes" name="photos_plat" long-name="Photos Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/photos/photos_plat/controllers_collection_api/tsrc/ui_metadatadialog/group"/> -->
-      <!-- <unit bldFile="/sf/app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectioninfo/group"/> -->
-      <!-- <unit bldFile="/sf/app/photos/photos_plat/controllers_collection_api/tsrc/ut_collectionmanager/group"/> -->
-      <unit bldFile="/sf/app/photos/photos_plat/group"/>
-     </component>
-     <component unofficial="yes" name="photos_build" long-name="Photos Build" origin-model="foundation">
-      <unit bldFile="/sf/app/photos/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/photos/sources.csv
--- a/3k/app/photos/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/app/photos/,/sf/app/photos,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/poc/package_definition.xml
--- a/3k/app/poc/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="poc" long-name="PoC" tech_domain="vc" level="apps" levels="engine ui">
-    <collection name="pocengine" long-name="PoC Engine" level="engine">
-     <component name="sipclientresolver" long-name="SIP Client Resolver" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/poc/pocengine/sipclientresolver/group"/> -->
-     </component>
-     <component unofficial="yes" name="pocengine_build" long-name="PoC Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/app/poc/pocengine/group"/>
-     </component>
-     <component unofficial="yes" name="pocengine_test" long-name="PoC Engine Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/poc/pocengine/tsrc/public/basic/group"/> -->
-     </component>
-    </collection>
-    <collection name="pocui" long-name="PoC Ui" level="ui">
-     <component name="pocuiintgr" long-name="PoC UI Intgr" origin-model="foundation">
-      <unit bldFile="/sf/app/poc/pocui/pocuiintgr/group"/>
-      <!-- <unit bldFile="/sf/app/poc/pocui/pocuiintgr/pocuiaiwplugin/group"/> -->
-      <!-- <unit bldFile="/sf/app/poc/pocui/pocuiintgr/pocuiecomplugin/group"/> -->
-      <!-- <unit bldFile="/sf/app/poc/pocui/pocuiintgr/pocuiintegrationservices/group"/> -->
-     </component>
-     <component name="pocui_app" long-name="Application" origin-model="foundation">
-      <unit bldFile="/sf/app/poc/pocui/app/group"/>
-     </component>
-     <component unofficial="yes" name="pocui_build" long-name="PoC Ui Build" origin-model="foundation">
-      <unit bldFile="/sf/app/poc/pocui/group"/>
-     </component>
-    </collection>
-    <collection name="poc_info" long-name="PoC Info" level="ui">
-     <component unofficial="yes" name="poc_build" long-name="PoC Build" origin-model="foundation">
-      <unit bldFile="/sf/app/poc/group"/>
-     </component>
-     <component unofficial="yes" name="poc_plat" long-name="PoC Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/poc/poc_plat/group"/>
-     </component>
-     <component unofficial="yes" name="poc_help" long-name="PoC Help" origin-model="foundation">
-      <unit bldFile="/sf/app/poc/help/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/poc/sources.csv
--- a/3k/app/poc/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/poc/,/sf/app/poc,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/printing/package_definition.xml
--- a/3k/app/printing/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="printing" long-name="Printing" tech_domain="de" level="services" levels="app">
-    <collection name="imageprint" long-name="ImagePrint" level="app">
-     <component name="clog" origin-model="foundation">
-      <unit bldFile="/sf/app/printing/imageprint/clog/group"/>
-     </component>
-     <component name="imageprintengine" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/printing/imageprint/imageprintengine/deviceprotocols/btprotocol/group"/> -->
-      <!-- <unit bldFile="/sf/app/printing/imageprint/imageprintengine/deviceprotocols/dpof/group"/> -->
-      <!-- <unit bldFile="/sf/app/printing/imageprint/imageprintengine/deviceprotocols/pictbridge2/group"/> -->
-      <!-- <unit bldFile="/sf/app/printing/imageprint/imageprintengine/deviceprotocols/upnpprotocolfw2/group"/> -->
-      <!-- <unit bldFile="/sf/app/printing/imageprint/imageprintengine/deviceprotocols/xhtmlfilecomposer/group"/> -->
-      <unit bldFile="/sf/app/printing/imageprint/imageprintengine/group"/>
-      <!-- <unit bldFile="/sf/app/printing/imageprint/imageprintengine/imageprintserver/group"/> -->
-     </component>
-     <component name="imageprintui" origin-model="foundation">
-      <unit bldFile="/sf/app/printing/imageprint/imageprintui/group"/>
-     </component>
-     <component unofficial="yes" name="imageprint_build" origin-model="foundation">
-      <unit bldFile="/sf/app/printing/imageprint/group"/>
-     </component>
-    </collection>
-    <collection name="printing_info" long-name="Printing Info" level="app">
-     <component unofficial="yes" name="printing_build" long-name="Printing Build" origin-model="foundation">
-      <unit bldFile="/sf/app/printing/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/printing/sources.csv
--- a/3k/app/printing/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/printing/,/sf/app/printing,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/profile/package_definition.xml
--- a/3k/app/profile/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="profile" long-name="Profile" tech_domain="ui" level="apps" levels="app">
-    <collection name="profilesapplication" long-name="Profiles Application" level="app">
-     <component name="profiles" long-name="Profiles" origin-model="foundation">
-      <unit bldFile="/sf/app/profile/profilesapplication/profiles/group"/>
-      <!-- <unit bldFile="/sf/app/profile/profilesapplication/profiles/gsprofilesplugin/group"/> -->
-      <!-- <unit bldFile="/sf/app/profile/profilesapplication/profiles/profileaiwprovider/group"/> -->
-      <!-- <unit bldFile="/sf/app/profile/profilesapplication/profiles/profileapp/group"/> -->
-      <unit bldFile="/sf/app/profile/profilesapplication/profiles/profileapp/tsrc/public/basic/group"/>
-      <!-- <unit bldFile="/sf/app/profile/profilesapplication/profiles/profilesgstonesplugin/group"/> -->
-     </component>
-     <component unofficial="yes" name="profilesapplication_test" long-name="Profiles Application Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/profile/profilesapplication/tsrc/public/basic/group"/> -->
-     </component>
-    </collection>
-    <collection name="profile_info" long-name="Profile Info" level="app">
-     <component unofficial="yes" name="profile_plat" long-name="Profile Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/profile/profile_plat/group"/>
-     </component>
-     <component unofficial="yes" name="profile_help" long-name="Profile Help" origin-model="foundation">
-      <unit bldFile="/sf/app/profile/help/group"/>
-     </component>
-     <component unofficial="yes" name="profile_build" long-name="Profile Build" origin-model="foundation">
-      <unit bldFile="/sf/app/profile/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/profile/sources.csv
--- a/3k/app/profile/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/profile/,/sf/app/profile,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/radio/package_definition.xml
--- a/3k/app/radio/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="radio" long-name="Radio Apps" tech_domain="ma" level="apps" levels="engine ui">
-    <collection name="fmradio" long-name="FM Radio" level="ui">
-     <component name="activeidleengine" long-name="Active Idle Engine" origin-model="foundation">
-      <unit bldFile="/sf/app/radio/fmradio/activeidleengine/group"/>
-     </component>
-     <component name="fmradioengine" long-name="FM Radio Engine" origin-model="foundation">
-      <unit bldFile="/sf/app/radio/fmradio/fmradioengine/group"/>
-     </component>
-     <component name="fmradioactionhandler" long-name="FMRadio Action Handler" origin-model="foundation">
-      <unit bldFile="/sf/app/radio/fmradio/fmradioactionhandler/group"/>
-     </component>
-     <component name="fmradiomcpplugin" long-name="FM Radio MCP Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/radio/fmradio/fmradiomcpplugin/group"/>
-     </component>
-     
-     <component name="fmradio_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/radio/fmradio/help/group"/>
-     </component>
-     <component unofficial="yes" name="fmradio_build" long-name="FM Radio Build" origin-model="foundation">
-      <unit bldFile="/sf/app/radio/fmradio/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/radio/sources.csv
--- a/3k/app/radio/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/radio/,/sf/app/radio,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/screensaver/package_definition.xml
--- a/3k/app/screensaver/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="screensaver" long-name="Screen Saver Apps" tech_domain="ui" level="apps" levels="eng plugin">
-    <collection name="scrsaver" long-name="Screen Saver Plugins" level="eng">
-     <component name="scrsaverplugins" long-name="Screen Saver Plugins" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/screensaver/scrsaver/scrsaverplugins/group"/> -->
-     </component>
-     <component name="screensaveraiwplugin" long-name="Screen Saver AIW Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/screensaver/scrsaver/screensaveraiwplugin/group"/>
-     </component>
-    </collection>
-    
-    <collection name="screensaver_info" long-name="Screen Saver Apps Info" level="plugin">
-     <component unofficial="yes" name="screensaver_build" long-name="Screen Saver Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/screensaver/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/screensaver/sources.csv
--- a/3k/app/screensaver/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/screensaver/,/sf/app/screensaver,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/settingsuis/package_definition.xml
--- a/3k/app/settingsuis/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="settingsuis" long-name="Settings UIs" tech_domain="dm" level="services" levels="empty rsc ui">
-    <collection name="defaultapplicationsettings" long-name="Default Application Settings" level="rsc">
-     <component name="services_db" long-name="Services Db" origin-model="foundation">
-      <unit bldFile="/sf/app/settingsuis/defaultapplicationsettings/services_db/group"/>
-     </component>
-     <component name="defaultapplicationsettings_server" long-name="Server" origin-model="foundation">
-      <unit bldFile="/sf/app/settingsuis/defaultapplicationsettings/server/group"/>
-     </component>
-     <component name="service" long-name="Service" origin-model="foundation">
-      <unit bldFile="/sf/app/settingsuis/defaultapplicationsettings/service/group"/>
-     </component>
-     <component name="dasgsplugin" long-name="GS Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/settingsuis/defaultapplicationsettings/gsplugin/group"/>
-     </component>
-     <component unofficial="yes" name="defaultapplicationsettings_build" long-name="Default Application Settings Build" origin-model="foundation">
-      <unit bldFile="/sf/app/settingsuis/defaultapplicationsettings/group"/>
-     </component>
-    </collection>
-    <collection name="systemswuis" long-name="System SW UIs" level="ui">
-     <component name="touchscreencalib" long-name="Touchscreen Calib" origin-model="foundation">
-      <unit bldFile="/sf/app/settingsuis/systemswuis/touchscreencalib/group"/>
-     </component>
-    </collection>
-    <collection name="settingsuis_info" long-name="Settings UIs Info" level="ui">
-     <component unofficial="yes" name="devmngt_pub" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/settingsuis/devmngt_pub/group"/>
-     </component>
-     <component unofficial="yes" name="settingsuis_build" long-name="Settings UIs Build" origin-model="foundation">
-      <unit bldFile="/sf/app/settingsuis/group"/>
-     </component>
-     <component unofficial="yes" name="settingsuis_test" long-name="Settings UIs Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/settingsuis/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="devmngt_plat" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/settingsuis/devmngt_plat/default_app_client_api/tsrc/dasclientapitest/group"/> -->
-      <unit bldFile="/sf/app/settingsuis/devmngt_plat/group"/>
-      <!-- <unit bldFile="/sf/app/settingsuis/devmngt_plat/services_db_api/tsrc/servicesdbapitest/group"/> -->
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/settingsuis/sources.csv
--- a/3k/app/settingsuis/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/speechsrv/package_definition.xml
--- a/3k/app/speechsrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="speechsrv" long-name="Speech Recognition UIs" tech_domain="ui" level="services" levels="engine framework ui">
-    <collection name="voiceui" long-name="Voice UI" level="ui">
-     <component name="vcommand" long-name="VCommand" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/voiceui/vcommand/group"/>
-     </component>
-     <component name="voiceuivoicerecognition" long-name="Voice UI Voice Recognition" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/voiceui/voiceuivoicerecognition/group"/>
-     </component>
-     <component name="pbkinfoviewimpl" long-name="Phonebook Info View Implementation" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/voiceui/pbkinfoviewimpl/group"/>
-     </component>
-     <component name="aiwpbkinfoviewprovider" long-name="AIW Phonebook Info View Provider" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/voiceui/aiwpbkinfoviewprovider/group"/>
-     </component>
-     <component name="vccontrolpanelplugin" long-name="VC Control Panel Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/voiceui/vccontrolpanelplugin/group"/>
-     </component>
-     <component unofficial="yes" name="voiceui_build" long-name="Voice UI Build" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/voiceui/group"/>
-     </component>
-    </collection>
-    <collection name="srsf" long-name="Speech Recognition and Synthesis Framework" level="framework">
-     <component name="sispeechrecognitiondata" long-name="SI Speech Recognition Data" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/sispeechrecognitiondata/group"/>
-     </component>
-     <component name="ttscommon" long-name="TTS Common" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/ttscommon/group"/>
-     </component>
-     <component name="devtts" long-name="Text to Speech" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/devtts/group"/>
-     </component>
-     <component name="ttscustomcommands" long-name="TTS Custom Commands" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/ttscustomcommands/group"/>
-     </component>
-     <component name="ttscontrollerplugin" long-name="TTS Controller Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/ttscontrollerplugin/group"/>
-     </component>
-     <component name="ttsutility" long-name="TTS Utility" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/ttsutility/group"/>
-     </component>
-     <component name="speechsynthesis" long-name="Speech Synthesis" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/speechsynthesis/client/group"/>
-      <unit bldFile="/sf/app/speechsrv/srsf/speechsynthesis/server/group"/>
-      <unit bldFile="/sf/app/speechsrv/srsf/speechsynthesis/tsrc/speechsynthesistest/group"/>
-      <!-- <unit bldFile="/sf/app/speechsrv/srsf/speechsynthesis/tsrc/testapplication/group"/> -->
-      <!-- <unit bldFile="/sf/app/speechsrv/srsf/speechsynthesis/tsrc/texttospeech/group"/> -->
-     </component>
-     <component name="devasr" long-name="Audio Recording and Speech Recognition" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/devasr/group"/>
-     </component>
-     <component name="sicc" long-name="Speaker Independent Custom Commands" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/sicc/group"/>
-     </component>
-     <component name="sisrscontrollerplugin" long-name="SI SRS Controller Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/sisrscontrollerplugin/group"/>
-     </component>
-     <component name="siutility" long-name="Speaker Independent Utility" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/siutility/group"/>
-     </component>
-     <component name="nssvasapi" long-name="NSS VAS API" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/nssvasapi/group"/>
-      <!-- <unit bldFile="/sf/app/speechsrv/srsf/nssvasapi/nssvasdb/nssvasdbeventnotifier/group"/> -->
-     </component>
-     <component name="nssvascontacthdlr" long-name="NSS VAS Contact Handler" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/nssvascontacthdlr/group"/>
-     </component>
-     <component name="vcommandhandler" long-name="Voice Command Handler" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/vcommandhandler/group"/>
-     </component>
-     <component name="vuiphandler" long-name="Voice UI Plugin Handler" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/vuiphandler/group"/>
-     </component>
-     <component name="vcommandexecutor" long-name="Voice Command Executor" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/vcommandexecutor/group"/>
-     </component>
-     <component name="vcommandexecutorbearer" long-name="Voice Command Executor Bearer" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/vcommandexecutorbearer/group"/>
-     </component>
-     <component name="vcommandmanager" long-name="Voice Command Manager" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/vcommandmanager/group"/>
-     </component>
-     <component name="vcexecutorapp" long-name="Voice Command Executor Application" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/vcexecutorapp/group"/>
-     </component>
-     <component name="profileobserverplugin" long-name="Profile Observer Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/profileobserverplugin/group"/>
-     </component>
-     <component unofficial="yes" name="srsf_build" long-name="Speech Recognition and Synthesis Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/srsf/group"/>
-     </component>
-    </collection>
-    <collection name="speechsrv_info" long-name="Speech Recognition UIs Info" level="ui">
-     <component unofficial="yes" name="speechsrv_test" long-name="Speech Recognition UIs Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/speechsrv/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="speechsrv_build" long-name="Speech Recognition UIs Build" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/group"/>
-     </component>
-     <component unofficial="yes" name="speechsrv_plat" long-name="Speech Recognition UIs Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/speechsrv/speechsrv_plat/group"/>
-      <unit bldFile="/sf/app/speechsrv/speechsrv_plat/ui_voice_recognition_api/tsrc/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/speechsrv/sources.csv
--- a/3k/app/speechsrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/speechsrv/,/sf/app/speechsrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/techview/package_definition.xml
--- a/3k/app/techview/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="techview" long-name="Techview" tech_domain="ui" level="apps" span="2" levels="services ui utils apps1 apps2 apps3">
-    <collection name="buildverification" long-name="Build Verification" level="services">
-     <component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" introduced="9.1" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/app/techview/buildverification/autosmoketest/Group" mrp="/sf/app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
-     </component>
-     <component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/app/techview/buildverification/smoketest/Group" mrp="/sf/app/techview/buildverification/smoketest/Group/testtools_smoketest.mrp"/>
-     </component>
-    </collection>
-    <collection name="sysvalidation" long-name="System Validation" level="services">
-     <component name="integtestltsy" long-name="Integration Test Licensee TSY" filter="systemtest" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DEF140073" 
-        <unit bldFile="sysvalidation/integtestltsy/group" mrp="sysvalidation/integtestltsy/group/integtestltsy.mrp"/>
-        -->
-     </component>
-     <!--PLACEHOLDER="DEF140016" START REMOVE -->
-     <!--PLACEHOLDER="DEF140016" END REMOVE -->
-    </collection>
-    <collection name="installationapps" long-name="Installation Apps" level="apps2">
-     <component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appinstall/secureswitools/swisistools/group" mrp="/sf/mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-     </component>
-    </collection>
-    <collection name="networkingutils" long-name="Networking Utils" level="utils">
-     <component name="ipadministrationtool" long-name="IP Administration Tool" introduced="7.0" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/app/techview/networkingutils/ipadministrationtool/group/networking_ipadm.mrp"/>
-     </component>
-     <component name="nameresolverutility" long-name="Name Resolver Utility" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/app/techview/networkingutils/nameresolverutility/group/networking_nslookup.mrp"/>
-     </component>
-    </collection>
-    <collection name="testapps" long-name="Test Apps" level="utils">
-     <component name="rschandler" long-name="Resource Handler" deprecated="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/app/techview/testapps/rschandler/TVResourceHandler/group/Testtools_ResourceHandler_gt.mrp"/>
-     </component>
-    </collection>
-    <collection name="techview_info" long-name="Techview Info" level="apps3">
-     <component name="techview_metadata" long-name="Techview Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/app/techview/techview_info/techview_metadata/techview_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/techview/sources.csv
--- a/3k/app/techview/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/techview/,/sf/app/techview,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/utils/package_definition.xml
--- a/3k/app/utils/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="utils" long-name="Utility Apps" tech_domain="pr" level="apps" levels="app">
-    <collection name="extras" long-name="Extras" level="app">
-     <component name="about" long-name="About" origin-model="foundation">
-      <unit bldFile="/sf/app/utils/extras/about/group"/>
-     </component>
-     <component name="calcsoft" long-name="Calcsoft" origin-model="foundation">
-      <unit bldFile="/sf/app/utils/extras/calcsoft/group"/>
-     </component>
-     <component name="converter" long-name="Converter" origin-model="foundation">
-      <unit bldFile="/sf/app/utils/extras/converter/group"/>
-     </component>
-     <component unofficial="yes" name="extras_build" long-name="Extras Build" origin-model="foundation">
-      <unit bldFile="/sf/app/utils/extras/group"/>
-     </component>
-    </collection>
-    <collection name="utils_info" long-name="Utility Apps Info" level="app">
-     <component unofficial="yes" name="utils_build" long-name="Utility Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/utils/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/utils/sources.csv
--- a/3k/app/utils/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/utils/,/sf/app/utils,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/videocenter/package_definition.xml
--- a/3k/app/videocenter/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="videocenter" long-name="Video Center" tech_domain="ma" level="apps" levels="eng ui app">
-    <collection name="mpxmyvideoscollection" long-name="MPX My Videos Collection" level="app">
-     <component name="mpx_common_api" long-name="MPX Common_Api" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/mpxmyvideoscollection/mpx_common_api/group"/>
-     </component>
-     <component unofficial="yes" name="mpxmyvideoscollection_build" long-name="MPX My Videos Collection Build" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/mpxmyvideoscollection/group"/>
-     </component>
-     <component unofficial="yes" name="mpxmyvideoscollection_test" long-name="MPX My Videos Collection Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/videocenter/mpxmyvideoscollection/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="nsmyvideosview" long-name="NS My Videos View" level="app">
-     <component name="hgmyvideos" long-name="HG My Videos" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/nsmyvideosview/hgmyvideos/group"/>
-     </component>
-     <component name="hgmyvideosplugin" long-name="HG My Videos Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/nsmyvideosview/hgmyvideosplugin/group"/>
-     </component>
-     <component name="nsmyvideos" long-name="NS Myvideos" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/videocenter/nsmyvideosview/nsmyvideos/group"/> -->
-     </component>
-     <component name="nsmyvideosplugin" long-name="NS Myvideos Plugin" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/videocenter/nsmyvideosview/nsmyvideosplugin/group"/> -->
-     </component>
-    </collection>
-    <collection name="vccommon" long-name="Video Center Common" level="eng">
-     <component name="vccommon_utils" long-name="Utilities" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vccommon/utils/group"/>
-     </component>
-     <component name="viewmessageutility" long-name="View Message Utility" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vccommon/viewmessageutility/group"/>
-     </component>
-     <component name="notifierplugins" long-name="Notifier Plugins" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vccommon/notifierplugins/notifierplugin/group"/>
-      <unit bldFile="/sf/app/videocenter/vccommon/notifierplugins/vcxnotifier/group"/>
-     </component>
-     <component name="vccommon_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vccommon/help/group"/>
-     </component>
-     <component unofficial="yes" name="sis" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/videocenter/vccommon/sis"/> -->
-     </component>
-     <component unofficial="yes" name="vccommon_build" long-name="Video Center Common Build" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vccommon/group"/>
-     </component>
-    </collection>
-    <collection name="vcengines" long-name="Video Center Engines" level="eng">
-     <component name="vcengines_server" long-name="Server" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcengines/server/clientapi/group"/>
-      <unit bldFile="/sf/app/videocenter/vcengines/server/group"/>
-      <unit bldFile="/sf/app/videocenter/vcengines/server/iptvepgmanager/group"/>
-     </component>
-     <component name="serviceprovisioning" long-name="Service Provisioning" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcengines/serviceprovisioning/omaprovisioning/group"/>
-      <unit bldFile="/sf/app/videocenter/vcengines/serviceprovisioning/provisioningappui/group"/>
-      <unit bldFile="/sf/app/videocenter/vcengines/serviceprovisioning/provisioningprocessor/group"/>
-      <unit bldFile="/sf/app/videocenter/vcengines/serviceprovisioning/provisioningrecognizer/group"/>
-     </component>
-     <component name="mrssplugin" long-name="Mrss Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcengines/mrssplugin/group"/>
-     </component>
-     <component name="livetvutils" long-name="Live TV Utils" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcengines/livetvutils/group"/>
-     </component>
-     <component name="networkengine" long-name="Network Engine" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcengines/networkengine/group"/>
-     </component>
-     <component name="livetvepgengine" long-name="Live TV EPG Engine" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcengines/livetvepgengine/group"/>
-     </component>
-     <component name="tunerengine" long-name="Tuner Engine" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcengines/tunerengine/group"/>
-     </component>
-     <component name="livetvschedulerplugin" long-name="Live TV Scheduler Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcengines/livetvschedulerplugin/group"/>
-     </component>
-     <component name="xmltvplugin" long-name="XML TV Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcengines/xmltvplugin/group"/>
-     </component>
-     <component name="scheduleddlplugin" long-name="Scheduled Download Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcengines/scheduleddlplugin/group"/>
-     </component>
-     <component name="voddownloadplugin" long-name="VOD Download Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcengines/voddownloadplugin/group"/>
-     </component>
-     <component unofficial="yes" name="vcengines_build" long-name="Video Center Engines Build" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcengines/group"/>
-     </component>
-    </collection>
-    <collection name="vcnsuis" long-name="Video Center NS UIs" level="ui">
-     <component name="vcnsapp" long-name="VCNS App" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcnsuis/vcnsapp/vcnsappui/group"/>
-      <unit bldFile="/sf/app/videocenter/vcnsuis/vcnsapp/vcnsbsutility/group"/>
-      <unit bldFile="/sf/app/videocenter/vcnsuis/vcnsapp/vcnsuiengine/group"/>
-     </component>
-     <component name="vcnssettings" long-name="VCNS Settings" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcnsuis/vcnssettings/vcnsgsplugin/group"/>
-      <unit bldFile="/sf/app/videocenter/vcnsuis/vcnssettings/vcnsscheduleplugin/group"/>
-      <unit bldFile="/sf/app/videocenter/vcnsuis/vcnssettings/vcnsscheduleview/group"/>
-      <unit bldFile="/sf/app/videocenter/vcnsuis/vcnssettings/vcnssettingsengine/group"/>
-      <unit bldFile="/sf/app/videocenter/vcnsuis/vcnssettings/vcnssettingsplugin/group"/>
-      <unit bldFile="/sf/app/videocenter/vcnsuis/vcnssettings/vcnssettingsviews/group"/>
-     </component>
-     <component name="vcnsahplugin" long-name="VCNS Action Handler Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcnsuis/vcnsahplugin/group"/>
-     </component>
-     <component name="vcnsvodui" long-name="VCNS VOD UI" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcnsuis/vcnsvodui/plugins/hgvodplugin/group"/>
-      <!-- <unit bldFile="/sf/app/videocenter/vcnsuis/vcnsvodui/plugins/vcnsvodplugin/group"/> -->
-      <unit bldFile="/sf/app/videocenter/vcnsuis/vcnsvodui/views/hgvodui/group"/>
-      <!-- <unit bldFile="/sf/app/videocenter/vcnsuis/vcnsvodui/views/vcnsvodui/group"/> -->
-     </component>
-     <component name="vcnslivetv" long-name="VCNS Live TV" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcnsuis/vcnslivetv/remindernotifier/group"/>
-     </component>
-     <component name="vcnschplugin" long-name="VCNS Content Harvester Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcnsuis/vcnschplugin/group"/>
-     </component>
-    </collection>
-    <collection name="vcplayer" long-name="Video Center Player" level="app">
-     <component name="vcplayer_core" long-name="Core" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcplayer/core/controllerbase/group"/>
-      <unit bldFile="/sf/app/videocenter/vcplayer/core/playercore/group"/>
-     </component>
-     <component name="vcplayer_utils" long-name="Utilities" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcplayer/utils/group"/>
-     </component>
-     <component name="vcplayer_plugins" long-name="Plugins" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcplayer/plugins/dlprogresscontroller/group"/>
-      <unit bldFile="/sf/app/videocenter/vcplayer/plugins/rtpfileplaycontroller/group"/>
-      <unit bldFile="/sf/app/videocenter/vcplayer/plugins/unicaststreamplayercontroller/group"/>
-     </component>
-     <component name="vcnsplayerview" long-name="VCNS Player View" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcplayer/vcnsplayerview/group"/>
-     </component>
-     <component name="defaultview" long-name="Default View" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/videocenter/vcplayer/defaultview/group"/> -->
-     </component>
-     <component unofficial="yes" name="vcplayer_build" long-name="Video Center Player Build" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/vcplayer/group"/>
-     </component>
-    </collection>
-    <collection name="videocenter_info" long-name="Video Center Info" level="app">
-     <component unofficial="yes" name="videocenter_build" long-name="Video Center Build" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/group"/>
-     </component>
-     <component unofficial="yes" name="videocenter_plat" long-name="Video Center Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/videocenter/videocenter_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/videocenter/sources.csv
--- a/3k/app/videocenter/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/videocenter/,/sf/app/videocenter,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/videoeditor/package_definition.xml
--- a/3k/app/videoeditor/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="videoeditor" long-name="Video Editor Apps" tech_domain="ma" level="apps" levels="engine ui">
-    <collection name="videditor" long-name="Video Editor" level="ui">
-     <component name="videoeditorcommon" long-name="Video Editor Common" origin-model="foundation">
-      <unit bldFile="/sf/app/videoeditor/videditor/videoeditorcommon/group"/>
-     </component>
-     <component name="videoeditoruicomponents" long-name="Video Editor UI Components" origin-model="foundation">
-      <unit bldFile="/sf/app/videoeditor/videditor/videoeditoruicomponents/group"/>
-     </component>
-     <component name="simplevideoeditor" long-name="Simple Video Editor" origin-model="foundation">
-      <unit bldFile="/sf/app/videoeditor/videditor/simplevideoeditor/group"/>
-     </component>
-     <component name="simplecutvideo" long-name="Simple Cut Video" origin-model="foundation">
-      <unit bldFile="/sf/app/videoeditor/videditor/simplecutvideo/group"/>
-     </component>
-     <component name="videoprovider" long-name="Video Provider" origin-model="foundation">
-      <unit bldFile="/sf/app/videoeditor/videditor/videoprovider/group"/>
-     </component>
-     <component name="manualvideoeditor" long-name="Manual Video Editor" origin-model="foundation">
-      <unit bldFile="/sf/app/videoeditor/videditor/manualvideoeditor/group"/>
-     </component>
-     <component name="trimformms" long-name="Trim For MMS" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/videoeditor/videditor/trimformms/group"/> -->
-     </component>
-     <component unofficial="yes" name="videditor_build" long-name="Video Editor Build" origin-model="foundation">
-      <unit bldFile="/sf/app/videoeditor/videditor/group"/>
-     </component>
-    </collection>
-    <collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-     <component name="audioeditorengine" long-name="Audio Editor Engine" origin-model="foundation">
-      <unit bldFile="/sf/app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-     </component>
-     <component name="avcedit" long-name="Avcedit" origin-model="foundation">
-      <unit bldFile="/sf/app/videoeditor/videoeditorengine/avcedit/group"/>
-     </component>
-     <component name="h263decoder" long-name="H263 Decoder" origin-model="foundation">
-      <unit bldFile="/sf/app/videoeditor/videoeditorengine/h263decoder/group"/>
-     </component>
-     <component name="mp3aacmaniplib" long-name="Mp3aac Manip Lib" origin-model="foundation">
-      <unit bldFile="/sf/app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-     </component>
-     <component name="vedtranscoder" long-name="Ved Transcoder" origin-model="foundation">
-      <unit bldFile="/sf/app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-     </component>
-     <component name="vedengine" long-name="Ved Engine" origin-model="foundation">
-      <unit bldFile="/sf/app/videoeditor/videoeditorengine/vedengine/group"/>
-     </component>
-     <component unofficial="yes" name="videoeditorengine_build" long-name="Video Editor Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/app/videoeditor/videoeditorengine/group"/>
-     </component>
-    </collection>
-    <collection name="videoeditor_info" long-name="Video Editor Apps Info" level="ui">
-     <component unofficial="yes" name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/videoeditor/videoeditor_plat/group"/>
-     </component>
-     <component unofficial="yes" name="videoeditor_build" long-name="Video Editor Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/videoeditor/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/videoeditor/sources.csv
--- a/3k/app/videoeditor/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/videoeditor/,/sf/app/videoeditor,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/videoplayer/package_definition.xml
--- a/3k/app/videoplayer/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="videoplayer" long-name="Video Player Apps" tech_domain="ma" level="apps" levels="support apps">
-    <collection name="lwplayer" long-name="LW Player" level="apps">
-     <component name="lwplayer_build" long-name="LW Player" origin-model="foundation">
-      <unit bldFile="/sf/app/videoplayer/lwplayer/group"/>
-     </component>
-    </collection>
-    <collection name="mediaplayer" long-name="Media Player" level="apps">
-     <component name="mediaplayer_build" origin-model="foundation">
-      <unit bldFile="/sf/app/videoplayer/mediaplayer/group"/>
-     </component>
-    </collection>
-    <collection name="mediasettings" long-name="Media Settings" level="support">
-     <component name="mediasettings_build" origin-model="foundation">
-      <unit bldFile="/sf/app/videoplayer/mediasettings/group"/>
-     </component>
-    </collection>
-    <collection name="videoplayer_info" long-name="Video Player Apps Info" level="apps">
-     <component unofficial="yes" name="videoplayer_help" long-name="Video Player Apps Help" origin-model="foundation">
-      <unit bldFile="/sf/app/videoplayer/help/group"/>
-     </component>
-     <component unofficial="yes" name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/videoplayer/videoplayer_plat/group"/>
-      <unit bldFile="/sf/app/videoplayer/videoplayer_plat/media_player_engine_api/tsrc/group"/>
-      <unit bldFile="/sf/app/videoplayer/videoplayer_plat/media_player_file_details_dialog_api/tsrc/group"/>
-     </component>
-     <component unofficial="yes" name="videoplayer_test" long-name="Video Player Apps Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/videoplayer/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="videoplayer_build" long-name="Video Player Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/videoplayer/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/videoplayer/sources.csv
--- a/3k/app/videoplayer/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/videoplayer/,/sf/app/videoplayer,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/videotelephony/package_definition.xml
--- a/3k/app/videotelephony/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="videotelephony" long-name="Video Telephony Apps" tech_domain="vc" level="apps" levels="engine plugin prot ui">
-    <collection name="packetvideoengine" long-name="Packetvideo Engine" level="engine">
-     <component name="packetvideoenginebinaries" long-name="Packet Video Engine Binaries" origin-model="foundation"/>
-    </collection>
-    <collection name="vtengines" long-name="Video Telephony Engines" level="engine">
-     <component name="videoteleng" long-name="Videotel Engine" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/videotelephony/vtengines/videoteleng/callctrl/group"/> -->
-      <unit bldFile="/sf/app/videotelephony/vtengines/videoteleng/group"/>
-      <!-- <unit bldFile="/sf/app/videotelephony/vtengines/videoteleng/logger/group"/> -->
-     </component>
-     <component name="vtmediatorplugin" long-name="VT Mediator Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/videotelephony/vtengines/vtmediatorplugin/group"/>
-     </component>
-     <component unofficial="yes" name="vtengines_build" long-name="Video Telephony Engines Build" origin-model="foundation">
-      <unit bldFile="/sf/app/videotelephony/vtengines/group"/>
-     </component>
-    </collection>
-    <collection name="vtuis" long-name="Video Telephony UIs" level="ui">
-     <component name="videotelui" long-name="Video Telephony UI" origin-model="foundation">
-      <unit bldFile="/sf/app/videotelephony/vtuis/videotelui/group"/>
-     </component>
-     <component unofficial="yes" name="vtuis_build" long-name="Video Telephony UIs Build" origin-model="foundation">
-      <unit bldFile="/sf/app/videotelephony/vtuis/group"/>
-     </component>
-    </collection>
-    <collection name="vtprotocolplugins" long-name="Video Telephony Protocol Plugins" level="plugin">
-     <component name="displaysink" long-name="Display Sink" origin-model="foundation">
-      <unit bldFile="/sf/app/videotelephony/vtprotocolplugins/displaysink/group"/>
-     </component>
-     <component name="videosource" long-name="Video Source" origin-model="foundation">
-      <unit bldFile="/sf/app/videotelephony/vtprotocolplugins/videosource/group"/>
-     </component>
-     <component unofficial="yes" name="vtprotocolplugins_build" long-name="Video Telephony Protocol Plugins Build" origin-model="foundation">
-      <unit bldFile="/sf/app/videotelephony/vtprotocolplugins/group"/>
-     </component>
-    </collection>
-    <collection name="vtprotocols" long-name="Video Telephony Protocols" level="prot">
-     <!-- Empty duplicate component videotelproto.dll=binary removed -->
-    </collection>
-    <collection name="vtprotocolsstub" long-name="Video Telephony Protocols Stub" level="prot">
-     <component name="videotelproto" origin-model="foundation">
-      <unit bldFile="/sf/app/videotelephony/vtprotocolsstub/group"/>
-     </component>
-    </collection>
-    <collection name="videotelephony_info" long-name="Video Telephony Apps Info" level="ui">
-     <component unofficial="yes" name="videotelephony_plat" long-name="Video Telephony Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/videotelephony/videotelephony_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/videotelephony/sources.csv
--- a/3k/app/videotelephony/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/videotelephony/,/sf/app/videotelephony,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/voicerec/package_definition.xml
--- a/3k/app/voicerec/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="voicerec" long-name="Voice Recorder Apps" tech_domain="ma" level="apps" levels="empty 1">
-    <collection name="voicerecorder" long-name="Voice Recorder" level="1">
-     <component name="voicerecordergsplugin" long-name="GS Plugin" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/voicerec/voicerecorder/gsplugin/group"/> -->
-     </component>
-     <component name="voicerecorder_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/voicerec/voicerecorder/help/group"/>
-     </component>
-     <component name="voicerecorder_build" origin-model="foundation">
-      <unit bldFile="/sf/app/voicerec/voicerecorder/group"/>
-     </component>
-    </collection>
-    <collection name="voicerec_info" long-name="Voice Recorder Apps Info" level="1">
-     <component unofficial="yes" name="voicerec_build" long-name="Voice Recorder Apps Build" origin-model="foundation">
-      <unit bldFile="/sf/app/voicerec/group"/>
-     </component>
-     <component unofficial="yes" name="voicerec_test" long-name="Voice Recorder Apps Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/app/voicerec/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="voicerec_plat" long-name="Voice Recorder Apps Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/app/voicerec/voicerec_plat/group"/>
-      <unit bldFile="/sf/app/voicerec/voicerec_plat/new_file_service_api/tsrc/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/voicerec/sources.csv
--- a/3k/app/voicerec/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/app/voicerec/,/sf/app/voicerec,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/webuis/package_definition.xml
--- a/3k/app/webuis/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="app" long-name="Applications" levels="services apps">
-<block name="webuis" long-name="Web UIs" tech_domain="rt" level="services" levels="plugin app">
-    <collection name="browserui" long-name="Browser UI" level="app">
-     <component name="browser" long-name="Browser" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/browserui/browser/group"/>
-      <!-- <unit bldFile="/sf/app/webuis/browserui/browser/launcher2/group"/> -->
-     </component>
-     <component name="operatormenu" long-name="Operator Menu" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/browserui/operatormenu/group"/>
-     </component>
-     <component name="videoservices" long-name="Video Services" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/browserui/videoservices/group"/>
-     </component>
-     <component unofficial="yes" name="browserui_build" long-name="Browser UI Build" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/browserui/group"/>
-     </component>
-    </collection>
-    <collection name="browserplugins" long-name="Browser Plugins" level="plugin">
-     <component name="browsersysteminfoplugin" long-name="Browser System Info Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/browserplugins/browsersysteminfoplugin/group"/>
-     </component>
-     <component name="browsergpsplugin" long-name="Browser GPS Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/browserplugins/browsergpsplugin/group"/>
-     </component>
-     <component name="browseraudiovideoplugin" long-name="Browser Audio Video Plugin" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/browserplugins/browseraudiovideoplugin/group"/>
-     </component>
-     <component unofficial="yes" name="browserplugins_build" long-name="Browser Plugins Build" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/browserplugins/group"/>
-     </component>
-    </collection>
-    <collection name="pushmtm" long-name="Push MTM" level="plugin">
-     <component name="pushmtm_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/pushmtm/help/group"/>
-     </component>
-     <component name="plugins" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/pushmtm/plugins/group"/>
-     </component>
-     <component unofficial="yes" name="pushmtm_build" long-name="Push MTM Build" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/pushmtm/group"/>
-     </component>
-    </collection>
-    <collection name="webuis_info" long-name="Web UIs Info" level="app">
-     <component unofficial="yes" name="webuis_build" long-name="Web UIs Build" origin-model="foundation">
-      <unit bldFile="/sf/app/webuis/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/app/webuis/sources.csv
--- a/3k/app/webuis/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/webuis/,/sf/app/webuis,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/accesssec/package_definition.xml
--- a/3k/mw/accesssec/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="accesssec" long-name="Access Security" tech_domain="dc" level="generic" levels="plugin framework server generic specific">
-    <collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-     <component name="wapisecuritysettingsui" long-name="WAPI Security Settings UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-     </component>
-     <component name="wepsecuritysettingsui" long-name="WEP Security Eettings UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-     </component>
-     <component name="wifiprotectedsetup" long-name="WIFI Protected Setup" origin-model="foundation">
-      <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-     </component>
-     <component name="wlaneapsettingsui" long-name="WLAN EAP Settings UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-     </component>
-     <component name="wpasecuritysettingsui" long-name="WPA Security Settings UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
-     </component>
-     <component unofficial="yes" name="wlansecuritysettings_build" long-name="WLAN Security Settings Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/accesssec/wlansecuritysettings/group"/>
-     </component>
-    </collection>
-    <collection name="eapol" long-name="EAPOL" level="framework">
-     <component name="eapol_framework" long-name="EAPOL Framework" origin-model="foundation">
-      <unit bldFile="/sf/mw/accesssec/eapol/eapol_framework/eapol_symbian/group"/>
-     </component>
-     <component unofficial="yes" name="eapol_build" long-name="EAPOL Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/accesssec/eapol/group"/>
-     </component>
-    </collection>
-    <collection name="accesssec_info" long-name="Access Security Info" level="specific">
-     <component unofficial="yes" name="accesssec_plat" long-name="Access Security Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/accesssec/accesssec_plat/group"/>
-     </component>
-     <component unofficial="yes" name="accesssec_build" long-name="Access Security Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/accesssec/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/accesssec/sources.csv
--- a/3k/mw/accesssec/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/appinstall/package_definition.xml
--- a/3k/mw/appinstall/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="appinstall" long-name="Application Installation" tech_domain="rt" level="generic" levels="tool framework generic api">
-    <collection name="appinstaller" long-name="App Installer" level="generic">
-     <component name="appmngr2" long-name="App Mngr2" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/appinstaller/appmngr2/group"/>
-     </component>
-     <component name="appinstui" long-name="App Installer UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/appinstaller/appinstui/group"/>
-     </component>
-     <component unofficial="yes" name="appinstaller_build" long-name="App Installer Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/appinstaller/group"/>
-     </component>
-    </collection>
-    <collection name="ncdengine" long-name="NCD Engine" level="framework">
-     <component name="ncdengine_engine" long-name="Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/ncdengine/engine/group"/>
-     </component>
-     <component name="debuglogger" long-name="Debug Logger" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/appinstall/ncdengine/debuglogger/group"/> -->
-     </component>
-     <component unofficial="yes" name="ncdengine_build" long-name="NCD Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/ncdengine/group"/>
-     </component>
-    </collection>
-    <collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-     <component name="iaupdateapi_stub_build" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/iaupdateapi_stub/group"/>
-     </component>
-    </collection>
-    <collection name="iaupdate" long-name="IA Update" level="api">
-     <component name="iad" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/iaupdate/iad/group"/>
-     </component>
-     <component name="iaupdate_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/iaupdate/help/group"/>
-     </component>
-     <component unofficial="yes" name="iaupdate_build" long-name="IA Update Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/iaupdate/group"/>
-     </component>
-    </collection>
-    <collection name="appinstall_info" long-name="Application Installation Info" level="api">
-     <component unofficial="yes" name="appinstall_pub" long-name="Application Installation Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/appinstall_pub/group"/>
-      <!-- <unit bldFile="/sf/mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/selfsignedstartupapp/group"/> -->
-      <!-- <unit bldFile="/sf/mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/startupapp/group"/> -->
-     </component>
-     <component unofficial="yes" name="appinstall_test" long-name="Application Installation Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/appinstall/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="appinstall_plat" long-name="Application Installation Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/data_src/sistest"/> -->
-      <unit bldFile="/sf/mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/group"/>
-      <unit bldFile="/sf/mw/appinstall/appinstall_plat/group"/>
-     </component>
-    <component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-     </component>
-    </collection>
-	<!-- Collection manually added due to faulty merge XSLT -->
-	<collection name="installationservices" long-name="Installation Services" level="generic">
-	 <component name="swi" long-name="Secure Software Install" purpose="optional">
-	  <unit bldFile="/sf/mw/appinstall/installationservices/swi/group" mrp="/sf/mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-	 </component>
-	 <component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-	  <unit bldFile="/sf/mw/appinstall/installationservices/swidevicetools/group" mrp="/sf/mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-	 </component>
-	 <component name="switestfw" long-name="Software Install Test Framework" introduced="7.0" deprecated="tb92" purpose="development">
-	  <unit bldFile="/sf/mw/appinstall/installationservices/switestfw/group" mrp="/sf/mw/appinstall/installationservices/switestfw/group/install_testframework.mrp"/>
-	 </component>
-	 <component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-	  <unit bldFile="/sf/mw/appinstall/installationservices/swiconfig/group" mrp="/sf/mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-	 </component>
-	</collection>
-    <collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="swisistools">
-       -  <unit bldFile="/sf/mw/appinstall/secureswitools/swisistools/test/tinterpretsisinteg/tintsistef"/>  -
-      </component>-->
-    <component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appinstall/secureswitools/makekeys/group" mrp="/sf/mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-     </component>
-     <component name="n:swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/> -->
-     </component>
-     <component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/appinstall/sources.csv
--- a/3k/mw/appinstall/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/appsupport/package_definition.xml
--- a/3k/mw/appsupport/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,277 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="appsupport" long-name="Generic Application Support" tech_domain="rt" level="generic" levels="system plugin framework server generic specific">
-    <collection name="sysresmonitoring" long-name="System Resource Monitoring" level="system">
-     <component name="oodmonitor" long-name="OOD Monitor" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/sysresmonitoring/oodmonitor/group"/>
-     </component>
-     <component name="oommonitor" long-name="OOM Monitor" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/sysresmonitoring/oommonitor/group"/>
-      <!-- <unit bldFile="/sf/mw/appsupport/sysresmonitoring/oommonitor/tsrc/public/basic/group"/> -->
-     </component>
-     <component unofficial="yes" name="sysresmonitoring_build" long-name="System Resource Monitoring Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/sysresmonitoring/group"/>
-     </component>
-    </collection>
-    <collection name="gssettingsuis" long-name="GS Settings UIs" level="specific">
-     <component name="gs" long-name="GS" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/gssettingsuis/gs/group"/>
-      <!-- <unit bldFile="/sf/mw/appsupport/gssettingsuis/gs/gsdiagnosticsplugin"/> -->
-      <!-- <unit bldFile="/sf/mw/appsupport/gssettingsuis/gs/gsprslnplugin"/> -->
-      <!-- <unit bldFile="/sf/mw/appsupport/gssettingsuis/gs/tsrc/public/basic/group"/> -->
-     </component>
-    </collection>
-    <collection name="profilesservices" long-name="Profiles Services" level="server">
-     <component name="filelist" long-name="File List" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/profilesservices/filelist/group"/>
-      <unit bldFile="/sf/mw/appsupport/profilesservices/filelist/tsrc/public/basic/group"/>
-     </component>
-     <component name="mediafilelist" long-name="Media File List" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/profilesservices/mediafilelist/group"/>
-     </component>
-     <component name="profileengine" long-name="Profile Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/profilesservices/profileengine/group"/>
-      <unit bldFile="/sf/mw/appsupport/profilesservices/profileengine/tsrc/public/basic/group"/>
-     </component>
-     <component name="ringingtone3dplugin" long-name="Ringing Tone 3D Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/profilesservices/ringingtone3dplugin/group"/>
-     </component>
-     <component unofficial="yes" name="profilesservices_test" long-name="Profiles Services Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/appsupport/profilesservices/tsrc/public/basic/group"/> -->
-     </component>
-    </collection>
-    <collection name="flashliteapi_3_1" long-name="Flashlite API 3.1" level="specific">
-     <component name="flashliteapi_3_1_build" origin-model="foundation"/>
-    </collection>
-    <collection name="contextframework" long-name="Context Framework" level="framework">
-     <component name="cfw" long-name="Context Framework" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/contextframework/cfw/group"/>
-      <!-- <unit bldFile="/sf/mw/appsupport/contextframework/cfw/tsrc/cfwtest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/appsupport/contextframework/cfw/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="cfwplugins" long-name="Context Framework Plugins" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/contextframework/cfwplugins/group"/>
-     </component>
-     <component unofficial="yes" name="contextframework_build" long-name="Context Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/contextframework/group"/>
-     </component>
-    </collection>
-    <collection name="mediakeys" long-name="Media Keys" level="plugin">
-     <component name="keypublisherplugin" long-name="Key Publisher Plugin" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/appsupport/mediakeys/keypublisherplugin/group"/> -->
-     </component>
-     <component name="mmkeybearer" long-name="MM Key Bearer" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/appsupport/mediakeys/mmkeybearer/group"/> -->
-     </component>
-     <component unofficial="yes" name="mediakeys_build" long-name="Media Keys Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/mediakeys/group"/>
-     </component>
-    </collection>
-    <collection name="coreapplicationuis" long-name="Core Application UIs" level="server">
-     <component name="dbrecovery" long-name="Db Recovery" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/coreapplicationuis/dbrecovery/group"/>
-     </component>
-     <component name="nspswsplugin" long-name="Nsps WS Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/coreapplicationuis/nspswsplugin/group"/>
-     </component>
-     <component name="rfs" long-name="RFS" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfs/group"/>
-      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfs/plugins/gsrfsplugin/group"/> -->
-     </component>
-     <component name="rfsplugins" long-name="Rfs Plugins" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfsplugins/group"/>
-      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/group"/> -->
-     </component>
-     <component name="sysap" long-name="Sys Ap" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sysap/group"/>
-     </component>
-     <component name="variatedsettings" long-name="Variated Settings" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/coreapplicationuis/variatedsettings/group"/>
-     </component>
-     <component name="accfwuinotifier" long-name="ACC Framework UI Notifier" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/coreapplicationuis/accfwuinotifier/group"/>
-     </component>
-     <component name="kefmapper" long-name="Key Event Framework Mapper" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/coreapplicationuis/kefmapper/group"/>
-     </component>
-     <component name="advancedtspcontroller" long-name="Advanced TSP Controller" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/coreapplicationuis/advancedtspcontroller/group"/>
-      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/advancedtspcontroller/tsrc/stub/group"/> -->
-     </component>
-     <component name="powersaveutilities" long-name="Power Save Utilities" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/coreapplicationuis/powersaveutilities/group"/>
-      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/powersaveutilities/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="gsserverenginestub" long-name="GS Server Engine Stub" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/coreapplicationuis/gsserverenginestub/group"/>
-     </component>
-     <component name="gsserverengine" long-name="GS Server Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/coreapplicationuis/gsserverengine/group"/>
-     </component>
-     <component name="gsserver" long-name="GS Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/coreapplicationuis/gsserver/group"/>
-     </component>
-     <component name="sensordatacompensatorplugin" long-name="Sensor Data Compensator Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/group"/>
-      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group"/> -->
-      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group"/> -->
-     </component>
-     <component unofficial="yes" name="coreapplicationuis_test" long-name="Core Application UIs Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/appsupport/coreapplicationuis/tsrc/public/basic/group"/> -->
-     </component>
-     <component unofficial="yes" name="coreapplicationuis_build" long-name="Core Application UIs Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/coreapplicationuis/group"/>
-     </component>
-    </collection>
-    <collection name="startupservices" long-name="Startup Services" level="system">
-     <component name="splashscreen" long-name="Splash Screen" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/startupservices/splashscreen/group"/>
-     </component>
-     <component name="startup" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/startupservices/startup/group"/>
-      <!-- <unit bldFile="/sf/mw/appsupport/startupservices/startup/mediatorplugin/group"/> -->
-      <!-- <unit bldFile="/sf/mw/appsupport/startupservices/startup/startupsyncplugin/group"/> -->
-      <!-- <unit bldFile="/sf/mw/appsupport/startupservices/startup/systemerrorplugin/group"/> -->
-     </component>
-     <component name="startupanimation" long-name="Startup Animation" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/startupservices/startupanimation/group"/>
-     </component>
-     <component unofficial="yes" name="startupservices_build" long-name="Startup Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/startupservices/group"/>
-     </component>
-    </collection>
-    <collection name="systemsettings" long-name="System Settings" level="system">
-     <component name="gssensorplugin" long-name="GS Sensor Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/systemsettings/gssensorplugin/group"/>
-     </component>
-     <component name="gsaccessoryplugin" long-name="GS Accessory Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/systemsettings/gsaccessoryplugin/group"/>
-     </component>
-     <component unofficial="yes" name="systemsettings_build" long-name="System Settings Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/systemsettings/group"/>
-     </component>
-    </collection>
-    <collection name="filehandling" long-name="File Handling" level="server">
-     <component name="fileconverterfw" long-name="File Converter Framework" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/filehandling/fileconverterfw/group" mrp="/sf/mw/appsupport/filehandling/fileconverterfw/group/app-framework_conarc.mrp"/>
-     </component>
-     <component name="fileconverterplugins" long-name="Other File Converter Plugins" introduced="ER5" deprecated="9.3" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/filehandling/fileconverterplugins/group" mrp="/sf/mw/appsupport/filehandling/fileconverterplugins/group/app-engines_convert.mrp"/>
-     </component>
-     <component name="htmltorichtextconverter" long-name="HTML to RichText Converter" introduced="7.0" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/filehandling/htmltorichtextconverter/group" mrp="/sf/mw/appsupport/filehandling/htmltorichtextconverter/group/app-services_chtmltocrtconv.mrp"/>
-     </component>
-     <component name="richtexttohtmlconverter" long-name="RichText to HTML Converter" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="/sf/mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
-     </component>
-    </collection>
-    <collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
-     <component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="/sf/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
-     </component>
-    </collection>
-    <collection name="commonappservices" long-name="Common Application Services" level="framework">
-     <component name="alarmserver" long-name="Alarm Server" introduced="7.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/commonappservices/alarmserver/Group" mrp="/sf/mw/appsupport/commonappservices/alarmserver/Group/app-services_alarmserver.mrp"/>
-     </component>
-     <component name="alarmservertest" long-name="Alarm Server Test" introduced="8.1" deprecated="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv" mrp="/sf/mw/appsupport/commonappservices/alarmservertest/TestAlarmSrv/app-services_testalarmsrv.mrp"/>
-     </component>
-     <component name="coreappstest" long-name="Core Apps Test" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/appsupport/commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp"/>
-     </component>
-     <component name="appservicesdocs" long-name="Application Services Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/appsupport/commonappservices/appservicesdocs/app-services_documentation.mrp"/>
-     </component>
-     <component name="backuprestorenotification" long-name="Backup Restore Notification" introduced="8.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/commonappservices/backuprestorenotification/group" mrp="/sf/mw/appsupport/commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
-     </component>
-    </collection>
-    <collection name="tzservices" long-name="Time Zone Services" level="plugin">
-     <component name="tzserver" long-name="Time Zone Server" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/tzservices/tzserver/group" mrp="/sf/mw/appsupport/tzservices/tzserver/group/app-services_tz.mrp"/>
-     </component>
-     <component name="tzloc" long-name="Time Zone Localization" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/tzservices/tzloc/group" mrp="/sf/mw/appsupport/tzservices/tzloc/group/app-services_timezonelocalization.mrp"/>
-     </component>
-     <component name="tzlocrscfactory" long-name="Time Zone Localization Resource Factory" introduced="9.1" purpose="optional" class="config" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/tzservices/tzlocrscfactory/group" mrp="/sf/mw/appsupport/tzservices/tzlocrscfactory/group/app-services_tzlocalizationrscfactory.mrp"/>
-     </component>
-     <component name="tzdatabase" long-name="Time Zone Database" introduced="9.1" purpose="optional" class="config" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/tzservices/tzdatabase/group" mrp="/sf/mw/appsupport/tzservices/tzdatabase/group/app-services_tzdb.mrp"/>
-     </component>
-     <component name="worldserver" long-name="World Server" introduced="7.0" deprecated="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/tzservices/worldserver/group" mrp="/sf/mw/appsupport/tzservices/worldserver/group/app-services_worldserver.mrp"/>
-     </component>
-     <component name="worldservertest" long-name="World Server Test" introduced="8.1" deprecated="9.1" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/tzservices/worldservertest/TestWorldSrv" mrp="/sf/mw/appsupport/tzservices/worldservertest/TestWorldSrv/app-services_testworldsrv.mrp"/>
-     </component>
-    </collection>
-    <collection name="contenthandling" long-name="Content Handling" level="plugin">
-     <component name="contenthandlingfw" long-name="Content Handling Framework" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/contenthandling/contenthandlingfw/Group" mrp="/sf/mw/appsupport/contenthandling/contenthandlingfw/Group/content-handling.mrp"/>
-     </component>
-     <component name="webrecognisers" long-name="Web Recognisers" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/contenthandling/webrecognisers/group" mrp="/sf/mw/appsupport/contenthandling/webrecognisers/group/application-protocols_recognisers.mrp"/>
-     </component>
-     <component name="referencedrmagent" long-name="Reference DRM Agent" introduced="8.0" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/contenthandling/referencedrmagent/RefTestAgent/group" mrp="/sf/mw/appsupport/contenthandling/referencedrmagent/RefTestAgent/group/security_rta.mrp"/>
-     </component>
-    </collection>
-    <collection name="printingsupport" long-name="Printing Support" level="generic">
-     <component name="printinguisupport" long-name="Printing UI Support" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/printingsupport/printinguisupport/group" mrp="/sf/mw/appsupport/printingsupport/printinguisupport/group/app-framework_print.mrp"/>
-     </component>
-    </collection>
-    <collection name="appfw" long-name="Application Framework" level="framework">
-     <component name="apparchitecture" long-name="Application Architecture" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/appfw/apparchitecture/group" mrp="/sf/mw/appsupport/appfw/apparchitecture/group/app-framework_apparc.mrp"/>
-     </component>
-     <component name="viewserver" long-name="View Server" introduced="6.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/appfw/viewserver/group" mrp="/sf/mw/appsupport/appfw/viewserver/group/app-framework_viewsrv.mrp"/>
-     </component>
-     <component name="uiftestfw" long-name="UIF Test Framework" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/appsupport/appfw/uiftestfw/group/app-framework_testframework.mrp"/>
-     </component>
-    </collection>
-    <collection name="tzpcside" long-name="Time Zone PC Side" level="plugin">
-     <component name="tzcompiler" long-name="Time Zone Compiler" introduced="9.1" purpose="optional" class="config PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/tzpcside/tzcompiler/group" mrp="/sf/mw/appsupport/tzpcside/tzcompiler/group/app-services_tzcompiler.mrp"/>
-     </component>
-     <component name="worlddatabasekit" long-name="World Database Kit" introduced="6.0" deprecated="9.1" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/tzpcside/worlddatabasekit/group" mrp="/sf/mw/appsupport/tzpcside/worlddatabasekit/group/app-services_wlddatabasekit_cedar.mrp"/>
-     </component>
-     <component name="worldtools" long-name="World Tools" introduced="ER5" deprecated="9.1" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appsupport/tzpcside/worldtools/group" mrp="/sf/mw/appsupport/tzpcside/worldtools/group/app-services_wldtools.mrp"/>
-     </component>
-    </collection>
-    <collection name="appsupport_info" long-name="Generic Application Support Info" level="specific">
-     <component unofficial="yes" name="appsupport_plat" long-name="Generic Application Support Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/appsupport_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/appsupport/appsupport_plat/profiles_engine_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/appsupport/appsupport_plat/settings_backgroundimage_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/appsupport/appsupport_plat/settings_framework_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/appsupport/appsupport_plat/settings_launch_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/appsupport/appsupport_plat/settings_listbox_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="appsupport_pub" long-name="Generic Application Support Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/appsupport/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/group"/> -->
-      <unit bldFile="/sf/mw/appsupport/appsupport_pub/group"/>
-      <!-- <unit bldFile="/sf/mw/appsupport/appsupport_pub/network_status_api/tsrc/bc/networkstatus/group"/> -->
-      <!-- <unit bldFile="/sf/mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/bc/profilesenginewrapperapi/group"/> -->
-     </component>
-     <component unofficial="yes" name="appsupport_build" long-name="Generic Application Support Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/appsupport/group"/>
-     </component>
-    <component name="appsupport_metadata" long-name="Generic Application Support Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/appsupport/appsupport_info/appsupport_metadata/appsupport_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/appsupport/sources.csv
--- a/3k/mw/appsupport/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/camerasrv/package_definition.xml
--- a/3k/mw/camerasrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="camerasrv" long-name="Camera Services" tech_domain="mm" level="specific" levels="plugin fw api">
-    <collection name="camappengine" long-name="Camera App Engine" level="fw">
-     <component name="stillconverter" long-name="Still Converter" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/camerasrv/camappengine/stillconverter/group"/> -->
-     </component>
-     <component name="camappengine_engine" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/camerasrv/camappengine/engine/group"/> -->
-     </component>
-     <component name="asynchfilesavequeue" long-name="Asynch File Save Queue" origin-model="foundation">
-      <unit bldFile="/sf/mw/camerasrv/camappengine/asynchfilesavequeue/group"/>
-      <!-- <unit bldFile="/sf/mw/camerasrv/camappengine/asynchfilesavequeue/tsrc/public/basic/group"/> -->
-     </component>
-     <component unofficial="yes" name="camappengine_build" origin-model="foundation">
-      <unit bldFile="/sf/mw/camerasrv/camappengine/build"/>
-     </component>
-    </collection>
-    <collection name="camcordermmfplugin" long-name="Camcorder MMF Plugin" level="plugin">
-     <component name="mediarecorder" long-name="Media Recorder" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/camerasrv/camcordermmfplugin/mediarecorder/group"/> -->
-     </component>
-     <component name="filecomposer" long-name="File Composer" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/camerasrv/camcordermmfplugin/filecomposer/group"/> -->
-     </component>
-     <component name="camcordermmfplugin_controller" long-name="Controller" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/camerasrv/camcordermmfplugin/controller/group"/> -->
-     </component>
-     <component unofficial="yes" name="camcordermmfplugin_test" long-name="Camcorder MMF Plugin Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/camerasrv/camcordermmfplugin/tsrc/public/basic/group"/> -->
-     </component>
-     <component unofficial="yes" name="camcordermmfplugin_build" origin-model="foundation">
-      <unit bldFile="/sf/mw/camerasrv/camcordermmfplugin/build"/>
-     </component>
-    </collection>
-    <collection name="configmanagers" long-name="Config Managers" level="api">
-     <component name="imagingconfigmanager" long-name="Imaging Config Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/camerasrv/configmanagers/imagingconfigmanager/group"/>
-      <!-- <unit bldFile="/sf/mw/camerasrv/configmanagers/imagingconfigmanager/tsrc/public/basic/group"/> -->
-     </component>
-    </collection>
-    <collection name="camerasrv_info" long-name="Camera Services Info" level="api">
-     <component unofficial="yes" name="camerasrv_plat" long-name="Camera Services Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/asynchronous_file_saving_queue_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/camera_application_engine_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/imaging_configuration_manager_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/camerasrv/camerasrv_plat/media_recorder_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="camerasrv_build" long-name="Camera Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/camerasrv/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/camerasrv/sources.csv
--- a/3k/mw/camerasrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/classicui/package_definition.xml
--- a/3k/mw/classicui/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="classicui" long-name="Classic UI" tech_domain="ui" level="generic" levels="base support server generic specific">
-    <collection name="psln" long-name="Personalization" level="specific">
-     <component name="pslnengine" long-name="Personalization Engine" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/classicui/psln/pslnengine/group"/> -->
-     </component>
-     <component name="pslnframework" long-name="Personalization Framework" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/classicui/psln/pslnframework"/> -->
-     </component>
-     <component name="pslnlibraryloaders" long-name="Personalization Library Loaders" origin-model="foundation"/>
-     <component name="pslnslidesetdialog" long-name="Personalization Slideset Dialog" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/classicui/psln/pslnslidesetdialog/group"/> -->
-     </component>
-     <component name="pslngsplugin" long-name="Personalizaion GS Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/classicui/psln/pslngsplugin/group"/>
-     </component>
-     <component name="psln_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/mw/classicui/psln/help/group"/>
-     </component>
-     <component name="psln_build" long-name="Psln" origin-model="foundation">
-      <unit bldFile="/sf/mw/classicui/psln/group"/>
-     </component>
-    </collection>
-    <collection name="applicationinterworkingfw" long-name="Application Interworking Framework" level="generic">
-     <component name="aifwservicehandler" long-name="Service Handler" origin-model="foundation">
-      <unit bldFile="/sf/mw/classicui/applicationinterworkingfw/servicehandler/group"/>
-     </component>
-    </collection>
-    <collection name="commonuis" long-name="Common UIs" level="specific">
-     <component name="commonui" long-name="Common UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/classicui/commonuis/commonui/group"/>
-     </component>
-     <component name="commondialogs" long-name="Common Dialogs" origin-model="foundation">
-      <unit bldFile="/sf/mw/classicui/commonuis/commondialogs/group"/>
-      <!-- <unit bldFile="/sf/mw/classicui/commonuis/commondialogs/group_test"/> -->
-     </component>
-    </collection>
-    <collection name="uifw" long-name="UI Framework" level="server">
-     <component name="uiklaf" long-name="UIKLAF" origin-model="foundation">
-      <unit bldFile="/sf/mw/classicui/uifw/uiklaf/group"/>
-     </component>
-     <component name="eikctl" long-name="Eikctl" origin-model="foundation">
-      <unit bldFile="/sf/mw/classicui/uifw/eikctl/group"/>
-     </component>
-     <component name="avkon" long-name="AvKon" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/classicui/uifw/avkon/aknhlist/group"/> -->
-      <!-- <unit bldFile="/sf/mw/classicui/uifw/avkon/aknkeyrotator/group"/> -->
-      <unit bldFile="/sf/mw/classicui/uifw/avkon/aknphysics/group"/>
-      <unit bldFile="/sf/mw/classicui/uifw/avkon/group"/>
-      <unit bldFile="/sf/mw/classicui/uifw/avkon/odeconf/group"/>
-      <!-- <unit bldFile="/sf/mw/classicui/uifw/avkon/prebuilder"/> -->
-      <!-- <unit bldFile="/sf/mw/classicui/uifw/avkon/tsrc/bc/s60_sdkmcl/bctestmixmcl/group"/> -->
-     </component>
-     <component name="eikstd" long-name="EikStd" origin-model="foundation">
-      <unit bldFile="/sf/mw/classicui/uifw/eikstd/group"/>
-     </component>
-     <component name="aknglobalui" long-name="Avkon Global UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/classicui/uifw/aknglobalui/group"/>
-     </component>
-     <component name="ganes" long-name="Ganes" origin-model="foundation">
-      <unit bldFile="/sf/mw/classicui/uifw/ganes/group"/>
-     </component>
-     <component unofficial="yes" name="uifw_test" long-name="UI Framework Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/classicui/uifw/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="commonadapter" long-name="Common Adapter" level="support">
-     <component name="commonadapter_build" origin-model="foundation">
-      <unit bldFile="/sf/mw/classicui/commonadapter/group"/>
-     </component>
-    </collection>
-    <collection name="ode" long-name="Open Dynamics Engine" level="support">
-     <component name="ode_build" origin-model="foundation">
-      <unit bldFile="/sf/mw/classicui/ode/group"/>
-     </component>
-    </collection>
-    <collection name="commonuisupport" long-name="Common UI Support" level="support">
-     <component name="uikon" long-name="Uikon" introduced="6.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/classicui/commonuisupport/uikon/group" mrp="/sf/mw/classicui/commonuisupport/uikon/group/app-framework_uikon.mrp"/>
-     </component>
-     <component name="errorresolverdata" long-name="Error Resolver Data" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/classicui/commonuisupport/errorresolverdata/group" mrp="/sf/mw/classicui/commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
-     </component>
-     <component name="uilaf" long-name="UI Look and Feel" introduced="6.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/classicui/commonuisupport/uilaf/GROUP" mrp="/sf/mw/classicui/commonuisupport/uilaf/GROUP/app-framework_uiklafgt.mrp"/>
-     </component>
-     <component name="grid" long-name="Grid" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/classicui/commonuisupport/grid/group" mrp="/sf/mw/classicui/commonuisupport/grid/group/app-framework_grid.mrp"/>
-     </component>
-     <component name="uifwsdocs" long-name="UI Frameworks Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/classicui/commonuisupport/uifwsdocs/app-framework_documentation.mrp"/>
-     </component>
-    </collection>
-    <collection name="lafagnosticuifoundation" long-name="Look-and-Feel Agnostic UI Foundation" level="base">
-     <component name="cone" long-name="Control Environment" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/cone/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/cone/group/app-framework_cone.mrp"/>
-     </component>
-     <component name="graphicseffects" long-name="Graphics Effects" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/graphicseffects/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/graphicseffects/group/app-framework_gfxtranseffect.mrp"/>
-     </component>
-     <component name="uigraphicsutils" long-name="UI Graphics Utilities" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/uigraphicsutils/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/uigraphicsutils/group/app-framework_egul.mrp"/>
-     </component>
-     <component name="clockanim" long-name="Clock" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/clockanim/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/clockanim/group/app-framework_clock.mrp"/>
-     </component>
-     <component name="bmpanimation" long-name="BMP Animation" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/bmpanimation/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/bmpanimation/group/app-framework_bmpanim.mrp"/>
-     </component>
-     <component name="animation" long-name="Animation" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/classicui/lafagnosticuifoundation/animation/group" mrp="/sf/mw/classicui/lafagnosticuifoundation/animation/group/app-framework_animation.mrp"/>
-     </component>
-    </collection>
-    <collection name="classicui_info" long-name="Classic UI Info" level="specific">
-     <component unofficial="yes" name="classicui_build" long-name="Classic UI Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/classicui/group"/>
-     </component>
-     <component unofficial="yes" name="classicui_pub" long-name="Classic UI Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_criteria_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_generic_parameter_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/aiw_service_handler_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/animation_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/application_framework_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/base_controls_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/buttons_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/choice_list_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/common_file_dialogs_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/context_pane_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/dialogs_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/dialog_shutter_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/document_handler_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/editors_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/error_ui_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/fonts_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/form_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/generic_button_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/grids_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/hierarchical_lists_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/hotkeys_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/images_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/indicators_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/information_preview_popup_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/info_popup_note_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/initialization_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/input_frame_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/keylock_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/labels_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/lists_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/misc_controls_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/navigation_pane_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/notes_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/notifiers_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/options_menu_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/popups_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/private_ui_framework_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/queries_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/screen_clearer_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/screen_mode_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/screen_saver_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/scroller_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/searchfield_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/server_application_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/setting_pages_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/slider_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/sounds_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/status_pane_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/stylus_popup_menu_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/tabs_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/title_pane_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/toolbar_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/touch_ui_utilities_api/tsrc/group"/>
-      <!-- <unit bldFile="/sf/mw/classicui/classicui_pub/tsrc/bc/apps/bctesttemplate/group"/> -->
-      <!-- <unit bldFile="/sf/mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.0/group"/> -->
-      <!-- <unit bldFile="/sf/mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.1/group"/> -->
-      <!-- <unit bldFile="/sf/mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk3.2/group"/> -->
-      <!-- <unit bldFile="/sf/mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk5.0/bctestpane/group"/> -->
-      <!-- <unit bldFile="/sf/mw/classicui/classicui_pub/tsrc/bc/apps/s60_sdk5.0/group"/> -->
-      <!-- <unit bldFile="/sf/mw/classicui/classicui_pub/tsrc/bc/group"/> -->
-      <unit bldFile="/sf/mw/classicui/classicui_pub/uikon_core_controls/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_definitions_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/ui_framework_utilities_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/volume_control_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_pub/window_server_event_observer_api/tsrc/group"/>
-     </component>
-     <component unofficial="yes" name="classicui_plat" long-name="Classic UI Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_provider_utility_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_service_interface_base_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/aiw_service_interface_menu_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/alarm_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/application_switching_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_fonts_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_secondary_display_support_api/tsrc/group"/>
-      <!-- <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_testability_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/classicui/classicui_plat/avkon_ui_server_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/battery_pane_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/custom_cursors_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/eikon_server_extension_client_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/emergency_call_support_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/extended_aiw_criteria_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/extended_animation_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/extended_buttons_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/extended_editors_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/extended_grids_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/extended_indicators_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/extended_initialization_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/extended_input_capabilities_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/extended_lists_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notes_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notifiers_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/extended_setting_pages_api/tsrc/group"/>
-      <!-- <unit bldFile="/sf/mw/classicui/classicui_plat/extended_sounds_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/classicui/classicui_plat/extended_status_pane_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/extended_utilities_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/find_item_ui_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/ganes_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/generic_parameter_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/global_popup_priority_controller_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/indicator_plugin_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/input_block_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/item_finder_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/japanese_reading_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/key_rotator_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/layout_configuration_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/list_effects_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/long_tap_animation_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/media_shared_document_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/memory_card_ui_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/number_grouping_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/personalisation_framework_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/phone_number_text_utilities_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/physics_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/pointer_event_modifier_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/popup_form_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/server_application_services_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/signal_pane_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/skinnable_clock_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/special_character_table_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/stylus_activated_popup_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/task_list_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/text_scroller_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/touch_pane_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/transition_effect_parameters_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/transition_effect_utilities_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/classicui/classicui_plat/volume_popup_api/tsrc/group"/>
-     </component>
-    <component name="classicui_metadata" long-name="Classic UI Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/classicui/classicui_info/classicui_metadata/classicui_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/classicui/sources.csv
--- a/3k/mw/classicui/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/dlnasrv/package_definition.xml
--- a/3k/mw/dlnasrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="dlnasrv" long-name="DLNA Services" tech_domain="de" level="specific" levels="framework server plugin">
-    <collection name="upnpavcontrolpoint" long-name="UPnP A/V Control Point" level="plugin">
-     <component name="avcontrolframework" long-name="A/V Control Famework" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpavcontrolpoint/avcontrolframework/group"/>
-     </component>
-     <component name="avcpengine" long-name="AVCP Engine" origin-model="foundation"/>
-     <component name="avcpengineclient" long-name="Avcp Engine Client" origin-model="foundation"/>
-     <component name="upnpaccessplugin" long-name="UPnP Access Plugin" origin-model="foundation"/>
-     <component unofficial="yes" name="upnpavcontrolpoint_build" long-name="UPnP A/V Control Point Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpavcontrolpoint/group"/>
-     </component>
-    </collection>
-    <collection name="upnpmediaserver" long-name="UPnP Media Server" level="server">
-     <component name="avobjects" long-name="A/V Objects" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/avobjects/group"/>
-     </component>
-     <component name="mediaserverclient" long-name="Media Server Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/mediaserverclient/group"/>
-     </component>
-     <component name="connectionmanagerservice" long-name="Connection Manager Service" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/connectionmanagerservice/group"/>
-     </component>
-     <component name="contentdirectoryservice" long-name="Content Directory Service" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/contentdirectoryservice/group"/>
-     </component>
-     <component name="mediaserverengine" long-name="Media Server Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/mediaserverengine/group"/>
-     </component>
-     <component unofficial="yes" name="upnpmediaserver_build" long-name="UPnP Media Server Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpmediaserver/group"/>
-     </component>
-    </collection>
-    <collection name="upnpstack" long-name="UPnP Stack" level="framework">
-     <component name="upnputils" long-name="UPnP Utils" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/upnputils/group"/>
-     </component>
-     <component name="upnpconnectionmanagersession" long-name="UPnP Connection Manager Session" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/upnpconnectionmanagersession/group"/>
-     </component>
-     <component name="upnpconnmanager" long-name="UPnP Connection Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/upnpconnmanager/group"/>
-     </component>
-     <component name="dlnawebserver" long-name="DLNA Web Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/dlnawebserver/group"/>
-     </component>
-     <component name="serviceframework" long-name="Service Framework" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/serviceframework/group"/>
-     </component>
-     <component name="ssdpserver" long-name="SSDP Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/ssdpserver/group"/>
-     </component>
-     <component name="messagehandler" long-name="Message Handler" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/messagehandler/group"/>
-     </component>
-     <component name="controlpointbase" long-name="Control Point Base" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/controlpointbase/group"/>
-     </component>
-     <component name="upnphttptransfer" long-name="UPnP HTTP Transfer" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/upnphttptransfer/group"/>
-     </component>
-     <component unofficial="yes" name="upnpstack_build" long-name="UPnP Stack Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpstack/group"/>
-     </component>
-    </collection>
-    <collection name="upnpsharing" long-name="UPnP Sharing" level="server">
-     <component name="upnpdlnaprofiler" long-name="UPnP DLNA Profiler" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsharing/upnpdlnaprofiler/group"/>
-     </component>
-     <component name="upnpsecurity" long-name="UPnP Security" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsharing/upnpsecurity/group"/>
-     </component>
-     <component name="upnpcontentserver" long-name="UPnP Content Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsharing/upnpcontentserver/group"/>
-     </component>
-     <component name="applicationengine" long-name="Application Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsharing/applicationengine/group"/>
-     </component>
-     <component unofficial="yes" name="upnpsharing_build" long-name="UPnP Sharing Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsharing/group"/>
-     </component>
-    </collection>
-    <collection name="upnpsettings" long-name="UPnP Settings" level="framework">
-     <component name="upnpsettingsengine" long-name="UPnP Settings Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsettings/upnpsettingsengine/group"/>
-     </component>
-     <component name="multiselectionui" long-name="Multi-Selection UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsettings/multiselectionui/group"/>
-     </component>
-     <component name="appwizard" long-name="App Wizard" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsettings/appwizard/group"/>
-     </component>
-     <component name="upnpsharingui" long-name="UPnP Sharing UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsettings/upnpsharingui/group"/>
-     </component>
-     <component name="upnpgsplugin" long-name="UPnP GS Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsettings/upnpgsplugin/group"/>
-     </component>
-     <component unofficial="yes" name="upnpsettings_build" long-name="UPnP Settings Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpsettings/group"/>
-     </component>
-    </collection>
-    <collection name="upnpmpxplugins" long-name="UPnP MPX Plugins" level="plugin">
-     <component name="upnpplaybackplugins" long-name="UPnP Playback Plugins" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpmpxplugins/upnpplaybackplugins/group"/>
-     </component>
-     <component unofficial="yes" name="upnpmpxplugins_build" long-name="UPnP MPX Plugins Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpmpxplugins/group"/>
-     </component>
-    </collection>
-    <collection name="upnpharvester" long-name="UPnP Harvester" level="server">
-     <component name="upnpharvester_common" long-name="Common" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpharvester/common/cmlibrary/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/upnpharvester/common/cmsettings/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/upnpharvester/common/cmsqlwrapper/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/upnpharvester/common/dbmanager/group"/>
-     </component>
-     <component name="cdssync" long-name="CDS Sync" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpharvester/cdssync/common"/>
-     </component>
-     <component name="mdhserver" long-name="MDH Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpharvester/mdhserver/group"/>
-     </component>
-     <component unofficial="yes" name="upnpharvester_build" long-name="UPnP Harvester Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpharvester/group"/>
-     </component>
-    </collection>
-    <collection name="upnpframework" long-name="UPnP Framework" level="framework">
-     <component name="upnputilities" long-name="UPnP Utilities" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnputilities/group"/>
-     </component>
-     <component name="upnpextensionpluginif" long-name="UPnP Extension Plugin IF" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpextensionpluginif/group"/>
-     </component>
-     <component name="upnpfiletransferengine" long-name="UPnP File Transfer Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpfiletransferengine/group"/>
-     </component>
-     <component name="upnpmusicadapter" long-name="UPnP Musicadapter" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpmusicadapter/group"/>
-     </component>
-     <component name="upnpcommonui" long-name="UPnP Common UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpcommonui/group"/>
-     </component>
-     <component name="upnpcommand" long-name="UPnP Command" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpcommand/group"/>
-     </component>
-     <component name="upnpaiwengine" long-name="UPnP AIW Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpaiwengine/group"/>
-     </component>
-     <component name="upnpaiwprovider" long-name="UPnP AIW Provider" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/upnpaiwprovider/group"/>
-     </component>
-     <component unofficial="yes" name="upnpframework_build" long-name="UPnP Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpframework/group"/>
-     </component>
-    </collection>
-    <collection name="upnpavcontroller" long-name="UPnP A/V Controller" level="server">
-     <component name="upnpxmlparser" long-name="UPnP XML Parser" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/upnpxmlparser/group"/>
-     </component>
-     <component name="upnpavcontrollerserver" long-name="UPnP A/V Controller Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/upnpavcontrollerserver/group"/>
-     </component>
-     <component name="upnpavcontrollerclient" long-name="UPnP A/V Ccontroller Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/upnpavcontrollerclient/group"/>
-     </component>
-     <component name="upnpavcontrollerhelper" long-name="UPnP A/V Controller Helper" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/upnpavcontrollerhelper/group"/>
-     </component>
-     <component unofficial="yes" name="upnpavcontroller_build" long-name="UPnP A/V Controller Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/upnpavcontroller/group"/>
-     </component>
-    </collection>
-    <collection name="homesync" long-name="Home Sync" level="plugin">
-     <component name="contentmanager" long-name="Content Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/cmserver/cmfillmanager/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/cmserver/cmmemorymanager/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/cmserver/cmscheduler/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/cmserver/cmserver/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/cmserver/cmstoremanager/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/homesyncgsplugin/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/homesyncwizard/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/mediaservant/applicationengine/group"/>
-      <unit bldFile="/sf/mw/dlnasrv/homesync/contentmanager/mediaservant/group"/>
-     </component>
-     <component unofficial="yes" name="homesync_build" long-name="Home Sync Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/homesync/group"/>
-     </component>
-    </collection>
-    <collection name="homemedia" long-name="Home Media" level="framework">
-     <component name="homemedia_build" long-name="Home Media" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/homemedia/group"/>
-     </component>
-     
-    </collection>
-    <collection name="dlnasrv_info" long-name="DLNA Services Info" level="plugin">
-     <component unofficial="yes" name="dlnasrv_plat" long-name="DLNA Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/dlnasrv_plat/group"/>
-     </component>
-     <component unofficial="yes" name="dlnasrv_build" long-name="DLNA Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/dlnasrv/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/dlnasrv/sources.csv
--- a/3k/mw/dlnasrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/drm/package_definition.xml
--- a/3k/mw/drm/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="drm" long-name="DRM" tech_domain="se" level="generic" levels="plugin framework server generic specific">
-    <collection name="commondrm" long-name="Common DRM" level="generic">
-     <component name="drmencryptor" long-name="DRM Encryptor" origin-model="foundation"/>
-     <component name="drmsettingsplugin" long-name="DRM Settings Plugin" origin-model="foundation"/>
-     <component name="drmrightsmanagerui" long-name="DRM Rights Manager UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/drm/commondrm/drmrightsmanagerui/help/group"/>
-     </component>
-     <component name="drmutility" long-name="DRM Utility" origin-model="foundation">
-      <unit bldFile="/sf/mw/drm/commondrm/drmutility/group"/>
-     </component>
-     <component name="drmserviceapiwrapper" long-name="DRM Service API Wrapper" origin-model="foundation">
-      <unit bldFile="/sf/mw/drm/commondrm/drmserviceapiwrapper/group"/>
-     </component>
-     <component name="drmrightsstoringlocation" long-name="DRM Rights Storing Location" origin-model="foundation">
-      <unit bldFile="/sf/mw/drm/commondrm/drmrightsstoringlocation/group"/>
-     </component>
-     <component unofficial="yes" name="commondrm_build" long-name="Common DRM Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/drm/commondrm/group"/>
-     </component>
-    </collection>
-    <collection name="omadrm" long-name="OMA DRM" level="server">
-     <component name="drmroapwbxmlparser" long-name="DRM ROAP WBXML Parser" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/drm/omadrm/drmroapwbxmlparser/group"/> -->
-     </component>
-     <component name="drmplugins" long-name="DRM Plugins" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/drm/omadrm/drmplugins/drmfilter/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/omadrm/drmplugins/drmrecognizer/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/omadrm/drmplugins/drmrohandler/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/omadrm/drmplugins/drmromtm/group"/> -->
-     </component>
-     <component name="drmengine" long-name="DRM Engine" origin-model="foundation"/>
-     <component name="drmhelper" long-name="DRM Helper" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/drm/omadrm/drmhelper/drmhelperserver/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/omadrm/drmhelper/group"/> -->
-     </component>
-     <component name="drmlicensemanager" long-name="Drm License Manager" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/drm/omadrm/drmlicensemanager/group"/> -->
-     </component>
-     <component unofficial="yes" name="omadrm_build" long-name="OMA DRM Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/drm/omadrm/group"/>
-     </component>
-    </collection>
-    <collection name="wmdrm" long-name="WM DRM" level="framework">
-     <component name="wmdrmengine" long-name="WM DRM Engine" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/drm/wmdrm/wmdrmengine/wmdrmagent/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/wmdrm/wmdrmengine/wmdrmfileserver/client/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/wmdrm/wmdrmengine/wmdrmfileserver/server/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/wmdrm/wmdrmengine/wmdrmserver/client/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/wmdrm/wmdrmengine/wmdrmserver/clientwrapper/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/wmdrm/wmdrmengine/wmdrmserver/server/group"/> -->
-     </component>
-     <component name="camese" long-name="Camese" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/cameseutility/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/httpfiltercamese/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/wmdrmdla/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/wmdrmdlaapp/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/wmdrmdladefaulthttpplugin/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/wmdrmdladefaultuiplugin/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/wmdrmdlautils/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/wmdrm/camese/wmdrmdlawrapper/group"/> -->
-     </component>
-     <component name="wmdrmplugins" long-name="WM DRM Plugins" origin-model="foundation"/>
-     <component unofficial="yes" name="wmdrm_build" long-name="WM DRM Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/drm/wmdrm/group"/>
-     </component>
-    </collection>
-    <collection name="drm_info" long-name="DRM Info" level="specific">
-     <component unofficial="yes" name="drm_pub" long-name="DRM Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/drm/drm_pub/drm_helper_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/drm_pub/drm_license_checker_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/drm/drm_pub/group"/>
-      <!-- <unit bldFile="/sf/mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/> -->
-     </component>
-     <component unofficial="yes" name="drm_plat" long-name="DRM Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/drm/drm_plat/drm_common_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/drm/drm_plat/drm_rights_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/drm/drm_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/drm/drm_plat/roap_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="drm_build" long-name="DRM Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/drm/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/drm/sources.csv
--- a/3k/mw/drm/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/hapticsservices/package_definition.xml
--- a/3k/mw/hapticsservices/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="hapticsservices" long-name="Haptics Services" tech_domain="ui" level="generic" levels="fw api">
-    <collection name="tactilefeedback" long-name="Tactile Feedback" level="fw">
-     <component name="tactilearearegistry" long-name="Tactile Area Registry" origin-model="foundation">
-      <unit bldFile="/sf/mw/hapticsservices/tactilefeedback/tactilearearegistry/group"/>
-     </component>
-     <component name="tactilefeedbackclient" long-name="Tactile Feedback Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/hapticsservices/tactilefeedback/tactilefeedbackclient/group"/>
-     </component>
-     <component name="tactileactionplugin" long-name="TactilE Action Plugin" origin-model="foundation"/>
-     <component name="tactileclickplugin" long-name="Tactile Click Plugin" origin-model="foundation"/>
-     <component name="tactilefeedbackresolver" long-name="Tactile Feedback Resolver" origin-model="foundation"/>
-     <component unofficial="yes" name="tactilefeedback_build" long-name="Tactile Feedback Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/hapticsservices/tactilefeedback/group"/>
-     </component>
-    </collection>
-    <collection name="hapticsservices_info" long-name="Haptics Services Info" level="api">
-     <component unofficial="yes" name="hapticsservices_pub" long-name="Haptics Services Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/hapticsservices/hapticsservices_pub/group"/>
-     </component>
-     <component unofficial="yes" name="hapticsservices_plat" long-name="Haptics Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/hapticsservices/hapticsservices_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/hapticsservices/sources.csv
--- a/3k/mw/hapticsservices/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/helix/package_definition.xml
--- a/3k/mw/helix/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
- <systemModel>
-  <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="helix" long-name="Helix" tech_domain="mm" level="generic" levels="plugin framework server generic specific">
-    <collection name="helix_ren" long-name="Helix" level="framework">
-     <component name="helixrfsplugin" long-name="Helix RFS Plugin" origin-model="foundation"/>
-     <component name="helix_binary" long-name="Helix Binary" origin-model="foundation"/>
-     <component name="src" long-name="Src" origin-model="foundation"/>
-    </collection>
-   </block>
-  </layer>
- </systemModel>
-</SystemDefinition>
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/homescreensrv/package_definition.xml
--- a/3k/mw/homescreensrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="homescreensrv" long-name="Home Screen Services" tech_domain="ui" level="specific" levels="plugin framework server generic specific">
-    <collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
-     <component name="contentpublishingutils" long-name="Content Publishing Utils" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/>
-      <unit bldFile="/sf/mw/homescreensrv/contentpublishingsrv/contentpublishingutils/group"/>
-     </component>
-     <component name="contentpublishingserver" long-name="Content Publishing Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/contentpublishingsrv/contentpublishingserver/group"/>
-     </component>
-     <component name="contentharvester" long-name="Content Harvester" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/contentpublishingsrv/contentharvester/group"/>
-     </component>
-     <component unofficial="yes" name="contentpublishingsrv_build" long-name="Content Publishing Service Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/contentpublishingsrv/group"/>
-     </component>
-    </collection>
-    <collection name="backsteppingsrv" long-name="Backstepping Service" level="server">
-     <component name="bsengine" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/backsteppingsrv/group"/>
-     </component>
-    </collection>
-    <collection name="xcfw" long-name="XCFW" level="framework">
-     <component name="xcfw_build" long-name="XCFW" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/xcfw/group"/>
-     </component>
-    </collection>
-    <collection name="homescreenpluginsrv" long-name="Homescreen Plugin Service" level="plugin">
-     <component name="hspsdefinitionengine" long-name="Homescreen Plugin Server Definition Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/homescreenpluginsrv/hspsdefinitionengine/group"/>
-     </component>
-     <component name="hspsdom" long-name="Homescreen Plugin Server DOM" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/homescreenpluginsrv/hspsdom/group"/>
-     </component>
-     <component name="hspspluginregistry" long-name="Homescreen Plugin Registry" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/homescreenpluginsrv/hspspluginregistry/group"/>
-     </component>
-     <component name="hspsmanager" long-name="Homescreen Plugin Server Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/homescreenpluginsrv/hspsmanager/group"/>
-     </component>
-     <component name="hspsodt" long-name="Homescreen Plugin Server ODT" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/homescreenpluginsrv/hspsodt/group"/>
-     </component>
-     <component name="hspsresource" long-name="Homescreen Plugin Server Resource" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/homescreenpluginsrv/hspsresource/group"/>
-     </component>
-     <component name="hspsresult" long-name="Homescreen Plugin Server Result" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/homescreenpluginsrv/hspsresult/group"/>
-     </component>
-     <component name="hspstools" long-name="Homescreen Plugin Server Tools" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/homescreenpluginsrv/hspstools/group"/>
-     </component>
-     <component unofficial="yes" name="homescreenpluginsrv_build" long-name="Homescreen Plugin Service Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/homescreenpluginsrv/group"/>
-     </component>
-    </collection>
-    <collection name="idlefw" long-name="Idle Framework" level="framework">
-     <component name="idlefw_plugins" long-name="Plugins" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/idlefw/plugins/group"/>
-      <!-- <unit bldFile="/sf/mw/homescreensrv/idlefw/plugins/pslnactiveidleplugin/group"/> -->
-     </component>
-     <component unofficial="yes" name="idlefw_build" long-name="Idle Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/idlefw/group"/>
-     </component>
-    </collection>
-    <collection name="menucontentsrv" long-name="Menu Content Service" level="generic">
-     <component name="menusatinterface" long-name="Menu SAT Interface" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/menucontentsrv/menusatinterface/group"/>
-     </component>
-     <component unofficial="yes" name="menucontentsrv_build" long-name="Menu Content Service Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/homescreensrv/menucontentsrv/group"/>
-     </component>
-    </collection>
-    <collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
-     <component unofficial="yes" name="homescreensrv_plat" long-name="Home Screen Services Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/action_handler_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/content_harvester_plugin_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/menu_content_service_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/menu_sat_interface_api/tsrc/group"/> -->
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/homescreensrv/sources.csv
--- a/3k/mw/homescreensrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/imghandling/package_definition.xml
--- a/3k/mw/imghandling/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="imghandling" long-name="Image Handling" tech_domain="mm" level="specific" levels="plugin framework server generic specific">
-    <collection name="3gplibrary" long-name="3GP Library" level="server">
-     <component name="3gpmp4lib" long-name="3GP MP4 Library" origin-model="foundation">
-      <unit bldFile="/sf/mw/imghandling/3gplibrary/3gpmp4lib/group"/>
-      <!-- <unit bldFile="/sf/mw/imghandling/3gplibrary/3gpmp4lib/tsrc/public/basic/group"/> -->
-     </component>
-     <component unofficial="yes" name="3gplibrary_build" long-name="3GP Library Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/imghandling/3gplibrary/group"/>
-     </component>
-    </collection>
-    <collection name="imagehandlinglib" long-name="Image Handling Library" level="generic">
-     <component name="ihl" long-name="IHL" origin-model="foundation">
-      <unit bldFile="/sf/mw/imghandling/imagehandlinglib/group"/>
-     </component>
-    </collection>
-    <collection name="imagehandlingutilities" long-name="Image Handling Utilities" level="specific">
-     <component name="imageinfopopup" long-name="Image Info Popup" origin-model="foundation">
-      <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/imageinfopopup/group"/>
-     </component>
-     <component name="imagepreview" long-name="Image Preview" origin-model="foundation">
-      <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/imagepreview/group"/>
-     </component>
-     <component name="thumbnailmanager" long-name="Thumbnail Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
-     </component>
-     <component name="tvoutengine" long-name="TV Out Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/tvoutengine/group"/>
-     </component>
-    </collection>
-    <collection name="imghandling_info" long-name="Image Handling Info" level="specific">
-     <component unofficial="yes" name="imagehandling_plat" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/imghandling/imagehandling_plat/3gp_library_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/imghandling/imagehandling_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/imghandling/imagehandling_plat/thumbnailmanager_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="imghandling_build" long-name="Image Handling Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/imghandling/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/imghandling/sources.csv
--- a/3k/mw/imghandling/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/imsrv/package_definition.xml
--- a/3k/mw/imsrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="imsrv" long-name="Instant Messaging and Presence Services" tech_domain="pr" level="specific" levels="plugin framework server generic specific">
-    <collection name="imservices" long-name="IM Services" level="generic">
-     <component name="imfeatureplugin" long-name="IM Feature Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/group"/>
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/srcimdatamodel/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/srcimfrontend/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/srcimoperations/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/imfeatureplugin/srcimprocessor/group"/> -->
-     </component>
-     <component name="searchfeatureplugin" long-name="Search Feature Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/group"/>
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/srcsearchdatamodel/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/srcsearchfrontend/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/srcsearchoperations/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/searchfeatureplugin/srcsearchprocessor/group"/> -->
-     </component>
-     <component name="xmppsettingsapi" long-name="XMPP Setting Sapi" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsapi/group"/>
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsapi/tsrc/group"/> -->
-     </component>
-     <component name="xmppsettingsfetcher" long-name="XMPP Settingsfetcher" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsfetcher/group"/>
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/group"/> -->
-     </component>
-     <component name="ossprotocoladaptation" long-name="OSS Protocol Adaptation" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/ossprotocoladaptation/dataconvlib/group"/> -->
-      <unit bldFile="/sf/mw/imsrv/imservices/ossprotocoladaptation/group"/>
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/ossprotocoladaptation/tsrc/ossadapmt/group"/> -->
-     </component>
-     <component name="instantmessagingcache" long-name="Instant Messaging Cache" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/imservices/instantmessagingcache/group"/>
-      <!-- <unit bldFile="/sf/mw/imsrv/imservices/instantmessagingcache/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="imservices_build" long-name="IM Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/imservices/group"/>
-     </component>
-    </collection>
-    <collection name="ximpfw" long-name="XIMP Framework" level="framework">
-     <component name="ximpfw_core" long-name="Core" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/core/group"/> -->
-     </component>
-     <component name="presence" long-name="Presence" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/presence/group"/> -->
-     </component>
-     <component unofficial="yes" name="ximpfw_test" long-name="XIMP Framework Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencewatching"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencegroupmembermngt"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presenceblocking"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/tsrcutils"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_rootservices"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presenceall"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencegrouplistmngt"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencecache"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencepublishing"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencewatcherlistmngt"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/tsrcprotocols"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presencegrantrequestmngt"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_sessionmng"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_presenceauthorization"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_eunittemplate"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/ximpfw/tsrc/src/t_utils"/> -->
-     </component>
-     <component unofficial="yes" name="ximpfw_build" long-name="XIMP Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/ximpfw/group"/>
-     </component>
-    </collection>
-    <collection name="brandingserver" long-name="Branding Server" level="specific">
-     <component name="tools" long-name="Tools" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/imsrv/brandingserver/tools/bsimport/group"/> -->
-     </component>
-     <component unofficial="yes" name="brandingserver_build" long-name="Branding Server Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/brandingserver/group"/>
-     </component>
-    </collection>
-    <collection name="imsrv_info" long-name="Instant Messaging and Presence Services Info" level="specific">
-     <component unofficial="yes" name="imsrv_plat" long-name="Instant Messaging and Presence Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/imsrv_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/im_cache_client_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_eunittemplate"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencecache"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils"/> -->
-      <!-- <unit bldFile="/sf/mw/imsrv/imsrv_plat/xmpp_settings_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="imsrv_build" long-name="Instant Messaging and Presence Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/imsrv/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/imsrv/sources.csv
--- a/3k/mw/imsrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/inputmethods/package_definition.xml
--- a/3k/mw/inputmethods/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="inputmethods" long-name="Input Methods" tech_domain="ui" level="generic" levels="plugin engine framework">
-    <collection name="textinput" long-name="Text Input" level="framework">
-     <component name="ptienginev2" long-name="PTI Engine V2" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/ptienginev2/group"/>
-     </component>
-     <component name="akninputlanguage" long-name="Akn Input Language" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/akninputlanguage/group"/>
-     </component>
-     <component name="peninputarc" long-name="Pen Input Arc" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/peninputarc/group"/>
-      <!-- <unit bldFile="/sf/mw/inputmethods/textinput/peninputarc/src/peninputserverapp"/> -->
-      <!-- <unit bldFile="/sf/mw/inputmethods/textinput/peninputarc/utils/group"/> -->
-     </component>
-     <component name="peninputcommonctrls" long-name="Pen Input Common Ctrls" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/peninputcommonctrls/group"/>
-     </component>
-     <component name="peninputhwrboxcn" long-name="Pen Input Hardwarer Boxcn" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/peninputhwrboxcn/group"/>
-     </component>
-     <component name="peninputvkbcn" long-name="Pen Input Vkbcn" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/peninputvkbcn/group"/>
-     </component>
-     <component name="peninputcommonlayout" long-name="Pen Input Common Layout" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/peninputcommonlayout/group"/>
-     </component>
-     <component name="peninputgenerichwr" long-name="Pen Input Generic Hwr" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/peninputgenerichwr/group"/>
-     </component>
-     <component name="peninputgenericvkb" long-name="Pen Input Generic Vkb" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/peninputgenericvkb/group"/>
-     </component>
-     <component name="peninputcommonctrlsjp" long-name="Pen Input Common Ctrls Jp" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/peninputcommonctrlsjp/group"/>
-     </component>
-     <component name="peninputhwrboxjp" long-name="Pen Input Hardwarer Boxjp" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/peninputhwrboxjp/group"/>
-     </component>
-     <component name="peninputvkbjp" long-name="Pen Input Vkbjp" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/peninputvkbjp/group"/>
-     </component>
-     <component name="peninputgenericitut" long-name="Pen Input Generici Tut" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/peninputgenericitut/group"/>
-     </component>
-     <component name="peninputhwrtrui" long-name="Pen Input Hardwarer Tr UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/peninputhwrtrui/group"/>
-     </component>
-     <component name="peninputhwrfscn" long-name="Pen Input Hardwarer Fscn" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/peninputhwrfscn/group"/>
-     </component>
-     <component name="matsutake" long-name="Matsutake" origin-model="foundation"/>
-     <component unofficial="yes" name="textinput_build" long-name="Text Input Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/group"/>
-     </component>
-     <component unofficial="yes" name="gslangplugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/textinput/gslangplugin"/>
-     </component>
-    </collection>
-    <collection name="fep" long-name="FEP" level="engine">
-     <component name="aknfep" long-name="AKN FEP" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/fep/aknfep/group"/>
-      <!-- <unit bldFile="/sf/mw/inputmethods/fep/aknfep/peninputplugins/peninputimeplugincn/group"/> -->
-      <!-- <unit bldFile="/sf/mw/inputmethods/fep/aknfep/peninputplugins/peninputimeplugingeneric/group"/> -->
-      <!-- <unit bldFile="/sf/mw/inputmethods/fep/aknfep/peninputplugins/peninputimepluginitut/group"/> -->
-      <!-- <unit bldFile="/sf/mw/inputmethods/fep/aknfep/peninputplugins/peninputimepluginjp/group"/> -->
-      <!-- <unit bldFile="/sf/mw/inputmethods/fep/aknfep/uiplugins/aknfepuiinterface/avkonimpl/group"/> -->
-      <!-- <unit bldFile="/sf/mw/inputmethods/fep/aknfep/uiplugins/aknfepuiinterface/group"/> -->
-     </component>
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="frontendprocessor">
-       <unit bldFile="/sf/mw/inputmethods/fep/frontendprocessor/test/group"/>
-     </component>-->
-    <component name="frontendprocessor" long-name="Front End Processor" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/inputmethods/fep/frontendprocessor/group" mrp="/sf/mw/inputmethods/fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
-     </component>
-    </collection>
-    <collection name="inputmethods_info" long-name="Input Methods Info" level="framework">
-     <component unofficial="yes" name="inputmethods_plat" long-name="Input Methods Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/aknfep_uiinterface_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/pen_input_server_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_hwr_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/inputmethods/inputmethods_plat/ptiengine_key_definations_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="inputmethods_build" long-name="Input Methods Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/group"/>
-     </component>
-     <component unofficial="yes" name="inputmethods_pub" long-name="Input Methods Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/group"/>
-      <!-- <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/input_language_info_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/optical_character_recognition_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/inputmethods/inputmethods_pub/ptiengine_iti_api/tsrc/group"/> -->
-     </component>
-    <component name="inputmethods_metadata" long-name="Input Methods Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/inputmethods/inputmethods_info/inputmethods_metadata/inputmethods_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/inputmethods/sources.csv
--- a/3k/mw/inputmethods/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/ipappprotocols/package_definition.xml
--- a/3k/mw/ipappprotocols/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="ipappprotocols" long-name="IP App Protocols" tech_domain="dc" level="generic" levels="plugin framework conn server">
-    <collection name="rtp" long-name="RTP" level="server">
-     <component name="srtpstack" long-name="SRTP Stack" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/rtp/srtpstack/group"/>
-      <!-- <unit bldFile="/sf/mw/ipappprotocols/rtp/srtpstack/tsrc/ut_srtpstack/group"/> -->
-     </component>
-     <component name="rtpstack" long-name="RTP Stack" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/rtp/rtpstack/group"/>
-      <!-- <unit bldFile="/sf/mw/ipappprotocols/rtp/rtpstack/tsrc/ut_rtpstack/group"/> -->
-     </component>
-    </collection>
-    <collection name="sipplugins" long-name="SIP Plugins" level="plugin">
-     <component name="sippwlanplugin" long-name="SIP WLAN Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippwlanplugin/group"/>
-     </component>
-     <component name="sippsipsettingsui" long-name="SIP Settings UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsipsettingsui/group"/>
-      <!-- <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsipsettingsui/tsrc/ut_sipsettingsui/group"/> -->
-     </component>
-     <component name="sippdevmgmtsipadapter" long-name="Device Management SIP Adapter" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/group"/>
-      <!-- <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippdevmgmtsipadapter/tsrc/ut_cnsmldmsipadapter/group"/> -->
-     </component>
-     <component name="sippsystemstatemonitor" long-name="SIP System State Monitor" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsystemstatemonitor/group"/>
-     </component>
-     <component name="sippsipadapter" long-name="SIP Adapter" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsipadapter/group"/>
-      <!-- <unit bldFile="/sf/mw/ipappprotocols/sipplugins/sippsipadapter/tsrc/ut_cwpsipadapter/group"/> -->
-     </component>
-    </collection>
-    <collection name="realtimenetprots" long-name="Real-time Internet Protocols" level="server">
-     <component name="rtp" long-name="RTP" introduced="9.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- Real Time Data Protocol -->
-      <unit bldFile="/sf/mw/ipappprotocols/realtimenetprots/rtp/group" mrp="/sf/mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
-     </component>
-     <component name="sipfw" long-name="SIP Framework" filter="gt" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="/sf/mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
-     </component>
-    </collection>
-    <collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-     <component name="sipprovider" long-name="SIP Provider" filter="gt" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="/sf/mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
-     </component>
-    </collection>
-    <collection name="ipappprotocols_info" long-name="IP App Protocols Info" level="server">
-     <component unofficial="yes" name="ipappprotocols_plat" long-name="IP App Protocols Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/ipappprotocols_plat/group"/>
-     </component>
-     <component unofficial="yes" name="ipappprotocols_build" long-name="IP App Protocols Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappprotocols/group"/>
-     </component>
-    <component name="ipappprotocols_metadata" long-name="IP App Protocols Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/ipappprotocols/ipappprotocols_info/ipappprotocols_metadata/ipappprotocols_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/ipappprotocols/sources.csv
--- a/3k/mw/ipappprotocols/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/ipappsrv/package_definition.xml
--- a/3k/mw/ipappsrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="ipappsrv" long-name="IP App Services" tech_domain="vc" level="specific" levels="framework  generic server  conn plugin">
-    <collection name="multimediacommscontroller" long-name="Multimedia Comms Controller" level="conn">
-     <component name="mmccinterface" long-name="MMCC Interface" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccinterface/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccinterface/tsrc/ut_interface/group"/> -->
-     </component>
-     <component name="mmccjitterbuffer" long-name="Jitter Buffer" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccjitterbuffer/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccjitterbuffer/tsrc/ut_jitterbuffer/group"/> -->
-     </component>
-     <component name="mmccqoscontroller" long-name="QoS Controller" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccqoscontroller/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccqoscontroller/tsrc/ut_qoscontroller/group"/> -->
-     </component>
-     <component name="mmccmultiplexer" long-name="MMCC Multiplexer" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccmultiplexer/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccmultiplexer/tsrc/ut_multiplexer/group"/> -->
-     </component>
-     <component name="mmccsubcontroller" long-name="MMCC Subcontroller" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/tsrc/ut_rtpmediaclock/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccsubcontroller/tsrc/ut_subcontroller/group"/> -->
-     </component>
-     <component name="mmcccontroller" long-name="MMCC Controller" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmcccontroller/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmcccontroller/tsrc/ut_controller/group"/> -->
-     </component>
-     <component name="mmccredpayloadformat" long-name="RED Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccredpayloadformat/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccredpayloadformat/tsrc/ut_redpayloadformat/group"/> -->
-     </component>
-     <component name="mmccamrpayloadformat" long-name="AMR Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccamrpayloadformat/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccamrpayloadformat/tsrc/ut_amrpayloadformat/group"/> -->
-     </component>
-     <component name="mmccg711payloadformat" long-name="G711 Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccg711payloadformat/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccg711payloadformat/tsrc/ut_g711payloadformat/group"/> -->
-     </component>
-     <component name="mmccg729payloadformat" long-name="G729 Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccg729payloadformat/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccg729payloadformat/tsrc/ut_g729payloadformat/group"/> -->
-     </component>
-     <component name="mmccilbcpayloadformat" long-name="ILBC Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccilbcpayloadformat/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccilbcpayloadformat/tsrc/ut_ilbcpayloadformat/group"/> -->
-     </component>
-     <component name="mmccdtmfpayloadformat" long-name="DTMF Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccdtmfpayloadformat/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccdtmfpayloadformat/tsrc/ut_dtmfpayloadformat/group"/> -->
-     </component>
-     <component name="mmccrtpsourcesink" long-name="RTP Source Sink" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccrtpsourcesink/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccrtpsourcesink/tsrc/ut_rtpsourcesink/group"/> -->
-     </component>
-     <component name="mmccvideosourcesink" long-name="Video Source Sink" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccvideosourcesink/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccvideosourcesink/tsrc/ut_videosourcesink/group"/> -->
-     </component>
-     <component name="mmcch263payloadformat" long-name="H263 Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmcch263payloadformat/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmcch263payloadformat/tsrc/ut_h263payloadformat/group"/> -->
-     </component>
-     <component name="mmccanypayloadformat" long-name="ANY Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccanypayloadformat/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccanypayloadformat/tsrc/ut_anypayloadformat/group"/> -->
-     </component>
-     <component name="mmccfilesourcesink" long-name="MMCC File Source Sink" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccfilesourcesink/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccfilesourcesink/tsrc/ut_filesourcesink/group"/> -->
-     </component>
-     <component name="mmccanysourcesink" long-name="Anysource Sink" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccanysourcesink/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccanysourcesink/tsrc/ut_anysourcesink/group"/> -->
-     </component>
-     <component name="mmccavcpayloadformat" long-name="AVC Payload Format" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccavcpayloadformat/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/mmccavcpayloadformat/tsrc/ut_avcpayloadformat/group"/> -->
-     </component>
-     <component unofficial="yes" name="multimediacommscontroller_build" long-name="Multimedia Comms Controller Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/group"/>
-     </component>
-     <component unofficial="yes" name="multimediacommscontroller_test" long-name="Multimedia Comms Controller Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpsubthreads/dptests/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpsubthreads/clienttests/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/tsrc/componenttests/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/tsrc/subcontrollerstub/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/jitterbuffertestconsole/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/rtpsourcesink/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommscontroller/tsrc/testconsoles/mcpconsole/group"/> -->
-     </component>
-    </collection>
-    <collection name="multimediacommsengine" long-name="Multimedia Comms Engine" level="generic">
-     <component name="mmcecli" long-name="MMCE Client" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcecli/group"/> -->
-     </component>
-     <component name="mmcefloorctrlengine" long-name="MMCE Foor Control Engine" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/fctestpplugin/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/fctestpplugin2/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcefloorctrlengine/tsrc/ut_floorctrlengine/group"/> -->
-     </component>
-     <component name="mmcefloorctrlplugin" long-name="MMCE Foor Control Plugin" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcefloorctrlplugin/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcefloorctrlplugin/tsrc/ut_floorctrlplugin/group"/> -->
-     </component>
-     <component name="mmcesrv" long-name="MMCE Server" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcesrv/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcesrv/mmceevent/tsrc/ut_event/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcesrv/mmceevent/tsrc/ut_event/sip_stub/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcesrv/mmcemediamanager/tsrc/ut_mediamanager/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/mmcesrv/mmceserver/tsrc/ut_server/group"/> -->
-     </component>
-     <component unofficial="yes" name="multimediacommsengine_build" long-name="Multimedia Comms Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/group"/>
-     </component>
-     <component unofficial="yes" name="multimediacommsengine_test" long-name="Multimedia Comms Engine Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/mcetestuiplugin/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/ttcnresolverplugin/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/testdriver/siptester/ttcnresolverplugin2/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/mcetestui/mcetestuiengine/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group/s60_public_sdk"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/iceplugin_stub/tsrc/test/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/testdriver/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/multimediacommsengine/tsrc/mmctestdriver/mcetester/voipplugin/group"/> -->
-     </component>
-    </collection>
-    <collection name="natfw" long-name="NAT Framework" level="framework">
-     <component name="natfwsettings" long-name="NAT Framework Settings" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwsettings/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwsettings/tsrc/ut_cnatfwnatsettings/group"/> -->
-     </component>
-     <component name="natfwconnectionmultiplexer" long-name="NAT Framework Connection Multiplexer" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwconnectionmultiplexer/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwconnectionmultiplexer/tsrc/muxtestconsole/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwconnectionmultiplexer/tsrc/ut_connectionmultiplexer/group"/> -->
-     </component>
-     <component name="natfwclient" long-name="NAT Framework Client" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwclient/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwclient/tsrc/ut_natfwclient/group"/> -->
-     </component>
-     <component name="natfwsocketmediaconnwrapper" long-name="Socket Media Connection Wrapper" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwsocketmediaconnwrapper/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwsocketmediaconnwrapper/tsrc/ut_socketmediaconnwrapper/group"/> -->
-     </component>
-     <component name="natfwunsaf_protocols" long-name="NAT Framework Unsaf Protocols" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwunsaf_protocols/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwunsaf_protocols/tsrc/ut_unsaf_codec/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwunsaf_protocols/tsrc/ut_unsaf_transport/group"/> -->
-     </component>
-     <component name="natfwstunturnclient" long-name="NAT Framework Stun Turn Client" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwstunturnclient/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwstunturnclient/tsrc/ut_stunturnclient/group"/> -->
-     </component>
-     <component name="natfwstunserver" long-name="NAT Framework Stun Server" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwstunserver/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwstunserver/tsrc/ut_cnatfwstunsrv/group"/> -->
-     </component>
-     <component name="natfwicecandidatehandler" long-name="NAT Framework Ice Candidate Handler" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwicecandidatehandler/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwicecandidatehandler/tsrc/ut_icecandidatehandler/group"/> -->
-     </component>
-     <component name="natfwstunplugin" long-name="NAT Framework STUN Plugin" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwstunplugin/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwstunplugin/tsrc/ut_cnatfwstunplugin/group"/> -->
-     </component>
-     <component name="natfwturnplugin" long-name="NAT Framework TURN Plugin" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwturnplugin/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/natfwturnplugin/tsrc/ut_cnatfwturnplugin/group"/> -->
-     </component>
-     <component unofficial="yes" name="natfw_build" long-name="NAT Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappsrv/natfw/group"/>
-     </component>
-     <component unofficial="yes" name="natfw_test" long-name="NAT Framework Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natfw/tsrc/natfwtestconsoles/natfwtestconsole/group"/> -->
-     </component>
-    </collection>
-    <collection name="natplugins" long-name="NAT Plugins" level="plugin">
-     <component name="natpcliprovisioningnatfwadapter" long-name="Client Provisioning NAT Framework Traversal Adapter" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/group"/>
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natplugins/natpcliprovisioningnatfwadapter/tsrc/t_natfwtraversaladapter/group"/> -->
-     </component>
-     <component name="natpdevmgmtnatfwadapter" long-name="Device Management NAT Framework Traversal Adapter" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/group"/>
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natplugins/natpdevmgmtnatfwadapter/tsrc/ut_cnsmldmnatfwtraversaladapter/group"/> -->
-     </component>
-     <component name="natptraversalcontroller" long-name="NAT Traversal Controller" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappsrv/natplugins/natptraversalcontroller/group"/>
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natplugins/natptraversalcontroller/tsrc/ut_nattraversalcontroller/group"/> -->
-     </component>
-     <component name="natpnatfwsdpprovider" long-name="NAT Framework SDP Provider" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappsrv/natplugins/natpnatfwsdpprovider/group"/>
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natplugins/natpnatfwsdpprovider/tsrc/testconsole/group"/> -->
-      <!-- <unit bldFile="/sf/mw/ipappsrv/natplugins/natpnatfwsdpprovider/tsrc/ut_natfwsdpprovider/group"/> -->
-     </component>
-    </collection>
-    <collection name="ipappsrv_info" long-name="IP App Services Info" level="plugin">
-     <component unofficial="yes" name="ipappsrv_plat" long-name="IP App Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappsrv/ipappsrv_plat/group"/>
-     </component>
-     <component unofficial="yes" name="ipappsrv_build" long-name="IP App Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipappsrv/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/ipappsrv/sources.csv
--- a/3k/mw/ipappsrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/ipconnmgmt/package_definition.xml
--- a/3k/mw/ipconnmgmt/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="ipconnmgmt" long-name="IP Connectivity Management" tech_domain="dc" level="generic" levels="plugin framework server generic utils">
-    <collection name="alwayson_net_plugin" long-name="Always On Net Plugin" level="server">
-     <component name="pdpcontextmanager2" long-name="PDP Context Manager 2" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/alwayson_net_plugin/pdpcontextmanager2/group"/>
-     </component>
-     <component unofficial="yes" name="alwayson_net_plugin_build" long-name="Always On Net Plugin Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/alwayson_net_plugin/group"/>
-     </component>
-    </collection>
-    <collection name="bearermanagement" long-name="Bearer Management" level="framework">
-     <component name="mpm" long-name="MPM" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/bearermanagement/mpm/group"/>
-     </component>
-     <component name="bearermanager" long-name="Bearer Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/bearermanagement/bearermanager/group"/>
-     </component>
-     <component unofficial="yes" name="bearermanagement_build" long-name="Bearer Management Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/bearermanagement/group"/>
-     </component>
-    </collection>
-    <collection name="connectionmonitoring" long-name="Connection Monitoring" level="server">
-     <component name="connectionmonitorplugin" long-name="Connection Monitor Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connectionmonitorplugin/group"/>
-     </component>
-     <component name="connectionmonitorui" long-name="Connection Monitor UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connectionmonitorui/group"/>
-     </component>
-     <component name="connmon" long-name="Connection Monitor" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connmon/connectionmonitor/group"/>
-      <unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connmon/dataconnectionlogger/group"/>
-     </component>
-     <component name="connmonext" long-name="Connection Monitor Ext" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/connmonext/group"/>
-     </component>
-     <component unofficial="yes" name="connectionmonitoring_build" long-name="Connection Monitoring Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/connectionmonitoring/group"/>
-     </component>
-    </collection>
-    <collection name="accesspointcontrol" long-name="Access Point Control" level="plugin">
-     <component name="apcontrollistplugin" long-name="Access Point Control List Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/accesspointcontrol/apcontrollistplugin/group"/>
-     </component>
-    </collection>
-    <collection name="apengine" long-name="Application Engine" level="framework">
-     <component name="apeng" long-name="Access Point Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/apengine/apeng/group"/>
-     </component>
-     <component name="apsettingshandlerui" long-name="Access Point Settings Handler UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/apengine/apsettingshandlerui/group"/>
-     </component>
-     <component name="apsettingsplugin" long-name="Access Point Settings Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/apengine/apsettingsplugin/group"/>
-     </component>
-     <component unofficial="yes" name="apengine_build" long-name="Application Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/apengine/group"/>
-     </component>
-    </collection>
-    <collection name="cmmanager" long-name="CM Manager" level="framework">
-     <component name="cmmgr" long-name="CM Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/cmmanager/cmmgr/group"/>
-     </component>
-    </collection>
-    <collection name="dbcreator" long-name="DB Creator" level="utils">
-     <component name="commsdatcreator" long-name="Comms Database Creator" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatcreator/group"/>
-     </component>
-     <component name="commsdatcreatorrfsplugin" long-name="Comms Database Creator RFS Pluginr" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatcreatorrfsplugin/group"/>
-     </component>
-     <component name="commsdatstartup" long-name="Comms Database Startup" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/commsdatstartup/group"/>
-     </component>
-     <component name="dbcreatorexe" long-name="DB Creator" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/dbcreatorexe/group"/>
-     </component>
-     <component unofficial="yes" name="dbcreator_build" long-name="DB Creator Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/dbcreator/group"/>
-     </component>
-    </collection>
-    <collection name="connectionutilities" long-name="Connection Utilities" level="utils">
-     <component name="connectiondialogs" long-name="ConnectionDialogs" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/connectionutilities/connectiondialogs/group"/>
-     </component>
-    </collection>
-    <collection name="ipconnmgmt_info" long-name="IP Connectivity Management Info" level="utils">
-     <component unofficial="yes" name="ipconnmgmt_build" long-name="IP Connectivity Management Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/group"/>
-     </component>
-     <component unofficial="yes" name="ipcm_pub" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/ipcm_pub/group"/>
-     </component>
-     <component unofficial="yes" name="ipcm_plat" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/ipconnmgmt/ipcm_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/ipconnmgmt/sources.csv
--- a/3k/mw/ipconnmgmt/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/legacypresence/package_definition.xml
--- a/3k/mw/legacypresence/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="legacypresence" long-name="Legacy Presence Services" tech_domain="pr" level="specific" levels="engine fw ui">
-    <collection name="xdmengine" long-name="XDM Engine" level="engine">
-     <component name="xdmsettingsapi" long-name="XDM Settings Api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/legacypresence/xdmengine/xdmsettingsapi/group"/> -->
-     </component>
-     <component name="xdmprovisioning" long-name="XDM Provisioning" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/legacypresence/xdmengine/xdmprovisioning/group"/> -->
-     </component>
-     <component name="xdmdevicemanagement" long-name="XDM Device Management" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/legacypresence/xdmengine/xdmdevicemanagement/group"/> -->
-     </component>
-     <component name="xdmengine_build" long-name="XDM Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/legacypresence/xdmengine/group"/>
-     </component>
-    </collection>
-    <collection name="xdmsettingsui" long-name="XDM Settings UI" level="ui">
-     <component name="xdmsettingsui_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/mw/legacypresence/xdmsettingsui/help/group"/>
-     </component>
-     <component unofficial="yes" name="xdmsettingsui_build" long-name="XDM Settings UI Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/legacypresence/xdmsettingsui/group"/>
-     </component>
-    </collection>
-    <collection name="msgconnmanager" long-name="Messaging Connection Manager" level="fw">
-     <component name="msgconnmanager_build" origin-model="foundation">
-      <unit bldFile="/sf/mw/legacypresence/msgconnmanager/group"/>
-     </component>
-    </collection>
-    <collection name="presencefwsimpleadpt" long-name="Presence Framework SIMPLE Adaptor" level="fw">
-     <component name="simpleplugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/legacypresence/presencefwsimpleadpt/group"/>
-     </component>
-    </collection>
-    <collection name="presencesettingsui" long-name="Presence Settings UI" level="ui">
-     <component name="presencesettingsui_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/mw/legacypresence/presencesettingsui/help/group"/>
-     </component>
-     <component unofficial="yes" name="presencesettingsui_build" long-name="Presence Settings UI Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/legacypresence/presencesettingsui/group"/>
-     </component>
-    </collection>
-    <collection name="simpleengine" long-name="SIMPLE Engine" level="engine">
-     <component name="presencesettingsapi" long-name="Presence Settings API" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/legacypresence/simpleengine/presencesettingsapi/group"/> -->
-     </component>
-     <component name="siputils" long-name="SIP Utils" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/legacypresence/simpleengine/siputils/group"/> -->
-     </component>
-     <component name="xmlutils" long-name="XML Utils" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/legacypresence/simpleengine/xmlutils/group"/> -->
-     </component>
-     <component name="simpleengine_engine" long-name="Engine" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/legacypresence/simpleengine/engine/group"/> -->
-     </component>
-     <component name="xdmrlspres" long-name="XDM Rlspres" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/legacypresence/simpleengine/xdmrlspres/group"/> -->
-     </component>
-     <component name="presencedm" long-name="Presence DM" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/legacypresence/simpleengine/presencedm/group"/> -->
-     </component>
-     <component name="presenceprovisioning" long-name="Presence Provisioning" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/legacypresence/simpleengine/presenceprovisioning/group"/> -->
-     </component>
-     <component unofficial="yes" name="simpleengine_build" long-name="SIMPLE Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/legacypresence/simpleengine/group"/>
-     </component>
-    </collection>
-    <collection name="xdmprotocols" long-name="XDM Protocols" level="fw">
-     <component name="xdmxmlparser" long-name="XDM XML Parser" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/xdmxmlparser/group"/> -->
-     </component>
-     <component name="xcapprotocol" long-name="Xcap Protocol" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/xcapprotocol/group"/> -->
-      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/xcapprotocol/xcapappusage/group"/> -->
-      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/xcapprotocol/xcapcache/client/group"/> -->
-      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/xcapprotocol/xcapcache/server/group"/> -->
-      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/xcapprotocol/xcaphttptransport/group"/> -->
-      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/xcapprotocol/xcapoperations/group"/> -->
-      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/xcapprotocol/xcaputils/group"/> -->
-     </component>
-     <component name="localprotocol" long-name="Local Protocol" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/localprotocol/group"/> -->
-      <!-- <unit bldFile="/sf/mw/legacypresence/xdmprotocols/localprotocol/localoperations/group"/> -->
-     </component>
-     <component unofficial="yes" name="xdmprotocols_build" long-name="XDM Protocols Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/legacypresence/xdmprotocols/group"/>
-     </component>
-    </collection>
-    <collection name="simpledatamodeladapter" long-name="SIMPLE Data Mode Aadapter" level="fw">
-     <component name="presenceplugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/legacypresence/simpledatamodeladapter/group"/>
-     </component>
-    </collection>
-    <collection name="legacypresence_info" long-name="Legacy Presence Services Info" level="ui">
-     <component unofficial="yes" name="pressrv_plat" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/legacypresence/pressrv_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/legacypresence/sources.csv
--- a/3k/mw/legacypresence/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/locationsrv/package_definition.xml
--- a/3k/mw/locationsrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="locationsrv" long-name="Location Services" tech_domain="lo" level="specific" levels="plugins fw interface">
-    <collection name="landmarks" long-name="Landmarks" level="fw">
-     <component name="locationlandmarks" long-name="Location Landmarks" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/landmarks/locationlandmarks/group"/>
-     </component>
-     <component unofficial="yes" name="landmarks_build" long-name="Landmarks Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/landmarks/group"/>
-     </component>
-    </collection>
-    <collection name="locationmapnavfw" long-name="Location Map Nav Framework" level="fw">
-     <component name="library" long-name="Library" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/locationmapnavfw/library/group"/>
-     </component>
-     <component name="aiwprovider" long-name="Application Inter-Working Provider" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-     </component>
-     <component unofficial="yes" name="locationmapnavfw_build" long-name="Location Map Nav Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/locationmapnavfw/group"/>
-     </component>
-    </collection>
-    <collection name="locationsystemui" long-name="Location System UI" level="interface">
-     <component name="locationsysui" long-name="Location Sys UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/locationsystemui/locationsysui/group"/>
-     </component>
-     <component unofficial="yes" name="locationsystemui_build" long-name="Location System UI Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/locationsystemui/group"/>
-     </component>
-    </collection>
-    <collection name="supl" long-name="SUPL" level="plugins">
-     <component name="locationsuplfw" long-name="Location SUPL Framework" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/supl/locationsuplfw/group"/>
-     </component>
-     <component name="locationomasuplprotocolhandler" long-name="Location OMA SUPL Protocol Handler" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/supl/locationomasuplprotocolhandler/group"/>
-     </component>
-     <component name="locationomasuplpostester" long-name="Location OMA SUPL Pos Tester" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/supl/locationomasuplpostester/group"/>
-     </component>
-     <component unofficial="yes" name="supl_build" long-name="SUPL Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/supl/group"/>
-     </component>
-    </collection>
-    <collection name="locationtriggering" long-name="Location Triggering" level="interface">
-     <component name="ltlogger" long-name="LT Logger" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltlogger/group"/>
-     </component>
-     <component name="ltclientlib" long-name="LT Client Lib" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltclientlib/group"/>
-     </component>
-     <component name="ltmanagementlib" long-name="LT Management Library" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltmanagementlib/group"/>
-     </component>
-     <component name="ltcontainer" long-name="LT Container" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltcontainer/group"/>
-     </component>
-     <component name="ltserver" long-name="LT Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltserver/group"/>
-     </component>
-     <component name="ltstrategypluginapi" long-name="LT Strategy Plugin API" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltstrategypluginapi/group"/>
-     </component>
-     <component name="ltstrategyengine" long-name="LT Strategy Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltstrategyengine/group"/>
-     </component>
-     <component name="ltmovementdetectionpluginapi" long-name="Movement Detection Plugin API" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltmovementdetectionpluginapi/group"/>
-     </component>
-     <component name="ltcellidmovementdetector" long-name="Cell ID Movement Detector" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
-     </component>
-     <component name="lbtmgmtui" long-name="LBT Management UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-     </component>
-     <component unofficial="yes" name="locationtriggering_test" long-name="Location Triggering Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreatetest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/createtest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/handlingprocesstest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity2_exe/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancellisttriggerstest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelcreateiteratortest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity3_exe/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/firingofstartuptriggerandlisttrigger/createtest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity4_exe/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelgettriggerstest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/modifytest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/createtest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity5_exe/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/notificationtest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/cancelsettriggerstest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtcancellationtest/canceldeletetest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/additionaltests/deletetest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locationtriggering/tsrc/lbtengine_test/lbtplatsectest/testlbtplatsecurity1_exe/group"/> -->
-     </component>
-     <component unofficial="yes" name="locationtriggering_build" long-name="Location Triggering Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/locationtriggering/group"/>
-     </component>
-    </collection>
-    <collection name="locationsrv_info" long-name="Location Services Info" level="interface">
-     <component unofficial="yes" name="locsrv_plat" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/geocoding_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/geocoding_api/tsrc/mapnavproviderrefapp/group"/> -->
-      <unit bldFile="/sf/mw/locationsrv/locsrv_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/location_centre_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/location_settings_launch_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_image_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_image_api/tsrc/testprovider/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/oma_supl_asn_codec_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/supl_network_initiation_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/supl_pos_message_plugin_api/tsrc/posmsgpluginreferenceimpl/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/supl_settings_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="genericpositioningplugins" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/genericpositioningplugins/group"/>
-     </component>
-     <component unofficial="yes" name="locationsrv_test" long-name="Location Services Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/locationsrv/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="locationsrv_build" long-name="Location Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/group"/>
-     </component>
-     <component unofficial="yes" name="locsrv_pub" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/bc_blid_application_satellite_info_api/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_pub/blid_application_satellite_info_api/tsrc/ut_csatelliteuitest/group"/> -->
-      <unit bldFile="/sf/mw/locationsrv/locsrv_pub/group"/>
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_pub/landmarks_api/tsrc/bc_landmarks_api/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_pub/landmarks_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/bc_landmarks_database_management_api/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_pub/landmarks_database_management_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/bc_landmarks_search_api/group"/> -->
-      <!-- <unit bldFile="/sf/mw/locationsrv/locsrv_pub/landmarks_search_api/tsrc/group"/> -->
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/locationsrv/sources.csv
--- a/3k/mw/locationsrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/mds/package_definition.xml
--- a/3k/mw/mds/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="mds" long-name="Metadata Services" tech_domain="mm" level="specific" levels="mgr eng server int">
-    <collection name="clfwrapper" long-name="CLF Wrapper" level="int">
-     <component unofficial="yes" name="clfwrapper_build" long-name="CLF Wrapper Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/clfwrapper/group"/>
-     </component>
-    </collection>
-    <collection name="contextengine" long-name="Context Engine" level="eng">
-     <component name="contextengine_plugins" long-name="Plugins" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/contextengine/plugins/group"/>
-     </component>
-     <component unofficial="yes" name="contextengine_build" long-name="Context Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/contextengine/group"/>
-     </component>
-    </collection>
-    <collection name="harvester" long-name="Harvester" level="eng">
-     <component name="blacklistclient" long-name="Blacklist Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/harvester/blacklistclient/group"/>
-     </component>
-     <component name="blacklistserver" long-name="Blacklist Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/harvester/blacklistserver/group"/>
-     </component>
-     <component name="harvester_common" long-name="Common" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/harvester/common/group"/>
-     </component>
-     <component name="composerplugins" long-name="Composer Plugins" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/harvester/composerplugins/group"/>
-     </component>
-     <component name="harvesterplugins" long-name="Harvester Plugins" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/mds/harvester/harvesterplugins/audioplaylistplugin/group"/> -->
-      <unit bldFile="/sf/mw/mds/harvester/harvesterplugins/group"/>
-     </component>
-     <component name="monitorplugins" long-name="Monitor Plugins" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/harvester/monitorplugins/group"/>
-     </component>
-     <component name="harvester_server" long-name="Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/harvester/server/group"/>
-     </component>
-     <component name="harvester_client" long-name="Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/harvester/client/group"/>
-     </component>
-     <component unofficial="yes" name="harvester_build" long-name="Harvester Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/harvester/group"/>
-     </component>
-    </collection>
-    <collection name="locationmanager" long-name="Location Manager" level="mgr">
-     <component name="locationtrail" long-name="Location Trail" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/locationmanager/locationtrail/group"/>
-     </component>
-     <component name="locationmanager_server" long-name="Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/locationmanager/server/group"/>
-     </component>
-     <component name="locationmanager_client" long-name="Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/locationmanager/client/group"/>
-     </component>
-     <component unofficial="yes" name="locationmanager_build" long-name="Location Manager Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/locationmanager/group"/>
-     </component>
-    </collection>
-    <collection name="metadataengine" long-name="Metadata Engine" level="eng">
-     <component name="metadataengine_common" long-name="Common" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/metadataengine/common/group"/>
-     </component>
-     <component name="metadataengine_server" long-name="Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/metadataengine/server/group"/>
-     </component>
-     <component name="metadataengine_client" long-name="Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/metadataengine/client/group"/>
-     </component>
-     <component unofficial="yes" name="metadataengine_build" long-name="Metadata Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/metadataengine/group"/>
-     </component>
-    </collection>
-    <collection name="watchdog" long-name="Watchdog" level="server">
-     <component name="mdswatchdog" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/watchdog/group"/>
-     </component>
-    </collection>
-    <collection name="iadstoprestart" long-name="IAD Stop Restart" level="server">
-     <component unofficial="yes" name="iadstoprestart_build" long-name="IAD Stop Restart Build" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/mds/iadstoprestart/group"/> -->
-     </component>
-    </collection>
-    <collection name="mds_info" long-name="Metadata Services Info" level="int">
-     <component unofficial="yes" name="mds_pub" long-name="Metadata Services Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/mds_pub/group"/>
-     </component>
-     <component unofficial="yes" name="mds_plat" long-name="Metadata Services Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/mds/mds_plat/content_listing_framework_collection_manager_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mds/mds_plat/context_engine_plugin_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/mds/mds_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/composerplugintest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterclienttest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterdatatest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/harvesterplugintest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mds/mds_plat/harvester_framework_api/tsrc/monitorplugintest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mds/mds_plat/location_manager_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mds/mds_plat/metadata_engine_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="mds_build" long-name="Metadata Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mds/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/mds/sources.csv
--- a/3k/mw/mds/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mds/,/sf/mw/mds,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/messagingmw/package_definition.xml
--- a/3k/mw/messagingmw/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="messagingmw" long-name="Messaging Middleware" tech_domain="pr" level="specific" levels="stack fw api">
-    <collection name="msgbranched" long-name="Messaging Branched" level="fw">
-     <component name="msgbranched_build" origin-model="foundation">
-      <unit bldFile="/sf/mw/messagingmw/msgbranched/group"/>
-     </component>
-    </collection>
-    <collection name="messagingfw" long-name="Messaging FW" level="fw">
-     <component name="alwaysonline" long-name="Always Online" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/alwaysonline/alwaysonlinemanager/group"/> -->
-      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/alwaysonline/alwaysonlinestarterapp/group"/> -->
-      <unit bldFile="/sf/mw/messagingmw/messagingfw/alwaysonline/group"/>
-     </component>
-     <component name="msgcommonutils" long-name="Messaging Common Utils" origin-model="foundation">
-      <unit bldFile="/sf/mw/messagingmw/messagingfw/msgcommonutils/group"/>
-     </component>
-     <component name="senduiservices" long-name="Send UI Services" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/senduiservices/datautils/group"/> -->
-      <unit bldFile="/sf/mw/messagingmw/messagingfw/senduiservices/group"/>
-      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/senduiservices/launcher/group"/> -->
-      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/senduiservices/serviceresolver/group"/> -->
-      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/senduiservices/watcher/group"/> -->
-     </component>
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="scheduledsendmtm">
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/scheduledsendmtm/schedulesendexe/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/scheduledsendmtm/schedulesendmtm/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/scheduledsendmtm/test/group"/>
-     </component>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="msgsrvnstore">
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgsrvnstore/mtmbase/group"/>
-       -  <unit bldFile="/sf/mw/messagingmw/messagingfw/msgsrvnstore/mtmbase/test/group"/>  -
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgsrvnstore/server/group"/>
-       -  <unit bldFile="/sf/mw/messagingmw/messagingfw/msgsrvnstore/server/test/testrom"/>  -
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgsrvnstore/serverexe/group"/>
-     </component>-->
-     <!--Component manually removed as empty and name conflicts with an OS component-->
-     <!--<component name="biomsgfw">
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/bdb"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/bifu"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/bioc"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/bios"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/biowatchers"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/bits"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/biut"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/cbcp"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/enp"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/gfp"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/iacp"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/rom"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/t_biomsg/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/wapp"/>
-     </component>-->
-     <!--Component manually removed as empty and name conflicts with an OS component-->
-     <!--<component name="msgconf"/>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="watcherfw">
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/watcherfw/test/group"/>
-     </component>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="msgtest">
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgtest/integration/group"/>
-       -  <unit bldFile="/sf/mw/messagingmw/messagingfw/msgtest/targetautomation"/>  -
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgtest/testsuites/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgtest/testutils/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgtest/tools/group"/>
-     </component>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="biowatchers">
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biowatchers/cdmanbswatcher/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biowatchers/cdmasocketwatcher/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biowatchers/cdmawatchervmn/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biowatchers/cdmawatcherwemt/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biowatchers/cdmawatcherwmt/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biowatchers/cdmawatcherwpt/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/biowatchers/test/group"/>
-     </component>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="sendas">
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/sendas/client/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/sendas/editutils/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/sendas/server/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/sendas/test/group"/>
-     </component>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="msgurlhandler">
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgurlhandler/test/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/msgurlhandler/urlhandler/group"/>
-     </component>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="wappushfw">
-       -  <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/examples/pushapphandlerex"/>  -
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/miscpushmsgutils/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/plugins/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/plugins/wapurilookup/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/pushmsgentry/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/pushmtm/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/pushutils/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/pushwatcher/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/roaptcontenthandler/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/rocontenthandler/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/rom"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/sislcontenthandlers/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/sislpushmsgutils/group"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/tpush"/>
-       <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/tpushscriptbased"/>
-     </component>-->
-     <component name="suplsmshandler" origin-model="foundation"/>
-     <component name="suplwappushhandler" origin-model="foundation"/>
-    <component name="scheduledsendmtm" long-name="Scheduled Send MTM" introduced="6.0" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/mw/messagingmw/messagingfw/scheduledsendmtm/group" mrp="/sf/mw/messagingmw/messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp"/>
-     </component>
-     <component name="msgsrvnstore" long-name="Message Server and Store" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/messagingmw/messagingfw/msgsrvnstore/group" mrp="/sf/mw/messagingmw/messagingfw/msgsrvnstore/group/messaging_framework.mrp"/>
-     </component>
-     <component name="biomsgfw" long-name="BIO Messaging Framework" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/messagingmw/messagingfw/biomsgfw/group" mrp="/sf/mw/messagingmw/messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
-     </component>
-     <component name="msgconf" long-name="Messaging Config" introduced="tb91" purpose="optional" class="config" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/messagingmw/messagingfw/msgconf/group" mrp="/sf/mw/messagingmw/messagingfw/msgconf/group/messaging_config.mrp"/>
-     </component>
-     <component name="watcherfw" long-name="Watcher Framework" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/messagingmw/messagingfw/watcherfw/group" mrp="/sf/mw/messagingmw/messagingfw/watcherfw/group/messaging_watcher.mrp"/>
-     </component>
-     <component name="msgtest" long-name="Messaging Test" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/messagingmw/messagingfw/msgtest/group" mrp="/sf/mw/messagingmw/messagingfw/msgtest/group/messaging_test.mrp"/>
-     </component>
-     <component name="msgtests" long-name="Messaging Tests" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/messagingmw/messagingfw/msgtests/group/messaging.mrp"/>
-     </component>
-     <component name="msgtestfw" long-name="Messaging Test Framework" deprecated="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/messagingmw/messagingfw/msgtestfw/group/messaging_testframework.mrp"/>
-     </component>
-     <component name="msgtestproduct" long-name="Messaging Test Product" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/messagingmw/messagingfw/msgtestproduct/group/messaging_testproduct.mrp"/>
-     </component>
-     <component name="biowatchers" long-name="BIO Watchers" introduced="8.0" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/mw/messagingmw/messagingfw/biowatchers/Group" mrp="/sf/mw/messagingmw/messagingfw/biowatchers/Group/messaging_biomsg_biowatchers_cdma.mrp"/>
-     </component>
-     <component name="sendas" long-name="Send As" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/messagingmw/messagingfw/sendas/group" mrp="/sf/mw/messagingmw/messagingfw/sendas/group/messaging_sendas2.mrp"/>
-     </component>
-     <component name="msgurlhandler" long-name="Message URL Handler" introduced="7.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/messagingmw/messagingfw/msgurlhandler/group" mrp="/sf/mw/messagingmw/messagingfw/msgurlhandler/group/messaging_urlhandler.mrp"/>
-     </component>
-     <component name="wappushfw" long-name="WAP Push Framework" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/messagingmw/messagingfw/wappushfw/group" mrp="/sf/mw/messagingmw/messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
-     </component>
-     <component name="n:suplsmshandler" long-name="SUPL SMS Handler" introduced="tb91" purpose="development" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/suplsmshandler/group" mrp="mw/messagingmw/messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/> -->
-     </component>
-     <component name="n:suplwappushhandler" long-name="SUPL WAP Push Handler" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/messagingmw/messagingfw/suplwappushhandler/group" mrp="mw/messagingmw/messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="messagingmw_info" long-name="Messaging Middleware Info" level="api">
-     <component unofficial="yes" name="msgfw_pub" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/messagingmw/msgfw_pub/group"/>
-      <!-- <unit bldFile="/sf/mw/messagingmw/msgfw_pub/send_ui_api/tsrc/bc/group"/> -->
-      <unit bldFile="/sf/mw/messagingmw/msgfw_pub/send_ui_api/tsrc/group"/>
-     </component>
-     <component unofficial="yes" name="messagingmw_build" long-name="Messaging Middleware Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/messagingmw/group"/>
-     </component>
-     <component unofficial="yes" name="msgfw_plat" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/messagingmw/msgfw_plat/group"/>
-      <unit bldFile="/sf/mw/messagingmw/msgfw_plat/send_ui_plugin_api/tsrc/group"/>
-     </component>
-    <component name="messagingmw_metadata" long-name="Messaging Middleware Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/messagingmw/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/messagingmw/sources.csv
--- a/3k/mw/messagingmw/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/metadatasrv/package_definition.xml
--- a/3k/mw/metadatasrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="metadatasrv" long-name="Legacy Metadata Services" tech_domain="mm" level="specific" levels="plugin framework server generic specific">
-    <collection name="contentlistingframework" long-name="Content Listing Framework" level="framework">
-     <component unofficial="yes" name="contentlistingframework_build" long-name="Content Listing Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/metadatasrv/contentlistingframework/group"/>
-     </component>
-    </collection>
-    <collection name="mediamanagementuis" long-name="Media Management UIs" level="server">
-     <component name="mediastylegrid" long-name="Media Style Grid" origin-model="foundation">
-      <unit bldFile="/sf/mw/metadatasrv/mediamanagementuis/mediastylegrid/group"/>
-     </component>
-    </collection>
-    <collection name="mediamanagementutilities" long-name="Media Management utilities" level="generic">
-     <component name="mediafetch" long-name="Media Fetch" origin-model="foundation">
-      <unit bldFile="/sf/mw/metadatasrv/mediamanagementutilities/mediafetch/group"/>
-     </component>
-    </collection>
-    <collection name="metadatasrv_info" long-name="Legacy Metadata Services Info" level="specific">
-     <component unofficial="yes" name="metadatasrv_plat" long-name="Legacy Metadata Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/metadatasrv/metadatasrv_plat/group"/>
-     </component>
-     <component unofficial="yes" name="metadatasrv_build" long-name="Legacy Metadata Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/metadatasrv/group"/>
-     </component>
-     <component unofficial="yes" name="metadatasrv_pub" long-name="Legacy Metadata Services Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/metadatasrv/metadatasrv_pub/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/metadatasrv/sources.csv
--- a/3k/mw/metadatasrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/mmappfw/package_definition.xml
--- a/3k/mw/mmappfw/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="mmappfw" long-name="Multimedia App Framework" tech_domain="mm" level="specific" levels="empty fw utils">
-    <collection name="mmappcomponents" long-name="MM App Components" level="utils">
-     <component name="collectionhelper" long-name="Collection Helper" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmappfw/mmappcomponents/collectionhelper/group"/>
-     </component>
-     <component name="playlistengine" long-name="Playlist Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmappfw/mmappcomponents/playlistengine/group"/>
-     </component>
-     <component name="mmappfwharvester" long-name="Harvester" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmappfw/mmappcomponents/harvester/group"/>
-     </component>
-     <component name="mmappcommonui" long-name="MM App Common UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmappfw/mmappcomponents/mmappcommonui/group"/>
-     </component>
-     <component name="mediaplayersettingsengine" long-name="Media Player Settings Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmappfw/mmappcomponents/mediaplayersettingsengine/group"/>
-     </component>
-     <component name="audiofetcher" long-name="UUDIO Fetcher" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmappfw/mmappcomponents/audiofetcher/group"/>
-     </component>
-     <component name="asxparser" long-name="ASX Parser" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmappfw/mmappcomponents/asxparser/group"/>
-      <!-- <unit bldFile="/sf/mw/mmappfw/mmappcomponents/asxparser/test"/> -->
-     </component>
-    </collection>
-    <collection name="mpx" long-name="MPX" level="fw">
-     <component name="commonframework" long-name="Common Framework" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmappfw/mpx/commonframework/group"/>
-     </component>
-     <component name="playbackframework" long-name="Playback Framework" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmappfw/mpx/playbackframework/group"/>
-     </component>
-     <component name="mpxcollectionfw" long-name="Collection Framework" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmappfw/mpx/collectionframework/group"/>
-     </component>
-     <component name="mpxviewfw" long-name="View Framework" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmappfw/mpx/viewframework/group"/>
-     </component>
-     <component unofficial="yes" name="mpx_build" long-name="MPX Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmappfw/mpx/group"/>
-     </component>
-    </collection>
-    <collection name="mmappfw_info" long-name="Multimedia App Framework Info" level="utils">
-     <component unofficial="yes" name="mmappfw_build" long-name="Multimedia App Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmappfw/group"/>
-     </component>
-     <component unofficial="yes" name="mmappfw_test" long-name="Multimedia App Framework Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/mmappfw/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/asx_parser_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/collection_helper_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/group"/>
-      <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/harvester_collection_mediator_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/harvester_metadata_extractor_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/harvester_utility_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/media_player_settings_engine_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_albumart_utility_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_base_view_plugins_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_collection_utility_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_common_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_playback_utility_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/mpx_view_utility_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmappfw/mmappfw_plat/playlist_engine_api/tsrc/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/mmappfw/sources.csv
--- a/3k/mw/mmappfw/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/mmmw/package_definition.xml
--- a/3k/mw/mmmw/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="mmmw" long-name="Multimedia Middleware" tech_domain="mm" level="generic" levels="plugin framework server generic specific">
-    <collection name="radioutility" long-name="Radio Utility" level="generic">
-     <component name="radioserver" long-name="Radio Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/radioutility/radioserver/group"/>
-      <!-- <unit bldFile="/sf/mw/mmmw/radioutility/radioserver/server/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/radioutility/radioserver/session/group"/> -->
-     </component>
-     <component name="radio_utility" long-name="Radio Utility" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/radioutility/radio_utility/group"/>
-     </component>
-     <component name="fmpresetutility" long-name="FM Preset Utility" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/radioutility/fmpresetutility/group"/>
-     </component>
-     <component unofficial="yes" name="radioutility_build" long-name="Radio Utility Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/radioutility/group"/>
-     </component>
-    </collection>
-    <collection name="mtp" long-name="MTP" level="framework">
-     <component name="mtpserver" long-name="Mtp Server" origin-model="foundation"/>
-     <component name="mtpusbclass" long-name="MTP USB Class" origin-model="foundation"/>
-     <component name="install" long-name="Install" origin-model="foundation"/>
-    </collection>
-    <collection name="audioeffectsui" long-name="Audio Effects UI" level="specific">
-     <component name="equalizer" long-name="Equalizer" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/audioeffectsui/equalizer/group"/>
-     </component>
-     <component unofficial="yes" name="audioeffectsui_build" long-name="Audio Effects UI Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/audioeffectsui/group"/>
-     </component>
-    </collection>
-    <collection name="audioenhancements" long-name="Audio Enhancements" level="generic">
-     <component name="enhancedaudioplayerutility" long-name="Enhanced Media Client" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/mmmw/audioenhancements/enhancedaudioplayerutility/audioplayer/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/audioenhancements/enhancedaudioplayerutility/audiostreaming/group"/> -->
-      <unit bldFile="/sf/mw/mmmw/audioenhancements/enhancedaudioplayerutility/group"/>
-      <!-- <unit bldFile="/sf/mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audiosource/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audiosourcefactory/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/audioenhancements/enhancedaudioplayerutility/s60audioutility/group"/> -->
-     </component>
-     <component name="progressivedownload" long-name="Progressive Download" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/audioenhancements/progressivedownload/group"/>
-      <!-- <unit bldFile="/sf/mw/mmmw/audioenhancements/progressivedownload/progressivedownloadsource/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/audioenhancements/progressivedownload/progressivedownloadutility/group"/> -->
-     </component>
-     <component name="enhancedmediaclient" long-name="Enhanced Media Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/audioenhancements/enhancedmediaclient/group"/>
-     </component>
-     <component name="profilesettingsmonitor" long-name="Profile Settings Monitor" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/audioenhancements/profilesettingsmonitor/group"/>
-     </component>
-     <component name="voipaudioservices" long-name="VoIP Audio Services" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/audioenhancements/voipaudioservices/group"/>
-     </component>
-     <component name="configurationcomponentsfactory" long-name="Configuration Components Factory" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/audioenhancements/configurationcomponentsfactory/group"/>
-     </component>
-     <component name="audiooutputcontrolutility" long-name="Audio Output Control Utility" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/audioenhancements/audiooutputcontrolutility/group"/>
-     </component>
-     <component name="callaudiocontrol" long-name="Call Audio Control" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/audioenhancements/callaudiocontrol/group"/>
-     </component>
-     <component unofficial="yes" name="audioenhancements_build" long-name="Audio Enhancements Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/audioenhancements/group"/>
-     </component>
-    </collection>
-    <collection name="metadatautility" long-name="Metadata Utility" level="generic">
-     <component name="3gpextparserlib" origin-model="foundation"/>
-     <component name="3gpextparserlib_stub" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/metadatautility/3gpextparserlib_stub/group"/>
-     </component>
-     <component name="metadatautility_build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/metadatautility/group"/>
-     </component>
-    </collection>
-    <collection name="advancedaudiocontroller" long-name="Advanced Audio Controller" level="plugin">
-     <component name="audiocontrollerpluginsvariant" long-name="Audio Controller Plugins Variant" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudioplaycontroller/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpaudiorecordcontroller/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/3gpdatasourceadapter/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/aacaudioplaycontroller/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/advancedaudiocontroller/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/advancedaudiocontrollerutility/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudioplaycontroller/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/amraudiorecordcontroller/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/awbaudioplaycontroller/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/datasourceadapter/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/devsoundaudioinput/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/devsoundaudiooutput/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/fileaudiooutput/group"/> -->
-      <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/group"/>
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/hxaudiorecognizer/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/metadatawrite/group"/> -->
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/audiocontrollerpluginsvariant/mp3audioplaycontroller/group"/> -->
-     </component>
-     <component name="wavplaycontrollerplugin" long-name="WAV Play Controller Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/wavplaycontrollerplugin/group"/>
-     </component>
-     <component unofficial="yes" name="advancedaudiocontroller_test" long-name="Advanced Audio Controller Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/> -->
-     </component>
-     <component unofficial="yes" name="advancedaudiocontroller_build" long-name="Advanced Audio Controller Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/advancedaudiocontroller/group"/>
-     </component>
-    </collection>
-    <collection name="thumbnailengine" long-name="Thumbnail Engine" level="server">
-     <component name="tneengine" long-name="TNE Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/thumbnailengine/group"/>
-     </component>
-    </collection>
-    <collection name="mmfw" long-name="Multimedia Framework" level="framework">
-     <component name="gstreamer" long-name="GStreamer" origin-model="foundation"/>
-     <component name="helix_stub" long-name="Helix Stub" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/mmfw/helix_stub/group"/>
-     </component>
-     <component unofficial="yes" name="mmfw_build" long-name="Multimedia Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/mmfw/group"/>
-     </component>
-    </collection>
-    <collection name="mmmiddlewarefws" long-name="Multimedia Middleware Frameworks" level="server">
-     <component name="mmfw" long-name="Multimedia Framework" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/group" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/group/multimedia_mmf.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmmiddlewareplugins" long-name="Multimedia Middleware Plugins" level="framework">
-     <component name="mmfwplugins" long-name="Multimedia Framework Plugins" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/group_plugin" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/group_plugin/multimedia_mmf_plugin.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmfwtest" long-name="Multimedia Framework Test" level="server">
-     <component name="mmfunittest" long-name="MMF Unit Tests" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/mmmw/mmfwtest/mmfunittest/group/multimedia_unittest_mmf_source.mrp"/>
-     </component>
-     <component name="mmfintegrationtest" long-name="MMF Integration Tests" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/mmmw/mmfwtest/mmfintegrationtest/group/multimedia_inttest_mmf_source.mrp"/>
-     </component>
-     <component name="mmfcharacterisationvalidation" long-name="MMF Characterisation Validation" introduced="9.3" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group" mrp="/sf/mw/mmmw/mmfwtest/mmfcharacterisationvalidation/group/multimedia_mmf_char.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmvalidationsuite" long-name="Multimedia Validation Suite" level="specific">
-     <component name="mmvalidationsuiteapp" long-name="Multimedia Validation Suite Application" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group" mrp="/sf/mw/mmmw/mmvalidationsuite/mmvalidationsuiteapp/group/multimedia_mvs_app.mrp"/>
-     </component>
-     <component name="mmvalidationsuiteagents" long-name="Multimedia Validation Suite Agents" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group" mrp="/sf/mw/mmmw/mmvalidationsuite/mmvalidationsuiteagents/group/multimedia_mvs_agents.mrp"/>
-     </component>
-     <component name="mvsintegrationtest" long-name="MVS Integration Tests" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/mmmw/mmvalidationsuite/mvsintegrationtest/group/multimedia_inttest_mvs_source.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmmw_info" long-name="Multimedia Middleware Info" level="specific">
-     <component unofficial="yes" name="mmmw_build" long-name="Multimedia Middleware Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/group"/>
-     </component>
-     <component unofficial="yes" name="mmmw_test" long-name="Multimedia Middleware Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/mmmw/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="mmmw_plat" long-name="Multimedia Middleware Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmmw/mmmw_plat/audio_metadata_reader_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmmw/mmmw_plat/audio_output_control_utility_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmmw/mmmw_plat/call_audio_control_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmmw/mmmw_plat/enhanced_media_client_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmmw/mmmw_plat/group"/>
-      <unit bldFile="/sf/mw/mmmw/mmmw_plat/radio_utilities_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/mmmw/mmmw_plat/voip_audio_services_api/tsrc/group"/>
-     </component>
-    <component name="mmmw_metadata" long-name="Multimedia Middleware Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/mmmw/mmmw_info/mmmw_metadata/mmmw_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/mmmw/sources.csv
--- a/3k/mw/mmmw/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/mmuifw/package_definition.xml
--- a/3k/mw/mmuifw/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="mmuifw" long-name="Multimedia UI Framework" tech_domain="mm" level="specific" levels="mgr mdl util ui">
-    <collection name="alfwidgetutils" long-name="ALF Widget Utils" level="ui">
-     <component name="alfwidgetutils_build" long-name="ALF Widget Utils Component" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmuifw/alfwidgetutils/group"/>
-     </component>
-    </collection>
-    <collection name="mulwidgets" long-name="MUL Widgets" level="ui">
-     <component name="mullogging" long-name="Mul Logging" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmuifw/mulwidgets/mullogging/group"/>
-     </component>
-     <component name="muldatamodel" long-name="Mul Data Model" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmuifw/mulwidgets/muldatamodel/group"/>
-     </component>
-     <component name="mulwidgets_common" long-name="Common" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmuifw/mulwidgets/common/group"/>
-     </component>
-     <component name="gesturehelper" long-name="Gesture Helper" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmuifw/mulwidgets/gesturehelper/group"/>
-     </component>
-     <component name="mulcoverflowwidget" long-name="MUL Coverflow Widget" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmuifw/mulwidgets/mulcoverflowwidget/group"/>
-     </component>
-     <component name="mulsliderwidget" long-name="Mul Slider Widget" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmuifw/mulwidgets/mulsliderwidget/group"/>
-     </component>
-     <component name="alfviewwidget" long-name="ALF View Widget" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmuifw/mulwidgets/alfviewwidget/group"/>
-     </component>
-     <component name="alfcontainerwidget" long-name="ALF Container Widget" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmuifw/mulwidgets/alfcontainerwidget/group"/>
-     </component>
-     <component name="alfscrollbarwidget" long-name="ALF Scrollbar Widget" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmuifw/mulwidgets/alfscrollbarwidget/group"/>
-     </component>
-     <component unofficial="yes" name="mulwidgets_build" long-name="MUL Widgets Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmuifw/mulwidgets/group"/>
-     </component>
-    </collection>
-    <collection name="osncore" long-name="OSN Core" level="util">
-     <component name="osncore_build" long-name="OSN Core" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmuifw/osncore/group"/>
-     </component>
-     
-    </collection>
-    <collection name="resourcepool" long-name="Resource Pool" level="util">
-     <component name="alfresourcepool" long-name="ALF Resource Pool" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmuifw/resourcepool/group"/>
-     </component>
-    </collection>
-    <collection name="widgetmodel" long-name="Widget Model" level="mdl">
-     <component name="alfwidgetmodel" long-name="ALF Widget Model" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/mmuifw/widgetmodel/alfwidgetmodel/group"/> -->
-     </component>
-     <component name="alfwidgetfactory" long-name="ALF Widget Factory" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/mmuifw/widgetmodel/alfwidgetfactory/group"/> -->
-     </component>
-     <component unofficial="yes" name="widgetmodel_build" long-name="Widget Model Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmuifw/widgetmodel/group"/>
-     </component>
-    </collection>
-    <collection name="mmuifw_info" long-name="Multimedia UI Framework Info" level="ui">
-     <component unofficial="yes" name="mmuifw_plat" long-name="Multimedia UI Framework Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmuifw/mmuifw_plat/group"/>
-     </component>
-     <component unofficial="yes" name="mmuifw_build" long-name="Multimedia UI Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/mmuifw/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/mmuifw/sources.csv
--- a/3k/mw/mmuifw/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/netprotocols/package_definition.xml
--- a/3k/mw/netprotocols/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="netprotocols" long-name="High-level Internet Protocols" tech_domain="dc" level="generic" levels="plugin framework server generic specific">
-    <collection name="httpfilters" long-name="HTTP Filters" level="plugin">
-     <component name="httpfiltercommon" long-name="HTTP Filter Common" origin-model="foundation">
-      <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfiltercommon/group"/>
-     </component>
-     <component name="cookie" long-name="Cookie" origin-model="foundation">
-      <unit bldFile="/sf/mw/netprotocols/httpfilters/cookie/group"/>
-     </component>
-     <component name="deflatefilter" long-name="Deflate Filter" origin-model="foundation">
-      <unit bldFile="/sf/mw/netprotocols/httpfilters/deflatefilter/group"/>
-     </component>
-     <component name="httpfilteracceptheader" long-name="HTTP Filter Accept Header" origin-model="foundation">
-      <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilteracceptheader/group"/>
-     </component>
-     <component name="httpfilterauthentication" long-name="HTTP Filter Authentication" origin-model="foundation">
-      <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilterauthentication/group"/>
-     </component>
-     <component name="httpfilterconnhandler" long-name="HTTP Filter Conn Handler" origin-model="foundation">
-      <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilterconnhandler/group"/>
-     </component>
-     <component name="httpfilteriop" long-name="HTTP Filter Iop" origin-model="foundation">
-      <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilteriop/group"/>
-     </component>
-     <component name="httpfilterproxy" long-name="HTTP Filter Proxy" origin-model="foundation">
-      <unit bldFile="/sf/mw/netprotocols/httpfilters/httpfilterproxy/group"/>
-     </component>
-     <component name="uaproffilter" long-name="UAProf Filter" origin-model="foundation">
-      <unit bldFile="/sf/mw/netprotocols/httpfilters/uaproffilter/group"/>
-     </component>
-     <component unofficial="yes" name="httpfilters_build" long-name="HTTP Filters Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/netprotocols/httpfilters/group"/>
-     </component>
-    </collection>
-    <collection name="applayerprotocols" long-name="Application Layer Protocols" level="server">
-     <component name="httptransportfw" long-name="HTTP Transport Framework" introduced="6.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/netprotocols/applayerprotocols/httptransportfw/group" mrp="/sf/mw/netprotocols/applayerprotocols/httptransportfw/group/http_transport-framework.mrp"/>
-     </component>
-     <component name="httpexamples" long-name="HTTP Examples" introduced="6.2" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/netprotocols/applayerprotocols/httpexamples/group" mrp="/sf/mw/netprotocols/applayerprotocols/httpexamples/group/http_examples.mrp"/>
-     </component>
-     <component name="wappushsupport" long-name="WAP Push Support" introduced="6.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/netprotocols/applayerprotocols/wappushsupport/Group" mrp="/sf/mw/netprotocols/applayerprotocols/wappushsupport/Group/wap-browser_wappushsupport.mrp"/>
-     </component>
-     <component name="wapbase" long-name="WAP Base" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/netprotocols/applayerprotocols/wapbase/Group" mrp="/sf/mw/netprotocols/applayerprotocols/wapbase/Group/wap-browser_wapbase.mrp"/>
-     </component>
-     <component name="ftpengine" long-name="FTP Engine" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/netprotocols/applayerprotocols/ftpengine/group" mrp="/sf/mw/netprotocols/applayerprotocols/ftpengine/group/networking_ftp_e.mrp"/>
-     </component>
-     <component name="telnetengine" long-name="Telnet Engine" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/netprotocols/applayerprotocols/telnetengine/group" mrp="/sf/mw/netprotocols/applayerprotocols/telnetengine/group/networking_telnet_e.mrp"/>
-     </component>
-    </collection>
-    <collection name="applayerpluginsandutils" long-name="Application Layer Plugins and Utils" level="framework">
-     <component name="uripermissionservices" long-name="URI Permission Services" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/uripermissionservices/group/application-protocols_ineturilist.mrp"/>
-     </component>
-     <component name="bookmarksupport" long-name="Bookmark Support" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/bookmarksupport/group/application-protocols_bookmarks.mrp"/>
-     </component>
-     <component name="httpprotocolplugins" long-name="HTTP Protocol Plugins" introduced="6.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/httpprotocolplugins/group/http_protocol-plugin.mrp"/>
-     </component>
-     <component name="httptransportplugins" long-name="HTTP Transport Plugins" introduced="6.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group" mrp="/sf/mw/netprotocols/applayerpluginsandutils/httptransportplugins/group/http_transport-plugin.mrp"/>
-     </component>
-    </collection>
-    <collection name="n:wapstack" long-name="WAP Stack" level="plugin">
-     <component name="n:wapmessageapi" long-name="WAP Message API" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/netprotocols/wapstack/wapmessageapi/group" mrp="mw/netprotocols/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
-     <component unofficial="yes" name="netprotocols_plat" long-name="High-level Internet Protocols Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/netprotocols/netprotocols_plat/group"/>
-     </component>
-     <component unofficial="yes" name="netprotocols_build" long-name="High-level Internet Protocols Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/netprotocols/group"/>
-     </component>
-    <component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/netprotocols/netprotocols_info/netprotocols_metadata/netprotocols_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/netprotocols/sources.csv
--- a/3k/mw/netprotocols/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/networkingdm/package_definition.xml
--- a/3k/mw/networkingdm/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="networkingdm" long-name="Networking Device Management" tech_domain="dm" level="generic" levels="plugin framework server generic specific">
-    <collection name="clientprovisioning" long-name="Client Provisioning" level="specific">
-     <component name="accesspointadapter" long-name="Access Point Adapter" origin-model="foundation">
-      <unit bldFile="/sf/mw/networkingdm/clientprovisioning/accesspointadapter/group"/>
-     </component>
-     <component name="cpdestinationnwadapter" long-name="CP Destination NW Adapter" origin-model="foundation">
-      <unit bldFile="/sf/mw/networkingdm/clientprovisioning/cpdestinationnwadapter/group"/>
-     </component>
-     <component unofficial="yes" name="clientprovisioning_build" long-name="Client Provisioning Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/networkingdm/clientprovisioning/group"/>
-     </component>
-    </collection>
-    <collection name="devicemanagement" long-name="Device Management" level="specific">
-     <component name="globalwlansettings" long-name="Global WLAN Settings" origin-model="foundation">
-      <unit bldFile="/sf/mw/networkingdm/devicemanagement/globalwlansettings/group"/>
-     </component>
-     <component name="nsmldinternet" long-name="NSMLD Internet" origin-model="foundation">
-      <unit bldFile="/sf/mw/networkingdm/devicemanagement/nsmldinternet/group"/>
-     </component>
-     <component name="nsmldmalwaysonadapter" long-name="Nsmldm Always On Adapter" origin-model="foundation">
-      <unit bldFile="/sf/mw/networkingdm/devicemanagement/nsmldmalwaysonadapter/group"/>
-     </component>
-     <component name="nsmldmbmadapter" long-name="NSMLDM BM Adapter" origin-model="foundation">
-      <unit bldFile="/sf/mw/networkingdm/devicemanagement/nsmldmbmadapter/group"/>
-     </component>
-     <component unofficial="yes" name="devicemanagement_build" long-name="Device Management Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/networkingdm/devicemanagement/group"/>
-     </component>
-    </collection>
-    <collection name="networkingdm_info" long-name="Networking Device Management Info" level="specific">
-     <component unofficial="yes" name="networkingdm_build" long-name="Networking Device Management Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/networkingdm/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/networkingdm/sources.csv
--- a/3k/mw/networkingdm/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/opensrv/package_definition.xml
--- a/3k/mw/opensrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="opensrv" long-name="Open Services" tech_domain="pr" level="specific" levels="prt lib server eng">
-    <collection name="loudmouth" long-name="Loudmouth" level="prt">
-     <component name="loudmouth_build" origin-model="foundation">
-      <unit bldFile="/sf/mw/opensrv/loudmouth/group"/>
-     </component>
-     <component unofficial="yes" name="loudmouth_test" long-name="Loudmouth Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/opensrv/loudmouth/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-     <component name="libtelepathy_build" origin-model="foundation">
-      <unit bldFile="/sf/mw/opensrv/libtelepathy/group"/>
-     </component>
-     <component unofficial="yes" name="libtelepathy_test" long-name="Telepathy Library Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/opensrv/libtelepathy/tsrc/group"/> -->
-     </component>
-    </collection>
-    <collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-     <component unofficial="yes" name="telepathygabble_build" long-name="Telepathy Gabble Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/opensrv/telepathygabble/group"/>
-     </component>
-    </collection>
-    <collection name="isolationserver" long-name="Isloation Server" level="server">
-     <component name="messagequeue" long-name="Message Queue" origin-model="foundation">
-      <unit bldFile="/sf/mw/opensrv/isolationserver/messagequeue/group"/>
-     </component>
-     <component name="isoserver" long-name="ISO Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/opensrv/isolationserver/isoserver/group"/>
-     </component>
-     <component unofficial="yes" name="isolationserver_test" long-name="Isloation Server Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/opensrv/isolationserver/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="isolationserver_build" long-name="Isloation Server Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/opensrv/isolationserver/group"/>
-     </component>
-    </collection>
-    <collection name="opensrv_info" long-name="Open Services Info" level="eng">
-     <component unofficial="yes" name="opensrv_plat" long-name="Open Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/opensrv/opensrv_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/opensrv/opensrv_plat/messagequeue_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="opensrv_build" long-name="Open Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/opensrv/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/opensrv/sources.csv
--- a/3k/mw/opensrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/phonesrv/package_definition.xml
--- a/3k/mw/phonesrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="phonesrv" long-name="Telephony and SIM Services" tech_domain="vc" level="specific" levels="plugin framework server generic specific">
-    <collection name="phonecmdhandler" long-name="Phone Command Handler" level="generic">
-     <component name="phonecmdhnlr" long-name="Phone Command Handler" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonecmdhandler/phonecmdhnlr/group"/>
-     </component>
-    </collection>
-    <collection name="cbs" long-name="Cellular Baseband Services" level="plugin">
-     <component name="cbsserver" long-name="CBS Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/cbs/cbsserver/group"/>
-     </component>
-     <component name="cbsui" long-name="CBS UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/cbs/cbsui/group"/>
-     </component>
-    </collection>
-    <collection name="convergedcallengine" long-name="Converged Call Engine" level="framework">
-     <component name="callprovider" long-name="Call Provider" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/convergedcallengine/callprovider/group"/>
-     </component>
-     <component name="cce" long-name="CCE" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cce/group"/>
-     </component>
-     <component name="spsettings" long-name="SP Settings" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/group"/>
-      <!-- <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="/sf/mw/phonesrv/convergedcallengine/spsettings/tsrc/public/basic/spsettingsut/group"/> -->
-     </component>
-     <component name="cenrepdatabase" long-name="Cenrep Database" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/convergedcallengine/cenrepdatabase/group"/>
-     </component>
-     <component name="serviceselector" long-name="Service Selector" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/convergedcallengine/serviceselector/group"/>
-     </component>
-     <component name="csplugin" long-name="CS Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/convergedcallengine/csplugin/group"/>
-     </component>
-     <component unofficial="yes" name="convergedcallengine_build" long-name="Converged Call Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/convergedcallengine/group"/>
-     </component>
-    </collection>
-    <collection name="networkhandling" long-name="Network Handling" level="plugin">
-     <component name="networkhandlingengine" long-name="Network Handling Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/networkhandling/networkhandlingengine/group"/>
-     </component>
-    </collection>
-    <collection name="phoneclientserver" long-name="Phone Client/Server" level="server">
-     <component name="enpolicy" long-name="En Policy" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/phoneclientserver/enpolicy/group"/>
-     </component>
-     <component name="aiwdialdata" long-name="AIW Dial Data" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/phoneclientserver/aiwdialdata/group"/>
-     </component>
-     <component name="dialutils" long-name="Dial Utils" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/phoneclientserver/dialutils/group"/>
-     </component>
-     <component name="phoneclient" long-name="Phone Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/phoneclientserver/phoneclient/group"/>
-     </component>
-     <component name="phoneserver" long-name="Phones Erver" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/phoneclientserver/phoneserver/group"/>
-     </component>
-     <component name="callui" long-name="Call UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/phoneclientserver/callui/group"/>
-     </component>
-    </collection>
-    <collection name="satengine" long-name="Sat Engine" level="generic">
-     <component name="satserver" long-name="Sat Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/satengine/satserver/group"/>
-     </component>
-     <component unofficial="yes" name="satengine_build" long-name="Sat Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/satengine/group"/>
-     </component>
-    </collection>
-    <collection name="satui" long-name="Sat UI" level="specific">
-     <component name="satapp" long-name="Sat App" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/satui/satapp/group"/>
-     </component>
-     <component name="satplugin" long-name="Sat Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/satui/satplugin/group"/>
-     </component>
-     <component unofficial="yes" name="satui_build" long-name="Sat UI Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/satui/group"/>
-     </component>
-    </collection>
-    <collection name="telutils" long-name="Utilities" level="generic">
-     <component name="phoneparser" long-name="Phone Parser" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/telutils/phoneparser/group"/>
-     </component>
-     <component name="telephonyservice" long-name="Telephony Service" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/telutils/telephonyservice/group"/>
-     </component>
-    </collection>
-    <collection name="cellular" long-name="Cellular" level="server">
-     <component name="telephonysettings" long-name="Telephony Settings" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/cellular/telephonysettings/group"/>
-     </component>
-     <component name="sssettings" long-name="SS Settings" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/cellular/sssettings/group"/>
-     </component>
-     <component name="psetnotesui" long-name="Pset Notes UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/cellular/psetnotesui/group"/>
-     </component>
-     <component name="servicerequest" long-name="Service Request" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/cellular/servicerequest/group"/>
-     </component>
-    </collection>
-    <collection name="engines" long-name="Telephony Engines" level="specific">
-     <component name="vmbxengine" long-name="Voice Mailbox Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/engines/vmbxengine/group"/>
-     </component>
-    </collection>
-    <collection name="phonesrv_info" long-name="Telephony and SIM Services Info" level="specific">
-     <component unofficial="yes" name="phonesrv_plat" long-name="Telephony and SIM Services Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_information_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/call_information_mediator_api/tsrc/ut_callinfos/group"/> -->
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/phone_client_emergency_call_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_client_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/phonesrv/phonesrv_plat/sat_refresh_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="phonesrv_pub" long-name="Telephony and SIM Services Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/phonesrv_pub/group"/>
-     </component>
-     <component unofficial="yes" name="phonesrv_build" long-name="Telephony and SIM Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/phonesrv/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/phonesrv/sources.csv
--- a/3k/mw/phonesrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/remoteconn/package_definition.xml
--- a/3k/mw/remoteconn/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="remoteconn" long-name="Remote Connectivity" tech_domain="de" level="generic" levels="plugin framework server generic specific">
-    <collection name="connectivitymodules" long-name="Connectivity Modules" level="framework">
-     <component name="secon" long-name="Se Con" origin-model="foundation">
-      <unit bldFile="/sf/mw/remoteconn/connectivitymodules/secon/group"/>
-     </component>
-    </collection>
-    <collection name="remoteconn_info" long-name="Remote Connectivity Info" level="specific">
-     <component unofficial="yes" name="remoteconn_build" long-name="Remote Connectivity Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/remoteconn/group"/>
-     </component>
-     <component unofficial="yes" name="remoteconn_plat" long-name="Remote Connectivity Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/remoteconn/remoteconn_plat/group"/>
-     </component>
-    <component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/remoteconn/remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
-     </component>
-     <component name="n:connectivitydoc" long-name="Connectivity Documentation" introduced="tb91" purpose="optional" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/remoteconn/remoteconn_info/connectivitydoc/group/connectivity_documentation.mrp"/>
-     </component>
-     <component name="n:mtpdoc" long-name="MTP Documentation" introduced="tb91" purpose="optional" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/remoteconn/remoteconn_info/mtpdoc/group/mtp_documentation.mrp"/>
-     </component>
-    </collection>
-   <collection name="connectivitytransports" long-name="Connectivity Transports" level="plugin">
-     <component name="n:mrouter" long-name="m-Router" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remoteconn/connectivitytransports/mrouter/group" mrp="mw/remoteconn/connectivitytransports/mrouter/group/connectivity_mRouterSecure.mrp"/> -->
-     </component>
-     <component name="plpremotelink" long-name="PLP Remote Link" deprecated="9.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/remoteconn/connectivitytransports/plpremotelink/group" mrp="/sf/mw/remoteconn/connectivitytransports/plpremotelink/group/connectivity_legacy_plp_plpremotelink.mrp"/>
-     </component>
-     <component name="plpvariant" long-name="PLP Variant" deprecated="9.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/remoteconn/connectivitytransports/plpvariant/group" mrp="/sf/mw/remoteconn/connectivitytransports/plpvariant/group/connectivity_legacy_plp_plpvariant.mrp"/>
-     </component>
-     <component name="eventbroadcast" long-name="Event Broadcast" deprecated="9.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/remoteconn/connectivitytransports/eventbroadcast/group" mrp="/sf/mw/remoteconn/connectivitytransports/eventbroadcast/group/connectivity_legacy_brdcst.mrp"/>
-     </component>
-    </collection>
-    <collection name="mtptransports" long-name="MTP Transports" level="plugin">
-     <component name="mtpusbtransport" long-name="MTP USB Transport" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/mw/remoteconn/mtptransports/mtpusbtransport/group" mrp="/sf/mw/remoteconn/mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
-     </component>
-    </collection>
-    <collection name="mtpfws" long-name="MTP Frameworks" level="framework">
-     <component name="n:mtpfw" long-name="MTP Framework" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remoteconn/mtpfws/mtpfw/group" mrp="mw/remoteconn/mtpfws/mtpfw/group/mtp_framework.mrp"/> -->
-     </component>
-     <component name="mtpintegrationtest" long-name="MTP Integration Test" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/remoteconn/mtpfws/mtpintegrationtest/group" mrp="/sf/mw/remoteconn/mtpfws/mtpintegrationtest/group/mtp_test.mrp"/>
-     </component>
-    </collection>
-    <collection name="mtpdataproviders" long-name="MTP Data Providers" level="generic">
-     <component name="mtpfileandfolderdp" long-name="MTP File and Folder Provider" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group" mrp="/sf/mw/remoteconn/mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
-     </component>
-     <component name="n:mtpwmpextndp" long-name="WMP Extension Data Provider" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remoteconn/mtpdataproviders/mtpwmpextndp/group" mrp="mw/remoteconn/mtpdataproviders/mtpwmpextndp/group/mtp_wmpextndp.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="backupandrestore" long-name="Backup and Restore" level="specific">
-     <component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/remoteconn/backupandrestore/backupengine/group" mrp="/sf/mw/remoteconn/backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
-     </component>
-     <component name="backuptest" long-name="Backup Test" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/remoteconn/backupandrestore/backuptest/group" mrp="/sf/mw/remoteconn/backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
-     </component>
-    </collection>
-    <collection name="connectivitypcside" long-name="Connectivity PC Side" level="generic">
-     <component name="chatscripts" long-name="Chat Scripts" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/remoteconn/connectivitypcside/chatscripts/group" mrp="/sf/mw/remoteconn/connectivitypcside/chatscripts/group/testtools_chatscripts.mrp"/>
-     </component>
-     <component name="n:connectqi" long-name="ConnectQI" introduced="9.1" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/remoteconn/connectivitypcside/connectqi/connectqisdk_mr3.mrp"/>
-     </component>
-     <component name="n:connectqisdk" long-name="ConnectQI SDK" introduced="9.1" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/remoteconn/connectivitypcside/connectqisdk/connectqisdk_public.mrp"/>
-     </component>
-    </collection>
-    <collection name="connectivitydevicefws" long-name="Connectivity Device Frameworks" level="framework">
-     <component name="connectivityfw" long-name="Connectivity Framework" introduced="7.0s" deprecated="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/remoteconn/connectivitydevicefws/connectivityfw/group" mrp="/sf/mw/remoteconn/connectivitydevicefws/connectivityfw/group/connectivity_framework.mrp"/>
-     </component>
-     <component name="connectivityservices" long-name="Connectivity Services" introduced="7.0s" deprecated="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/remoteconn/connectivitydevicefws/connectivityservices/group" mrp="/sf/mw/remoteconn/connectivitydevicefws/connectivityservices/group/connectivity_services.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/remoteconn/sources.csv
--- a/3k/mw/remoteconn/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/remotemgmt/package_definition.xml
--- a/3k/mw/remotemgmt/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="remotemgmt" long-name="Remote Management" tech_domain="dm" level="specific" levels="plugin framework server generic specific">
-    <collection name="omaprovisioning" long-name="OMA Provisioning" level="specific">
-     <component name="pnputil" long-name="PnP Util" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/pnputil/group"/>
-      <!-- <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/pnputil/tsrc/moduletest/group"/> -->
-     </component>
-     <component name="provisioning" long-name="provisioning" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/provisioning/group"/>
-      <!-- <unit bldFile="/sf/mw/remotemgmt/omaprovisioning/provisioning/tsrc/moduletest/group"/> -->
-     </component>
-    </collection>
-    <collection name="policymanagement" long-name="Policy Management" level="generic">
-     <component name="pmdmadapter" long-name="PMDM Adapter" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/policymanagement/pmdmadapter/group"/>
-     </component>
-     <component name="dmutilserver" long-name="DM Util Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/policymanagement/dmutilserver/group"/>
-     </component>
-     <component name="policyengine" long-name="Polic Eengine" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/policymanagement/policyengine/group"/>
-     </component>
-     <component unofficial="yes" name="policymanagement_build" long-name="Policy Management Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/policymanagement/group"/>
-     </component>
-    </collection>
-    <collection name="syncmlfw" long-name="SyncML Framework" level="server">
-     <component name="syncmlfw_common" long-name="Common" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/alerthandler/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/alertqueue/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/debug/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/historylog/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/http/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/inc"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/inc/modifiedheaders"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/inc/policy"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/inc/symbianheaders"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/notifiers/inc"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/obex/obexclient/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/obex/obexcommserver/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/obex/obexdmplugin/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/obex/obexdsplugin/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/obex/obexserverbinding/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/sosserver/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/sosserver_clientapi/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/sosserver_privateapi/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/sosserver_transporthandler/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/syncagent/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/transport/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/wbxml/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/common/xml/bld"/>
-     </component>
-     <component name="ds" long-name="DS" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/adapterlog/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/adapters/dataproviderbase/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/agentlog/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/alerthandler/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/dsutils/changefinder/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/dsutils/dbcaps/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/dsutils/filter/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/dsutils/filterutils/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/dsutils/profileutil/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/dsutils/storeformat/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/hostserver/dshostclient/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/hostserver/dshostserverbase/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/hostserver/dshostservers/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/inc"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/netmon/bld"/>
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/ota/bld"/> -->
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/provisioningadapter/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/settings/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/syncagent/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/ds/wappushalert/bld"/>
-     </component>
-     <component name="dm" long-name="DM" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/callbackserver/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/dmutils/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/hostserver/dmhostserverbase/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/hostserver/dmhostservers/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/provisioningadapter/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/settings/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/syncagent/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/treedbclient/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/treedbhandler/bld"/>
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/treemodule/bld"/>
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/dm/wappushalert/bld"/>
-     </component>
-     <component name="syncmlnotifier" long-name="SyncML Notifier" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/syncmlnotifier/group"/>
-     </component>
-     <component name="syncservice" long-name="Sync Service" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/syncservice/group"/>
-     </component>
-     <component unofficial="yes" name="syncmlfw_build" long-name="SyncML Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/syncmlfw/group"/>
-     </component>
-    </collection>
-    <collection name="terminalsecurity" long-name="Terminal Security" level="specific">
-     <component name="scp" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scpclient/group"/>
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scphistoryplugin/group"/>
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scppatternplugin/group"/>
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scpserver/group"/>
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/scp/scptimestampplugin/group"/>
-     </component>
-     <component name="terminalsecurity_client" long-name="Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/client/group"/>
-     </component>
-     <component name="terminalsecurity_server" long-name="Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/server/group"/>
-     </component>
-     <component name="tcadapter" long-name="TC Adapter" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/tcadapter/bld"/>
-     </component>
-     <component unofficial="yes" name="terminalsecurity_build" long-name="Terminal Security Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/terminalsecurity/group"/>
-     </component>
-    </collection>
-    <collection name="devicediagnosticsfw" long-name="Device Diagnostics Framework" level="framework">
-     <component name="diagframework" long-name="Diagnostics Framework" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagframework/group"/>
-     </component>
-     <component name="diagpluginbase" long-name="Diagnostics Plugin Base" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagpluginbase/group"/>
-     </component>
-     <component name="diagresultsdb" long-name="Diagnostics Results DB" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/client/group"/>
-      <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/diagresultsdb/server/group"/>
-     </component>
-     <component unofficial="yes" name="devicediagnosticsfw_build" long-name="Device Diagnostics Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/devicediagnosticsfw/group"/>
-     </component>
-    </collection>
-    <collection name="n:remotemgmttest" long-name="Remote Management Test" level="specific">
-     <component name="n:omasyncmlintegrationtest" long-name="OMA SyncML Integration Test" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omasyncmlintegrationtest/group/oma_syncml_integtest.mrp"/> -->
-     </component>
-     <component name="n:omadevicemgmtintegrationtest" long-name="OMA Device Management Integration Test" introduced="9.1" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group" mrp="mw/remotemgmt/remotemgmttest/omadevicemgmtintegrationtest/group/devprov_integtest.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="n:syncandremotemgmtfw" long-name="Sync and Remote Management Framework" level="framework">
-     <component name="n:omasyncmldatasync" long-name="OMA SyncML Data Sync" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldatasync/Group/oma_syncml_datasync.mrp"/> -->
-     </component>
-     <component name="n:omasyncmlcommonfw" long-name="OMA SyncML Common Framework" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlcommonfw/Group/oma_syncml_common_framework.mrp"/> -->
-     </component>
-     <component name="n:omasyncmldminterface" long-name="OMA SyncML DM Interface" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmldminterface/group/oma_syncml_dm_interface.mrp"/> -->
-     </component>
-     <component name="n:omasyncmlconfig" long-name="OMA SyncML Config" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group" mrp="mw/remotemgmt/syncandremotemgmtfw/omasyncmlconfig/group/oma_syncml_config.mrp"/> -->
-     </component>
-     <component name="n:devicemgmtfw" long-name="Device Management Framework" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group" mrp="mw/remotemgmt/syncandremotemgmtfw/devicemgmtfw/group/devprov_devman_framework.mrp"/> -->
-     </component>
-     <component name="n:clientprovisioningfw" long-name="Client Provisioning Framework" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group" mrp="mw/remotemgmt/syncandremotemgmtfw/clientprovisioningfw/Group/devprov_clientprov_framework.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="n:syncandremotemgmtservices" long-name="Sync and Remote Management Services" level="plugin">
-     <component name="n:datasyncadaptors" long-name="Data Sync Adaptors" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/datasyncadaptors/group/data_sync_adaptors.mrp"/> -->
-     </component>
-     <component name="n:devicemgmtadaptors" long-name="Device Management Adaptors" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group" mrp="mw/remotemgmt/syncandremotemgmtservices/devicemgmtadaptors/devman/Group/devprov_devman_adapters.mrp"/> -->
-     </component>
-     <component name="n:clientprovisioningadaptors" long-name="Client Provisioning Adaptors" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group" mrp="mw/remotemgmt/syncandremotemgmtservices/clientprovisioningadaptors/group/devprov_clientprov_adapters.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="remotemgmt_info" long-name="Remote Management Info" level="specific">
-     <component unofficial="yes" name="remotemgmt_build" long-name="Remote Management Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/group"/>
-     </component>
-     <component unofficial="yes" name="remotemgmt_pub" long-name="Remote Management Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_pub/group"/>
-     </component>
-     <component unofficial="yes" name="remotemgmt_plat" long-name="Remote Management Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_tree_apis/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/dm_utils_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/fota_engine_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/oma_ds_extensions_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/pnpms_utils_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/policy_management_certificate_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/policy_management_request_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/scp_server_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/setting_enforcement_info_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_alert_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/syncml_client_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/remotemgmt/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group"/> -->
-     </component>
-    <component name="n:remotemgmt_metadata" long-name="Remote Management Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/remotemgmt/remotemgmt_info/remotemgmt_metadata/remotemgmt_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/remotemgmt/sources.csv
--- a/3k/mw/remotemgmt/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/remotestorage/package_definition.xml
--- a/3k/mw/remotestorage/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="remotestorage" long-name="Remote Storage" tech_domain="de" level="generic" levels="framework">
-    <collection name="remotestoragefw" long-name="Remote Storage Framework" level="framework">
-     <component name="mountstore" long-name="Mount Store" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotestorage/remotestoragefw/mountstore/group"/>
-     </component>
-     <component name="rsfwnotifierplugins" long-name="RS Framework Notifier Plugins" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotestorage/remotestoragefw/rsfwnotifierplugins/group"/>
-     </component>
-     <component name="remotefileengine" long-name="Remote File Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotestorage/remotestoragefw/remotefileengine/group"/>
-     </component>
-     <component name="mountmanager" long-name="Mount Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotestorage/remotestoragefw/mountmanager/group"/>
-      <!-- <unit bldFile="/sf/mw/remotestorage/remotestoragefw/mountmanager/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="webdavaccessplugin" long-name="WebDAV Access Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotestorage/remotestoragefw/webdavaccessplugin/group"/>
-     </component>
-     <component name="remotefilesystemplugin" long-name="Remote Filesystem Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotestorage/remotestoragefw/remotefilesystemplugin/group"/>
-     </component>
-     <component name="remotestoragegsplugin" long-name="GS Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotestorage/remotestoragefw/gsplugin/group"/>
-     </component>
-     <component name="remotedriveconfigurationbiocontrol" long-name="Remote Drive Configuration BIO Control" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotestorage/remotestoragefw/remotedriveconfigurationbiocontrol/group"/>
-     </component>
-     <component unofficial="yes" name="remotestoragefw_build" long-name="Remote Storage Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotestorage/remotestoragefw/group"/>
-     </component>
-    </collection>
-    <collection name="remotestorage_info" long-name="Remote Storage Info" level="framework">
-     <component unofficial="yes" name="rsfw_plat" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/remotestorage/rsfw_plat/rsfw_access_protocol_plugin_api/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/remotestorage/sources.csv
--- a/3k/mw/remotestorage/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/securitysrv/package_definition.xml
--- a/3k/mw/securitysrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="securitysrv" long-name="Security Services" tech_domain="se" level="generic" levels="plugin framework server generic specific">
-    <collection name="gba" long-name="Generic Boot Architecture" level="specific">
-     <component name="uicc" long-name="Uicc" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/gba/uicc/group"/>
-     </component>
-     <component name="bootstrap" long-name="Bootstrap" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/gba/bootstrap/group"/>
-     </component>
-     <component name="gbaserver" long-name="GBA Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/gba/gbaserver/group"/>
-     </component>
-     <component name="gbaapi" long-name="GBA API" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/gba/gbaapi/group"/>
-     </component>
-     <component name="gbafilter" long-name="GBA Filter" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/gba/gbafilter/group"/>
-     </component>
-     <component unofficial="yes" name="gba_build" long-name="Generic Boot Architecture Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/gba/group"/>
-     </component>
-    </collection>
-    <collection name="wim" long-name="WIM" level="framework">
-     <component name="swimreader" long-name="Swim Reader" origin-model="foundation"/>
-     <component name="scard" long-name="S Card" origin-model="foundation"/>
-     <component name="wimutil" long-name="WIM Util" origin-model="foundation"/>
-     <component name="wimserver" long-name="WIM Server" origin-model="foundation"/>
-     <component name="wimclient" long-name="WIM Client" origin-model="foundation"/>
-     <component name="wimplugin" long-name="WIM Plugin" origin-model="foundation"/>
-     <component unofficial="yes" name="wim_build" long-name="WIM Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/wim/group"/>
-     </component>
-    </collection>
-    <collection name="cms" long-name="Certificate Management Services" level="generic">
-     <component name="cms_build" long-name="CMS" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/cms/group"/>
-     </component>
-    </collection>
-    <collection name="pkiutilities" long-name="PKI Utilities" level="plugin">
-     <component name="x509certnameparser" long-name="X509cert Name Parser" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/pkiutilities/x509certnameparser/group"/>
-     </component>
-     <component name="pkcs12" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/pkiutilities/pkcs12/group"/>
-     </component>
-     <component name="certmanui" long-name="Certman UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/pkiutilities/certmanui/group"/>
-     </component>
-     <component name="ctsecuritydialogs" long-name="CT Security Dialogs" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/pkiutilities/ctsecuritydialogs/group"/>
-     </component>
-     <component name="certsaver" long-name="Cert Saver" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/pkiutilities/certsaver/group"/>
-     </component>
-     <component name="secmodui" long-name="Sec Mod UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/pkiutilities/secmodui/group"/>
-     </component>
-     <component name="devicetoken" long-name="Device Token" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/pkiutilities/devicetoken/group"/>
-     </component>
-     <component name="certificates" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/pkiutilities/certificates/group"/>
-     </component>
-     <component name="certificates_oem" origin-model="foundation"/>
-     <component unofficial="yes" name="pkiutilities_build" long-name="PKI Utilities Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/pkiutilities/group"/>
-     </component>
-    <component name="ocsp" long-name="Online Certificate Status Protocol" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/securitysrv/pkiutilities/ocsp/group" mrp="/sf/mw/securitysrv/pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
-     </component>
-    </collection>
-    <collection name="remotelock" long-name="Remote Lock" level="server">
-     <component name="remotelocksettings" long-name="Remote Lock Settings" origin-model="foundation"/>
-     <component name="remotelockengine" long-name="Remote Lock Engine" origin-model="foundation"/>
-     <component unofficial="yes" name="remotelock_build" long-name="Remote Lock Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/remotelock/group"/>
-     </component>
-    </collection>
-    <collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
-     <component name="trkdummy" long-name="Trk Dummy" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/securitysrv/boottimeintegritycheck/trkdummy/group"/> -->
-     </component>
-     <component unofficial="yes" name="boottimeintegritycheck_build" long-name="Boot Time Integrity Check Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/boottimeintegritycheck/group"/>
-     </component>
-    </collection>
-    <collection name="securitydialogs" long-name="Security Dialogs" level="specific">
-     <component name="keylockpolicyapi" long-name="Keylock Policy Api" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/securitydialogs/keylockpolicyapi/group"/>
-     </component>
-     <component name="autolock" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/securitydialogs/autolock/group"/>
-     </component>
-     <component name="secui" long-name="Sec UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/securitydialogs/secui/group"/>
-     </component>
-     <component name="securitynotifier" long-name="Security Notifier" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/securitydialogs/securitynotifier/group"/>
-     </component>
-     <component name="securityobserver" long-name="Security Observer" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/securitydialogs/securityobserver/group"/>
-     </component>
-     <component unofficial="yes" name="securitydialogs_build" long-name="Security Dialogs Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/securitydialogs/group"/>
-     </component>
-    </collection>
-    <collection name="securitysrv_info" long-name="Security Services Info" level="specific">
-     <component unofficial="yes" name="securitysrv_build" long-name="Security Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/securitysrv/group"/>
-     </component>
-     <component unofficial="yes" name="secsrv_plat" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/securitysrv/secsrv_plat/devicelock_access_api/group"/> -->
-      <unit bldFile="/sf/mw/securitysrv/secsrv_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/securitysrv/secsrv_plat/keyguard_access_api/group"/> -->
-      <!-- <unit bldFile="/sf/mw/securitysrv/secsrv_plat/lockapp_server_api/group"/> -->
-     </component>
-     <component unofficial="yes" name="securitysrv_test" long-name="Security Services Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/securitysrv/tsrc/group"/> -->
-     </component>
-    <component name="securitysrv_metadata" long-name="Security Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/securitysrv/securitysrv_info/securitysrv_metadata/securitysrv_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/securitysrv/sources.csv
--- a/3k/mw/securitysrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/serviceapi/package_definition.xml
--- a/3k/mw/serviceapi/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="serviceapi" long-name="Service API" tech_domain="rt" level="specific" levels="os mw1 mw2 app">
-    <collection name="sapi_applicationmanager" long-name="SAPI Application Manager" level="mw1">
-     <component name="appmanagerservice" long-name="App Manager Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_applicationmanager_build" long-name="SAPI Application Manager Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_applicationmanager/group"/>
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_applicationmanager/tsrc/dev/cruntimetest/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_calendar" long-name="SAPI Calendar" level="app">
-     <component name="calendarservice" long-name="Calendar Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_calendar_build" long-name="SAPI Calendar Build" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_calendar/tsrc/testing/tcalprovider_combined/group"/> -->
-      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_calendar/group"/>
-     </component>
-    </collection>
-    <collection name="sapi_contacts_vpbk" long-name="SAPI Contacts Vpbk" level="app">
-     <component name="contactservice" long-name="Contact Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_contacts_vpbk_build" long-name="SAPI Contacts Vpbk Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_contacts_vpbk/group"/>
-     </component>
-    </collection>
-    <collection name="sapi_landmarks" long-name="SAPI Landmarks" level="mw2">
-     <component name="landmarksservice" long-name="Landmarks Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_landmarks_build" long-name="SAPI Landmarks Build" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarkstest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/testing/tlandmarksprovidertest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/group"/> -->
-      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_landmarks/group"/>
-     </component>
-    </collection>
-    <collection name="sapi_location" long-name="SAPI Location" level="mw2">
-     <component name="locationservice" long-name="Location Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_location_build" long-name="SAPI Location Build" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetloc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocopts/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetlocasync/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetbearing/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/tsrc/dev/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pgetdistance/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/group"/> -->
-      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/group"/>
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_location/tsrc/testing/performance/pmove/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_logging" long-name="SAPI Logging" level="app">
-     <component name="loggingservice" long-name="Logging Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_logging_build" long-name="SAPI Logging Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_logging/group"/>
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_logging/tsrc/dev/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_mediamanagement" long-name="SAPI Media Management" level="mw2">
-     <component name="mediamanagementservice" long-name="Media Management Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_mediamanagement_build" long-name="SAPI Media Management Build" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/dev/taiwmediamgmttest/group"/> -->
-      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_mediamanagement/group"/>
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/runtime_perf/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/s60_perf/group"/> -->
-     </component>
-    </collection>
-    <collection name="sapi_messaging" long-name="SAPI Messaging" level="mw2">
-     <component name="messagingservice" long-name="Messaging Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_messaging_build" long-name="SAPI Messaging Build" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/notify/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/status/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/delete/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/getlist/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_getlist/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_asyncsend/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_notify/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/send/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_status/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/tmessagingprovidertest/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_delete/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/s60_send/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/tsrc/testing/performance/asyncsend/group"/> -->
-      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_messaging/group"/>
-     </component>
-    </collection>
-    <collection name="sapi_sensor" long-name="SAPI Sensor" level="mw1">
-     <component name="sensorservice" long-name="Sensor Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_sensor_build" long-name="SAPI Sensor Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_sensor/group"/>
-     </component>
-    </collection>
-    <collection name="sapi_sysinfo" long-name="SAPI Sysinfo" level="mw1">
-     <component name="sysinfoservice" long-name="Sysinfo Service" origin-model="foundation"/>
-     <component unofficial="yes" name="sapi_sysinfo_build" long-name="SAPI Sysinfo Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_sysinfo/group"/>
-     </component>
-    </collection>
-    <collection name="sapi_serviceregistry" long-name="SAPI Service Registry" level="os">
-     <component name="serviceregistryprovider" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_serviceregistry/tsrc/dev/group"/> -->
-      <unit bldFile="/sf/mw/serviceapi/serviceproviders/sapi_serviceregistry/group"/>
-     </component>
-    </collection>
-    <collection name="serviceapi_info" long-name="Service API Info" level="app">
-     <component unofficial="yes" name="serviceproviders" origin-model="foundation">
-      <unit bldFile="/sf/mw/serviceapi/serviceproviders/group"/>
-     </component>
-     <component unofficial="yes" name="serviceapi_test" long-name="Service API Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/serviceapi/tsrc/group"/> -->
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/serviceapi/sources.csv
--- a/3k/mw/serviceapi/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/serviceapifw/package_definition.xml
--- a/3k/mw/serviceapifw/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="serviceapifw" long-name="Service API Framework" tech_domain="rt" level="specific" levels="plugin framework server generic specific">
-    <collection name="languageinterworkingfw" long-name="Language Interworking Framework" level="framework">
-     <component name="lifwservicehandler" long-name="Service Handler" origin-model="foundation">
-      <unit bldFile="/sf/mw/serviceapifw/languageinterworkingfw/servicehandler/group"/>
-     </component>
-    </collection>
-    <collection name="rtsecuritymanager" long-name="RT Security Manager" level="server">
-     <component name="rtsecuritymanagerutil" long-name="RT Security Manager Util" origin-model="foundation">
-      <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerutil/group"/>
-     </component>
-     <component name="rtsecuritymanagerserver" long-name="RT Security Managers Erver" origin-model="foundation">
-      <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerserver/group"/>
-     </component>
-     <component name="rtsecuritymanagerclient" long-name="RT Security Manager Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/rtsecuritymanagerclient/group"/>
-     </component>
-     <component unofficial="yes" name="rtsecuritymanager_build" long-name="RT Security Manager Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/serviceapifw/rtsecuritymanager/group"/>
-     </component>
-    </collection>
-    <collection name="serviceapifw_info" long-name="Service API Framework Info" level="specific">
-     <component unofficial="yes" name="serviceapifw_pub" long-name="Service API Framework Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_pub/group"/>
-     </component>
-     <component unofficial="yes" name="serviceapifw_plat" long-name="Service API Framework Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/group"/>
-      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/liw_criteria_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_client_api/tsrc/group"/>
-      <!-- <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_common_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/serviceapifw/serviceapifw_plat/rtsecuritymanager_utility_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="serviceapifw_build" long-name="Service API Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/serviceapifw/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/serviceapifw/sources.csv
--- a/3k/mw/serviceapifw/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/shortlinkconn/package_definition.xml
--- a/3k/mw/shortlinkconn/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="shortlinkconn" long-name="Shortlink Connectivity" tech_domain="de" level="generic" levels="framework server generic specific plugin">
-    <collection name="bluetoothengine" long-name="Bluetooth Engine" level="framework">
-     <component name="bteng" long-name="Bluetooth Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/bteng/group"/>
-     </component>
-     <component name="btnotif" long-name="Bluetooth Notifier" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btnotif/group"/>
-      <!-- <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btnotif/tsrc/btnotifapitest/group"/> -->
-     </component>
-     <component name="btaudioman" long-name="Bluetooth Audio Man" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btaudioman/group"/>
-     </component>
-     <component name="btmac" long-name="Bluetooth Mac" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btmac/group"/>
-     </component>
-     <component name="btsac" long-name="Bluetooth SAC" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btsac/group"/>
-     </component>
-     <component name="btaudiostreamer" long-name="Bluetooth Audio Streamer" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btaudiostreamer/group"/>
-      <!-- <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btaudiostreamer/tsrc/btaudiostreamerapitest/group"/> -->
-     </component>
-     <component name="btsap" long-name="Bluetooth SAP" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btsap/group"/>
-     </component>
-     <component name="btui" long-name="Bluetooth UI" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btui/ecom/group"/> -->
-      <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btui/group"/>
-     </component>
-     <component name="btpbap" long-name="Bluetooth PBAP" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/btpbap/group"/>
-     </component>
-     <component name="bthid" long-name="BTHID" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/bthid/group"/>
-     </component>
-     <component unofficial="yes" name="bluetoothengine_build" long-name="Bluetooth Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/bluetoothengine/group"/>
-     </component>
-    </collection>
-    <collection name="localconnectivityservice" long-name="Local Connectivity Service" level="server">
-     <component name="atext" long-name="Atext" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/atext/group"/>
-     </component>
-     <component name="locod" long-name="Locod" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/locod/group"/>
-     </component>
-     <component name="obexserviceman" long-name="Obex Service Man" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexserviceman/group"/>
-     </component>
-     <component name="obexsendservices" long-name="Obex Send Services" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexsendservices/group"/>
-     </component>
-     <component name="obexreceiveservices" long-name="OBEX Receive Services" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/obexreceiveservices/group"/>
-     </component>
-     <component name="dun" long-name="Dun" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/dun/group"/>
-     </component>
-     <component name="lcstylustap" long-name="LC Stylus Tap" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
-     </component>
-     <component name="generichid" long-name="Generic HID" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/generichid/group"/>
-     </component>
-     <component unofficial="yes" name="localconnectivityservice_build" long-name="Local Connectivity Service Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/group"/>
-     </component>
-    </collection>
-    <collection name="usbclasses" long-name="USB classes" level="framework">
-     <component name="usbobexclasscontroller" long-name="USB Obex Class Controller" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/usbclasses/usbobexclasscontroller/group"/>
-      <!-- <unit bldFile="/sf/mw/shortlinkconn/usbclasses/usbobexclasscontroller/tsrc/group"/> -->
-     </component>
-     <component name="usbbasicpersonality" long-name="USB Basic Personality" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/usbclasses/usbbasicpersonality/group"/>
-     </component>
-     <component name="usbmscpersonality" long-name="USB Msc Personality" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/usbclasses/usbmscpersonality/group"/>
-     </component>
-     <component name="ptpstack" long-name="Ptp Stack" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/usbclasses/ptpstack/group"/>
-     </component>
-     <component name="sicdusbplugin" long-name="Sicd USB Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/usbclasses/sicdusbplugin/group"/>
-     </component>
-     <component name="ptpserver" long-name="Ptp Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/usbclasses/ptpserver/group"/>
-      <!-- <unit bldFile="/sf/mw/shortlinkconn/usbclasses/ptpserver/ptpclasscontroller/group"/> -->
-     </component>
-     <component name="pictbridgeengine" long-name="Pictbridge Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/usbclasses/pictbridgeengine/group"/>
-     </component>
-     <component name="usbosdescriptorhandler" long-name="USB Os Descriptor Handler" origin-model="foundation"/>
-    </collection>
-    <collection name="usbengines" long-name="USB Engines" level="generic">
-     <component name="usbwatcher" long-name="USB Watcher" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/usbengines/usbwatcher/group"/>
-     </component>
-     <component name="usblocodplugin" long-name="USB Locod Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/usbengines/usblocodplugin/group"/>
-      <!-- <unit bldFile="/sf/mw/shortlinkconn/usbengines/usblocodplugin/tsrc/group"/> -->
-     </component>
-     <component name="usbdevcon" long-name="USB Devcon" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/usbengines/usbdevcon/group"/>
-     </component>
-     <component name="usbremotepersonality" long-name="USB Remote Personality" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/usbengines/usbremotepersonality/group"/>
-     </component>
-    </collection>
-    <collection name="usbuis" long-name="USB UIs" level="specific">
-     <component name="usbui" long-name="USB UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/usbuis/usbui/group"/>
-      <!-- <unit bldFile="/sf/mw/shortlinkconn/usbuis/usbui/tsrc/usbuiapitest/group"/> -->
-     </component>
-     <component name="usbuinotif" long-name="USB UI Notif" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/usbuis/usbuinotif/group"/>
-      <!-- <unit bldFile="/sf/mw/shortlinkconn/usbuis/usbuinotif/tsrc/usbuinotifapitest/group"/> -->
-     </component>
-     <component name="imageprintuiprovider" long-name="ImagePrint UI Provider" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/usbuis/imageprintuiprovider/group"/>
-     </component>
-     <component name="usbimageprintui" long-name="ImagePrint UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/usbuis/imageprintui/group"/>
-     </component>
-    </collection>
-    <collection name="obex" long-name="OBEX" level="generic">
-     <component name="obexprotocol" long-name="OBEX Protocol" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/shortlinkconn/obex/obexprotocol/group" mrp="/sf/mw/shortlinkconn/obex/obexprotocol/group/obex.mrp"/>
-     </component>
-     <component name="obexextensionapi" long-name="OBEX Extension API" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/shortlinkconn/obex/obexextensionapi/group" mrp="/sf/mw/shortlinkconn/obex/obexextensionapi/group/obex_extensionapis.mrp"/>
-     </component>
-    </collection>
-    <collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
-     <component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/shortlinkconn/bluetoothappprofiles/avrcp" mrp="/sf/mw/shortlinkconn/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
-     </component>
-    </collection>
-    <collection name="shortlinkconn_info" long-name="Shortlink Connectivity Info" level="plugin">
-     <component unofficial="yes" name="shortlinkconn_pub" long-name="Shortlink Connectivity Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_pub/group"/>
-     </component>
-     <component unofficial="yes" name="public" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/shortlinkconn/tsrc/public/basic/group"/> -->
-     </component>
-     <component unofficial="yes" name="shortlinkconn_plat" long-name="Shortlink Connectivity Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/bluetooth_engine_settings_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/shortlinkconn/shortlinkconn_plat/group"/>
-     </component>
-     <component unofficial="yes" name="shortlinkconn_build" long-name="Shortlink Connectivity Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/shortlinkconn/group"/>
-     </component>
-    <component name="shortlinkconn_metadata" long-name="Shortlink Connectivity Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/shortlinkconn/shortlinkconn_info/shortlinkconn_metadata/shortlinkconn_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/shortlinkconn/sources.csv
--- a/3k/mw/shortlinkconn/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/svgt/package_definition.xml
--- a/3k/mw/svgt/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="svgt" long-name="SVG Tiny" tech_domain="ui" level="generic" levels="util ui">
-    <collection name="svgtopt" long-name="SVGT Opt" level="util">
-     <component name="svg" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/svgt/svgtopt/svg/svgrecog/group"/> -->
-     </component>
-     <component name="nvgdecoder" long-name="NVG Decoder" origin-model="foundation"/>
-     <component name="svgengineji" long-name="SVG Engine JI" origin-model="foundation"/>
-     <component name="svgtplugin" long-name="SVGT Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/svgt/svgtopt/svgtplugin/group"/>
-     </component>
-     <component unofficial="yes" name="svgtopt_build" long-name="SVGT Opt Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/svgt/svgtopt/group"/>
-     </component>
-    </collection>
-    <collection name="svgt_info" long-name="SVG Tiny Info" level="ui">
-     <component unofficial="yes" name="svgt_build" long-name="SVG Tiny Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/svgt/group"/>
-     </component>
-     <component unofficial="yes" name="svgt_plat" long-name="SVG Tiny Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/svgt/svgt_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/svgt/sources.csv
--- a/3k/mw/svgt/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/svgt/,/sf/mw/svgt,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/uiaccelerator/package_definition.xml
--- a/3k/mw/uiaccelerator/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="uiaccelerator" long-name="UI Accelerator" tech_domain="ui" level="generic" levels="plugin framework server generic specific">
-    <collection name="uiacceltk" long-name="UI Accelerator TK" level="framework">
-     <component name="hitchcock" long-name="Hitchcock" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/hitchcock/coretoolkit/group"/> -->
-      <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/hitchcock/group"/>
-      <!-- <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/hitchcock/plugins/alftranseffect/alftranseffectplugin/group"/> -->
-      <!-- <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/hitchcock/tracer/group"/> -->
-      <!-- <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/hitchcock/tracer/traceextclient/group"/> -->
-      <!-- <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/hitchcock/tracer/traceextplugin/group"/> -->
-     </component>
-     <component name="widgeteditors" long-name="Widget Editors" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/widgeteditors/group"/>
-     </component>
-     <component unofficial="yes" name="uiacceltk_build" long-name="UI Accelerator TK Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiaccelerator/uiacceltk/group"/>
-     </component>
-    </collection>
-    <collection name="uiaccelexampleapps" long-name="UI Accelerator Example Apps" level="specific">
-     <component name="alfexanalogdialer" long-name="ALF Ex Analog Dialer" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/uiaccelerator/uiaccelexampleapps/alfexanalogdialer/group"/> -->
-     </component>
-     <component name="alfexstickers" long-name="ALF Ex Stickers" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/uiaccelerator/uiaccelexampleapps/alfexstickers/group"/> -->
-     </component>
-    </collection>
-    <collection name="uiaccelerator_info" long-name="UI Accelerator Info" level="specific">
-     <component unofficial="yes" name="inc" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/uiaccelerator/inc/group"/> -->
-     </component>
-     <component unofficial="yes" name="uiaccelerator_plat" long-name="UI Accelerator Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/alf_client_server_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/alf_core_toolkit_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/alf_editors_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/alf_extended_visual_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/alf_extension_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/alf_tracing_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/alf_visual_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiaccelerator/uiaccelerator_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/uiaccelerator/sources.csv
--- a/3k/mw/uiaccelerator/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/uiresources/package_definition.xml
--- a/3k/mw/uiresources/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="uiresources" long-name="UI Resources" tech_domain="ui" level="generic" levels="compile plugin framework server generic data">
-    <collection name="layouts" long-name="Layouts" level="plugin">
-     <component name="cdl" long-name="Cdl" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiresources/layouts/cdl/cdlengine/group"/>
-      <unit bldFile="/sf/mw/uiresources/layouts/cdl/cdlserver/group"/>
-      <!-- <unit bldFile="/sf/mw/uiresources/layouts/cdl/cdlutils/cdlexplorer/group"/> -->
-     </component>
-     <component name="aknlayout2" long-name="AKN Layout 2" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated"/> -->
-      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/nhd_akn_app"/> -->
-      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/nhd_uiaccel"/> -->
-      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/qhd_touch_akn_app"/> -->
-      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/qhd_touch_uiaccel"/> -->
-      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/qvga2_akn_app"/> -->
-      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/qvga2_uiaccel"/> -->
-      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/qvga_akn_app"/> -->
-      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/qvga_uiaccel"/> -->
-      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/vga3_akn_app"/> -->
-      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/vga3_uiaccel"/> -->
-      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/vga_akn_app"/> -->
-      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/vga_touch_akn_app"/> -->
-      <!-- <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/generated/vga_uiaccel"/> -->
-      <unit bldFile="/sf/mw/uiresources/layouts/aknlayout2/group"/>
-     </component>
-    </collection>
-    <collection name="locales" long-name="Locales" level="framework">
-     <component name="locales_build" long-name="Locales Component" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiresources/locales/loce32"/>
-     </component>
-    </collection>
-    <collection name="pictographs" long-name="Pictographs" level="data">
-     <component name="aknpictograph" long-name="AKN Picto Graph" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiresources/pictographs/aknpictograph/group"/>
-      <!-- <unit bldFile="/sf/mw/uiresources/pictographs/aknpictograph/tools/aknpictobitmapbuilder/group"/> -->
-     </component>
-    </collection>
-    <collection name="skins" long-name="Skins" level="data">
-     <component name="aknskincontent" long-name="AKN Skin Content" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiresources/skins/aknskincontent/group"/>
-      <!-- <unit bldFile="/sf/mw/uiresources/skins/aknskincontent/srcdata/scalableseries60skin/mifindexdll"/> -->
-     </component>
-     <component name="aknskins" long-name="AKN Skins" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiresources/skins/aknskins/group"/>
-     </component>
-    </collection>
-    <collection name="uiconfig" long-name="UI Config" level="server">
-     <component name="s60config" long-name="S60 Config" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiresources/uiconfig/s60config/group"/>
-     </component>
-    </collection>
-    <collection name="fontsupport" long-name="Font Support" level="generic">
-     <component name="fontprovider" long-name="Font Provider" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiresources/fontsupport/fontprovider/group"/>
-     </component>
-     <component name="fontutils" long-name="Font Utils" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiresources/fontsupport/fontutils/fontutils/group"/>
-      <!-- <unit bldFile="/sf/mw/uiresources/fontsupport/fontutils/group"/> -->
-     </component>
-    </collection>
-    <collection name="uigraphics" long-name="UI Graphics" level="generic">
-     <component name="bitmaps2" long-name="Bitmaps 2" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiresources/uigraphics/bitmaps2/group"/>
-     </component>
-     <component name="icons" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiresources/uigraphics/icons/group"/>
-     </component>
-     <component name="variatedbitmaps" long-name="Variated Bitmaps" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiresources/uigraphics/variatedbitmaps/group"/>
-     </component>
-     <component name="aknicon" long-name="AKN Icon" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiresources/uigraphics/aknicon/group"/>
-     </component>
-     <component name="palette" long-name="Palette" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/uiresources/uigraphics/palette/group"/> -->
-     </component>
-    </collection>
-    <collection name="helpthemes" long-name="Help Themes" level="data">
-     <component name="helpthemes_build" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiresources/helpthemes/group"/>
-     </component>
-    </collection>
-    <collection name="aknlayoutcompiler" long-name="Avkon Layout Compiler" level="compile">
-     <component name="aknlayoutcompiler_build" long-name="AKN Layout Compiler Component" origin-model="foundation">
-      <unit bldFile="/sf/mw/uitools/aknlayoutcompiler/group"/>
-     </component>
-    </collection>
-    <collection name="cdlcompiler" long-name="CDL Compiler" level="compile">
-     <component name="cdlcompiler_build" long-name="CDL Compiler Component" origin-model="foundation">
-      <unit bldFile="/sf/mw/uitools/cdlcompiler/group"/>
-     </component>
-    </collection>
-    <collection name="cdlcompilertoolkit" long-name="CDL Compiler Toolkit" level="compile">
-     <component name="cdlcompilertoolkit_build" long-name="CDL Compiler Toolkit Component" origin-model="foundation">
-      <unit bldFile="/sf/mw/uitools/cdlcompilertoolkit/group"/>
-     </component>
-    </collection>
-    <collection name="skincompiler" long-name="Skin Compiler" level="compile">
-     <component name="aknskindesccompiler" long-name="AKN Skin Desc Compiler" origin-model="foundation">
-      <unit bldFile="/sf/mw/uitools/skincompiler/aknskindesccompiler/group"/>
-     </component>
-    </collection>
-    <collection name="uiresources_info" long-name="UI Resources Info" level="data">
-     <component unofficial="yes" name="uiresources_plat" long-name="UI Resources Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiresources/uiresources_plat/cdl_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_fonts_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiresources/uiresources_plat/extended_skins_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiresources/uiresources_plat/graphic_configuration_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiresources/uiresources_plat/group"/>
-      <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_data_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiresources/uiresources_plat/layout_system_private_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiresources/uiresources_plat/skins_image_attributes_api/tsrc/group"/>
-     </component>
-     <component unofficial="yes" name="uiresources_build" long-name="UI Resources Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiresources/group"/>
-     </component>
-     <component unofficial="yes" name="uiresources_pub" long-name="UI Resources Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/uiresources/uiresources_pub/font_definition_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiresources/uiresources_pub/graphics_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiresources/uiresources_pub/group"/>
-      <unit bldFile="/sf/mw/uiresources/uiresources_pub/pictograph_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiresources/uiresources_pub/scalable_icons_api/tsrc/group"/>
-      <unit bldFile="/sf/mw/uiresources/uiresources_pub/skins_api/tsrc/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/uiresources/sources.csv
--- a/3k/mw/uiresources/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/uitools/package_definition.xml
--- a/3k/mw/uitools/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="uitools" long-name="UI Tools" tech_domain="to" level="specific" levels="compile encode tool">
-    <collection name="gfxtools" long-name="Graphics Tools" level="tool">
-     <component name="gditools" long-name="GDI Tools" origin-model="foundation">
-      <unit bldFile="/sf/mw/uitools/gfxtools/gditools/group"/>
-     </component>
-     <component name="color" origin-model="foundation">
-      <unit bldFile="/sf/mw/uitools/gfxtools/color/group"/>
-     </component>
-    </collection>
-    <collection name="reszip" long-name="Reszip" level="encode">
-     <component name="reszip_build" origin-model="foundation">
-      <unit bldFile="/sf/mw/uitools/reszip/group"/>
-     </component>
-    </collection>
-    <collection name="toollibraries" long-name="Tool Libraries" level="tool">
-     <component name="arabica" origin-model="foundation"/>
-     <component name="xercesc" long-name="Xerces C" origin-model="foundation"/>
-     <component unofficial="yes" name="toollibraries_build" long-name="Tool Libraries Build" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/uitools/toollibraries/group"/> -->
-     </component>
-    </collection>
-    <collection name="svgtencoder" long-name="SVGT Encoder" level="encode">
-     <component name="svgtenc" long-name="SVGT Enc" origin-model="foundation">
-      <unit bldFile="/sf/mw/uitools/svgtencoder/svgtenc/standalone/group"/>
-     </component>
-     <component unofficial="yes" name="svgtencoder_build" long-name="SVGT Encoder Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/uitools/svgtencoder/group"/>
-     </component>
-    </collection>
-    <collection name="uitools_info" long-name="UI Tools Info" level="tool">
-     <component unofficial="yes" name="uitools_plat" long-name="UI Tools Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/uitools/uitools_plat/group"/>
-     </component>
-     <component unofficial="yes" name="uitools_pub" long-name="UI Tools Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/uitools/uitools_pub/group"/>
-     </component>
-     <component unofficial="yes" name="uitools_build" long-name="UI Tools Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/uitools/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/uitools/sources.csv
--- a/3k/mw/uitools/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/uitools/,/sf/mw/uitools,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/videoutils/package_definition.xml
--- a/3k/mw/videoutils/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="videoutils" long-name="Video Utils" tech_domain="mm" level="specific" levels="empty eng util">
-    <collection name="dvrengine" long-name="DVR Engine" level="eng">
-     <component name="commonrecordingengine" long-name="Common Recording Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/dvrengine/commonrecordingengine/dvrrtpcliphandler/group"/>
-      <unit bldFile="/sf/mw/videoutils/dvrengine/commonrecordingengine/dvrrtpcliprecognizer/group"/>
-      <unit bldFile="/sf/mw/videoutils/dvrengine/commonrecordingengine/dvrrtputils/group"/>
-      <unit bldFile="/sf/mw/videoutils/dvrengine/commonrecordingengine/group"/>
-     </component>
-     <component name="commonrecordingengineclient" long-name="Common Recording Engine Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/dvrengine/commonrecordingengineclient/group"/>
-     </component>
-     <component unofficial="yes" name="dvrengine_build" long-name="DVR Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/dvrengine/group"/>
-     </component>
-    </collection>
-    <collection name="videoconnutility" long-name="Video Conn Utility" level="util">
-     <component name="connutilpsworker" long-name="Conn Util Ps Worker" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/videoconnutility/connutilpsworker/group"/>
-     </component>
-     <component unofficial="yes" name="videoconnutility_build" long-name="Video Conn Utility Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/videoconnutility/group"/>
-     </component>
-    </collection>
-    <collection name="videoscheduler" long-name="Video Scheduler" level="util">
-     <component name="schedulerclient" long-name="Scheduler Client" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/videoscheduler/schedulerclient/group"/>
-     </component>
-     <component name="schedulerserver" long-name="Scheduler Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/videoscheduler/schedulerserver/group"/>
-     </component>
-     <component unofficial="yes" name="videoscheduler_build" long-name="Video Scheduler Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/videoscheduler/group"/>
-     </component>
-    </collection>
-    <collection name="videoutils_info" long-name="Video Utils Info" level="util">
-     <component unofficial="yes" name="videoutils_plat" long-name="Video Utils Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/videoutils_plat/group"/>
-      <!-- <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxconnutiltestexe/group"/> -->
-      <!-- <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestcommon/group"/> -->
-      <!-- <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoconnutility_api/tsrc/vcxtestutilmodule/group"/> -->
-      <!-- <unit bldFile="/sf/mw/videoutils/videoutils_plat/videoscheduler_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="videoutils_build" long-name="Video Utils Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/videoutils/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/videoutils/sources.csv
--- a/3k/mw/videoutils/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/vpnclient/package_definition.xml
--- a/3k/mw/vpnclient/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="vpnclient" long-name="VPN Client" tech_domain="dc" level="specific" levels="engine ui api">
-    <collection name="vpnclient_sis" long-name="VPN Client Sis" level="api">
-     <component name="ce_sis" long-name="CE SIS" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/vpnclient/vpnclient_sis/ce_sis/group"/> -->
-     </component>
-     <component name="stub_sis" long-name="Stub Sis" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/vpnclient/vpnclient_sis/stub_sis/group"/> -->
-     </component>
-     <component unofficial="yes" name="vpnclient_sis_build" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/vpnclient/vpnclient_sis/group"/> -->
-     </component>
-    </collection>
-    <collection name="vpnengine" long-name="VPN Engine" level="engine">
-     <component name="eventmediatorapi" long-name="Event Mediator API" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/eventmediatorapi/group"/>
-     </component>
-     <component name="eventviewer" long-name="Event Viewer" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/eventviewer/group"/>
-     </component>
-     <component name="vpnins" long-name="VPN Ins" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnins/group"/>
-     </component>
-     <component name="acuagenttransport" long-name="ACU Agent Transport" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/acuagenttransport/group"/>
-     </component>
-     <component name="acupluginlib" long-name="ACU Plugin Lib" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/acupluginlib/group"/>
-     </component>
-     <component name="ikepolparser" long-name="IKE Policy Parser" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/ikepolparser/group"/>
-     </component>
-     <component name="utlbase64" long-name="UTL Base64" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/utlbase64/group"/>
-     </component>
-     <component name="utlcrypto" long-name="UTL Crypto" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/utlcrypto/group"/>
-     </component>
-     <component name="utlxml" long-name="UTL XML" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/utlxml/group"/>
-     </component>
-     <component name="utlpkcs10" long-name="UTL PKCS10" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/utlpkcs10/group"/>
-     </component>
-     <component name="pkiserviceapi" long-name="PKI Service API" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/pkiserviceapi/group"/>
-     </component>
-     <component name="acuagentcrypto" long-name="ACU Agent Crypto" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/acuagentcrypto/group"/>
-     </component>
-     <component name="vpnextapi" long-name="VPN Ext. API" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnextapi/group"/>
-     </component>
-     <component name="ikecert" long-name="Ike Cert" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/ikecert/group"/>
-     </component>
-     <component name="kmdapi" long-name="KMD API" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/kmdapi/group"/>
-     </component>
-     <component name="kmdserver" long-name="Kmd Server" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/kmdserver/group"/>
-     </component>
-     <component name="ikeutils" long-name="IKE Utils" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/ikeutils/group"/>
-     </component>
-     <component name="ikev1lib" long-name="Ikev1 Library" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/ikev1lib/group"/>
-     </component>
-     <component name="ikev2lib" long-name="Ikev2 Library" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/ikev2lib/group"/>
-     </component>
-     <component name="acuagentmessage" long-name="ACU Agent Message" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/acuagentmessage/group"/>
-     </component>
-     <component name="acuagent" long-name="ACU Agent" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/acuagent/group"/>
-     </component>
-     <component name="vpnawapi" long-name="VPN AW API" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnawapi/group"/>
-     </component>
-     <component name="vpnipsecpolparser" long-name="VPN Ipsecpolparser" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnipsecpolparser/group"/>
-     </component>
-     <component name="sit" long-name="Sit" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/sit/group"/>
-     </component>
-     <component name="acuins" long-name="ACU INS" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/acuins/group"/>
-     </component>
-     <component name="vpntcwrapper" long-name="VP NTC Wrapper" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/vpntcwrapper/group"/>
-     </component>
-     <component name="eventmediator" long-name="Event Mediator" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/eventmediator/group"/>
-     </component>
-     <component name="ipsecacuplugin" long-name="IPseca Cu Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/ipsecacuplugin/group"/>
-     </component>
-     <component name="pkiservice" long-name="PKI Service" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/pkiservice/group"/>
-     </component>
-     <component name="vpnconnagt" long-name="VPN Connagt" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnconnagt/group"/>
-     </component>
-     <component name="vpnmanager" long-name="VPN Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnmanager/group"/>
-     </component>
-     <component name="vpncleaner" long-name="VPN Cleaner" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/vpncleaner/group"/>
-     </component>
-     <component name="utlpkcs12" long-name="UTL PKCS12" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/utlpkcs12/group"/>
-     </component>
-     <component name="dmadengine" long-name="DM Adapter Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/dmadengine/group"/>
-     </component>
-     <component name="dmadipsecvpn" long-name="DM Adapter IPsec VPN" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/dmadipsecvpn/group"/>
-     </component>
-     <component name="dmadpki" long-name="DM Adapter PKI" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/dmadpki/group"/>
-     </component>
-     <component name="ikesocketplugin" long-name="IKE Socket Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnengine/ikesocketplugin/group"/>
-     </component>
-     <component name="vpnnif" long-name="VPN NIF" origin-model="foundation"/>
-    </collection>
-    <collection name="vpnui" long-name="VPN UI" level="ui">
-     <component name="vpnecomnotifier" long-name="VPN ECOM Notifier" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnui/vpnecomnotifier/group"/>
-     </component>
-     <component name="vpndialogmanager" long-name="VPN Dialog Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnui/vpndialogmanager/group"/>
-     </component>
-     <component name="vpnmanagementui" long-name="VPN Management UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnui/vpnmanagementui/group"/>
-     </component>
-     <component name="vpnpolins" long-name="VPN Policy Ins" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnui/vpnpolins/group"/>
-     </component>
-     <component name="vpnpolicyrecognizer" long-name="VPN Policy Recognizer" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnui/vpnpolicyrecognizer/group"/>
-     </component>
-    </collection>
-    <collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
-     <component name="vpnapi" long-name="VPN API" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnapiimpl/group"/>
-     </component>
-    </collection>
-    <collection name="vpnclient_info" long-name="VPN Client Info" level="api">
-     <component unofficial="yes" name="vpnclient_help" long-name="VPN Client Help" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/help/group"/>
-     </component>
-     <component unofficial="yes" name="vpnclient_build" long-name="VPN Client Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/group"/>
-     </component>
-     <component unofficial="yes" name="vpnc_plat" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/vpnclient/vpnc_plat/vpnapi/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/vpnclient/sources.csv
--- a/3k/mw/vpnclient/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/web/package_definition.xml
--- a/3k/mw/web/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="web" long-name="Web" tech_domain="rt" level="specific" levels="plugin framework server generic specific">
-    <collection name="browserutilities" long-name="Browser Utilities" level="generic">
-     <component name="browserdialogsprovider" long-name="Browser Dialogs Provider" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/browserutilities/browserdialogsprovider/group"/>
-     </component>
-     <component name="recenturlstore" long-name="Recent URL Store" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/browserutilities/recenturlstore/group"/>
-     </component>
-     <component name="xmlparser" long-name="XML Parser" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/browserutilities/xmlparser/group"/>
-     </component>
-     <component name="cxmllibrary" long-name="CXml Library" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/browserutilities/cxmllibrary/group"/>
-     </component>
-     <component name="downloadmgr" long-name="Download Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/browserutilities/downloadmgr/group"/>
-     </component>
-     <component name="connectionmanager" long-name="Connection Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/browserutilities/connectionmanager/group"/>
-     </component>
-     <component name="browsertelservice" long-name="Browser Tel Service" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/browserutilities/browsertelservice/group"/>
-     </component>
-     <component name="favouritesengine" long-name="Favourites Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/browserutilities/favouritesengine/group"/>
-     </component>
-     <component name="feedsengine" long-name="Feeds Engine" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/web/browserutilities/feedsengine/feedsserver/reconizer/group"/> -->
-      <unit bldFile="/sf/mw/web/browserutilities/feedsengine/group"/>
-     </component>
-     <component name="multipartparser" long-name="Multipart Parser" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/browserutilities/multipartparser/group"/>
-     </component>
-     <component name="schemehandler" long-name="Scheme Handler" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/browserutilities/schemehandler/group"/>
-     </component>
-     <component name="webutils" long-name="Web Utils" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/browserutilities/webutils/group"/>
-      <!-- <unit bldFile="/sf/mw/web/browserutilities/webutils/tsrc/public/adv/group"/> -->
-     </component>
-     <component name="aiwbrowserprovider" long-name="AIW Browser Provider" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/browserutilities/aiwbrowserprovider/group"/>
-     </component>
-     <component unofficial="yes" name="browserutilities_build" long-name="Browser Utilities Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/browserutilities/group"/>
-     </component>
-    </collection>
-    <collection name="webengine" long-name="Web Engine" level="server">
-     <component name="osswebengine" long-name="OSS Web Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/webengine/osswebengine/cache/group"/>
-      <unit bldFile="/sf/mw/web/webengine/osswebengine/memorymanager/group"/>
-      <unit bldFile="/sf/mw/web/webengine/osswebengine/npscript/group"/>
-      <unit bldFile="/sf/mw/web/webengine/osswebengine/webkit/s60/group"/>
-      <unit bldFile="/sf/mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-      <!-- <unit bldFile="/sf/mw/web/webengine/osswebengine/webkit/s60/webview/webview_api_test/group"/> -->
-      <!-- <unit bldFile="/sf/mw/web/webengine/osswebengine/webkit/s60/webview/webview_api_test/tsrc/group"/> -->
-     </component>
-     <component name="webkitutils" long-name="WebKit Utils" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/webengine/webkitutils/group"/>
-     </component>
-     <component name="pagescaler" long-name="Page Scaler" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/webengine/pagescaler/group"/>
-     </component>
-     <component name="webwidgetinstaller" long-name="Widget Installer" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/webengine/widgetinstaller/group"/>
-     </component>
-     <component name="widgetregistry" long-name="Widget Registry" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/webengine/widgetregistry/group"/>
-      <!-- <unit bldFile="/sf/mw/web/webengine/widgetregistry/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="wmlengine" long-name="WML Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/webengine/wmlengine/group"/>
-     </component>
-     <component name="device" long-name="Device" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/webengine/device/group"/>
-     </component>
-     <component name="widgetengine" long-name="Widget Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/webengine/widgetengine/group"/>
-     </component>
-     <!--Component manually removed as empty and name conflicts with another component-->
-     <!--<component name="memoryplugin" long-name="Memory Plugin">
-       <unit bldFile="/sf/mw/web/webengine/memoryplugin/group"/>
-     </component>-->
-     <component name="widgetmemoryplugin" long-name="Widget Memory Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/webengine/widgetmemoryplugin/group"/>
-     </component>
-     <component name="widgetbackuprestore" long-name="Widget Backup Restore" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/webengine/widgetbackuprestore/group"/>
-     </component>
-     <component name="browserrecognizers" long-name="Browser Recognizers" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/webengine/browserrecognizers/group"/>
-     </component>
-     <component name="wrtharvester" long-name="WRT Harvester" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/webengine/wrtharvester/group"/>
-     </component>
-     <component unofficial="yes" name="webengine_build" long-name="Web Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/webengine/group"/>
-     </component>
-    </collection>
-    <collection name="widgets" long-name="Widgets" level="generic">
-     <component name="widgetrecognizer" long-name="Widget Recognizer" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/widgets/widgetrecognizer/group"/>
-     </component>
-     <component name="widgetinstaller" long-name="Widget Installer" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/widgets/widgetinstaller/group"/>
-     </component>
-     <component name="widgetlauncher" long-name="Widget Launcher" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/widgets/widgetlauncher/group"/>
-     </component>
-     <component name="widgetapp" long-name="Widget App" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/widgets/widgetapp/group"/>
-     </component>
-     <component name="widgetpreinstaller" long-name="Widget Pre Installer" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/widgets/widgetpreinstaller/group"/>
-     </component>
-     <component name="widgetstartup" long-name="Widget Startup" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/widgets/widgetstartup/group"/>
-     </component>
-     <component unofficial="yes" name="widgets_build" long-name="Widgets Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/widgets/group"/>
-     </component>
-    </collection>
-    <collection name="codhandler" long-name="COD Handler" level="specific">
-     <component name="codeng" long-name="COD Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/codhandler/codeng/group"/>
-     </component>
-     <component name="codui" long-name="COD UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/codhandler/codui/group"/>
-     </component>
-     <component name="codrecog" long-name="COD Recogniser" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/codhandler/codrecog/group"/>
-     </component>
-     <component name="codviewer" long-name="COD Viewer" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/codhandler/codviewer/group"/>
-     </component>
-     <component name="ddrecog" long-name="DD Recogniser" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/codhandler/ddrecog/group"/>
-     </component>
-     <component name="ddviewer" long-name="DD Viewer" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/codhandler/ddviewer/group"/>
-     </component>
-     <component name="coddownload" long-name="COD Download" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/codhandler/coddownload/group"/>
-     </component>
-     <component name="roapapp" long-name="ROAP Application" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/codhandler/roapapp/group"/>
-     </component>
-     <component unofficial="yes" name="codhandler_build" long-name="COD Handler Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/codhandler/group"/>
-     </component>
-    </collection>
-    <collection name="web_info" long-name="Web Info" level="specific">
-     <component unofficial="yes" name="web_pub" long-name="Web Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/web/web_pub/browser_control_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/web/web_pub/download_mgr_client_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/web/web_pub/favourites_engine_api/tsrc/group"/> -->
-      <unit bldFile="/sf/mw/web/web_pub/group"/>
-     </component>
-     <component unofficial="yes" name="web_build" long-name="Web Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/group"/>
-     </component>
-     <component unofficial="yes" name="web_plat" long-name="Web Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/web/web_plat/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/web/sources.csv
--- a/3k/mw/web/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/web/,/sf/mw/web,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/websrv/package_definition.xml
--- a/3k/mw/websrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="websrv" long-name="Web Services" tech_domain="rt" level="generic" levels="plugin framework server generic specific">
-    <collection name="webservices" long-name="Web Services" level="generic">
-     <component name="wsnotifierplugins" long-name="WS Notifier Plugins" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wsnotifierplugins/group"/>
-     </component>
-     <component name="wslogger" long-name="WS Logger" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wslogger/group"/>
-     </component>
-     <component name="wsxml" long-name="WS XML" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wsxml/group"/>
-     </component>
-     <component name="wsutils" long-name="WS Utils" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wsutils/group"/>
-     </component>
-     <component name="wsfragment" long-name="WS Fragment" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wsfragment/group"/>
-     </component>
-     <component name="wsdescription" long-name="WS Description" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wsdescription/group"/>
-     </component>
-     <component name="wshttpchanneltransportplugin" long-name="WS HTTP Channel Transport Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wshttpchanneltransportplugin/group"/>
-     </component>
-     <component name="wsconnection" long-name="WS Connection" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wsconnection/group"/>
-     </component>
-     <component name="wshostletconnection" long-name="WS Hostlet Connection" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wshostletconnection/group"/>
-     </component>
-     <component name="wscredentialmanager" long-name="WS Credential Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wscredentialmanager/group"/>
-     </component>
-     <component name="wsmanager" long-name="WS Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wsmanager/group"/>
-     </component>
-     <component name="wsidentitymanager" long-name="WS Identity Manager" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wsidentitymanager/group"/>
-     </component>
-     <component name="wsframework" long-name="WS Framework" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wsframework/group"/>
-     </component>
-     <component name="wsmessages" long-name="WS Messages" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wsmessages/group"/>
-     </component>
-     <component name="wsconnectionagent" long-name="WS Connection Agent" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wsconnectionagent/group"/>
-     </component>
-     <component name="idwsfplugin" long-name="IDWSF Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/idwsfplugin/group"/>
-     </component>
-     <component name="wsibasicplugin" long-name="WSI Basic Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wsibasicplugin/group"/>
-     </component>
-     <component name="wsrestplugin" long-name="WS Rest Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wsrestplugin/group"/>
-     </component>
-     <component name="idwsfsecuritymechanism" long-name="IDWSF Security Mechanism" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/idwsfsecuritymechanism/group"/>
-     </component>
-     <component name="wspasswordtransforms" long-name="WS Password Transforms" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wspasswordtransforms/group"/>
-     </component>
-     <component name="wscore" long-name="WS Core" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wscore/group"/>
-     </component>
-     <component name="wsprovider" long-name="WS Provider" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wsprovider/group"/>
-     </component>
-     <component name="wslocaltransportplugin" long-name="WS Local Transport Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wslocaltransportplugin/group"/>
-     </component>
-     <component name="wshostlettransportplugin" long-name="WS Hostlet Transport Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wshostlettransportplugin/group"/>
-     </component>
-     <component name="wsstar" long-name="WS Star" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/websrv/webservices/wsstar/group"/> -->
-     </component>
-     <component name="wsoviplugin" long-name="WS Ovi Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/wsoviplugin/group"/>
-     </component>
-     <component unofficial="yes" name="webservices_build" long-name="Web Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/webservices/group"/>
-     </component>
-    </collection>
-    <collection name="websrv_info" long-name="Web Services Info" level="specific">
-     <component unofficial="yes" name="websrv_build" long-name="Web Services Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/group"/>
-     </component>
-     <component unofficial="yes" name="websrv_pub" long-name="Web Services Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/websrv/websrv_pub/group"/>
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconn/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/hostconntester/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/senutils/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/connection/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontester/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/senconnectiontimeoutstester/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/senlayeredpropertiestester/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutils/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutilstestcases/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/wspolicytester/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/wsstarmessagehandlertester/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_description_api/tsrc/bc/senservdesc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_description_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_description_api/tsrc/senservdesc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_description_api/tsrc/senservdesctester/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_manager_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_manager_api/tsrc/senservicemanager/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_manager_api/tsrc/senservicemanagertester/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/newsoapclasses/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/newsoapclassestester/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/xml_extensions_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxml/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/xml_extensions_api/tsrc/senxmltester/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/xml_fragment_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/mw/websrv/websrv_pub/xml_fragment_api/tsrc/senfragmenttester/group"/> -->
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/websrv/sources.csv
--- a/3k/mw/websrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/wirelessacc/package_definition.xml
--- a/3k/mw/wirelessacc/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="wirelessacc" long-name="Wireless Access" tech_domain="dc" level="specific" levels="framework generic ui">
-    <collection name="hotspotfw" long-name="Hotspot Framework" level="framework">
-     <component name="hsserver" long-name="HotSpot Server" origin-model="foundation"/>
-     <component name="hsclient" long-name="HS Client" origin-model="foundation"/>
-     <component name="internetconnectivitytestservice" long-name="Internet Connectivity Test Service" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/wirelessacc/hotspotfw/internetconnectivitytestservice/group"/> -->
-     </component>
-     <component name="ictsdialogs" long-name="ICTS Dialogs" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/wirelessacc/hotspotfw/ictsdialogs/group"/> -->
-     </component>
-     <component name="hspluginforagent" long-name="HotSpot Plugin For Agent" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/wirelessacc/hotspotfw/hspluginforagent/group"/> -->
-     </component>
-     <component name="hsbrowser" long-name="HotSpot Browser" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/wirelessacc/hotspotfw/hsbrowser/group"/> -->
-     </component>
-     <component unofficial="yes" name="hotspotfw_build" long-name="Hotspot Framework Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/wirelessacc/hotspotfw/group"/>
-     </component>
-    </collection>
-    <collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
-     <component name="wlanplugin" long-name="WLAN Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanplugin/group"/>
-     </component>
-     <component name="wlansettingsui" long-name="WLAN Settings UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlansettingsui/group"/>
-     </component>
-     <component name="wlansniffer" long-name="WLAN Sniffer" origin-model="foundation">
-      <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlansniffer/group"/>
-     </component>
-     <component name="wlanindicatorplugin" long-name="WLAN Indicator Plugin" origin-model="foundation">
-      <unit bldFile="/sf/mw/wirelessacc/wlanutilities/wlanindicatorplugin/group"/>
-     </component>
-     <component unofficial="yes" name="wlanutilities_build" long-name="WLAN Utilities Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/wirelessacc/wlanutilities/group"/>
-     </component>
-    </collection>
-    <collection name="wirelessacc_info" long-name="Wireless Access Info" level="ui">
-     <component unofficial="yes" name="hsfw_plat" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/wirelessacc/hsfw_plat/group"/>
-     </component>
-     <component unofficial="yes" name="wirelessacc_build" long-name="Wireless Access Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/wirelessacc/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/mw/wirelessacc/sources.csv
--- a/3k/mw/wirelessacc/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/boardsupport/package_definition.xml
--- a/3k/os/boardsupport/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="boardsupport" long-name="Board Support" tech_domain="hb" level="hw" levels="bsp test 2 3 4">
-    <collection name="emulator" long-name="Emulator" level="bsp">
-     <component name="emulatorbsp" long-name="Emulator BSP" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/boardsupport/emulator/emulatorbsp" mrp="/sf/os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
-     </component>
-     <component name="n:unistore2emulatorsupport" long-name="UniStore2 Emulator Support" filter="gt" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/boardsupport/emulator/unistore2emulatorsupport" mrp="os/boardsupport/emulator/unistore2emulatorsupport/base_wins_unistore2.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="n:omaph2" long-name="OMAP H2" level="bsp">
-     <component name="n:omaph2bsp" long-name="OMAP H2 BSP" introduced="9.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/boardsupport/omaph2/omaph2bsp/h2" mrp="os/boardsupport/omaph2/omaph2bsp/h2/base_omaph2.mrp"/> -->
-     </component>
-     <component name="n:omaph2unistore2" long-name="OMAP H2 UniStore2" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/boardsupport/omaph2/omaph2unistore2" mrp="os/boardsupport/omaph2/omaph2unistore2/base_h2_unistore2.mrp"/> -->
-     </component>
-     <component name="n:omaph2sdio" long-name="OMAP H2 SDIO" filter="gt" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/boardsupport/omaph2/omaph2sdio" mrp="os/boardsupport/omaph2/omaph2sdio/base_h2_sdio.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="n:omaph4" long-name="OMAP H4" level="bsp">
-     <component name="n:omaph4bsp" long-name="OMAP H4 BSP" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/boardsupport/omaph4/omaph4bsp/h4" mrp="os/boardsupport/omaph4/omaph4bsp/h4/base_omaph4hrp.mrp"/> -->
-     </component>
-     <component name="n:h4bootloader" long-name="H4 Boot Loader" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit mrp="os/boardsupport/omaph4/h4bootloader/base_omaph4hrp_bootldr.mrp" bldFile="/sf/os/boardsupport/omaph4/h4bootloader"/> -->
-     </component>
-     <component name="n:omaph4minienvbootloader" long-name="OMAP H4 Mini Environment Boot Loader" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit mrp="os/boardsupport/omaph4/omaph4minienvbootloader/base_omaph4hrp_mebootldr.mrp" bldFile="/sf/os/boardsupport/omaph4/omaph4minienvbootloader"/> -->
-     </component>
-     <component name="n:omaph4unistore2" long-name="OMAP H4 Unistore2" filter="gt" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/boardsupport/omaph4/omaph4unistore2" mrp="os/boardsupport/omaph4/omaph4unistore2/base_omaph4hrp_unistore2.mrp"/> -->
-     </component>
-     <component name="n:omaph4sdio" long-name="OMAP H4 SDIO" filter="gt" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/boardsupport/omaph4/omaph4sdio" mrp="os/boardsupport/omaph4/omaph4sdio/base_omaph4hrp_sdio.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="haitest" long-name="HAI Test Suites" level="test">
-     <component name="bspsvs" long-name="BSP Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/boardsupport/haitest/bspsvs/group/bspsvs.mrp"/>
-     </component>
-    </collection>
-    <collection name="boardsupport_info" long-name="Board Support Info" level="4">
-     <component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/boardsupport/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/boardsupport/sources.csv
--- a/3k/os/boardsupport/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/buildtools/package_definition.xml
--- a/3k/os/buildtools/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="buildtools" long-name="Build Tools" tech_domain="to" level="hw" levels="bld mw fw ui">
-    <collection name="bldsystemtools" long-name="Build System Tools" level="bld">
-     <component name="buildsystemtools" long-name="Build System Tools" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/bldsystemtools/buildsystemtools/group" mrp="/sf/os/buildtools/bldsystemtools/buildsystemtools/group/tools_build.mrp"/>
-     </component>
-     <component name="gttechviewbaseline" long-name="GT Techview Baseline" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/buildtools/packaging/additionalutils/gt_techview_baseline.mrp"/>
-     </component>
-     <component name="commonbldutils" long-name="Common Utils" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/buildtools/bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
-     </component>
-    </collection>
-    <collection name="packaging" long-name="Packaging" level="ui">
-     <component name="additionalutils" long-name="Additional Utils" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/buildtools/packaging/additionalutils/additional_unknown_cedar.mrp"/>
-     </component>
-    </collection>
-    <collection name="toolsandutils" long-name="Tools and Utils" level="mw">
-     <component unofficial="yes" name="buildsystem" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/buildsystem/test/helloworld"/> -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/buildsystem/test/binaryvariation"/> -->
-     </component>
-    <component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/buildtools/toolsandutils/productionbldtools/product_tools.mrp"/>
-     </component>
-     <component name="n:ctsfunctionalitycheckers" long-name="CTS Functionality Checkers" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/buildtools/toolsandutils/ctsfunctionalitycheckers/Group/testtools_cts_functionalitycheckers.mrp"/>
-     </component>
-     <component name="n:burtestserver" long-name="BUR Test Server" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/burtestserver/Group" mrp="os/buildtools/toolsandutils/burtestserver/Group/testtools_burtestserver.mrp"/> -->
-     </component>
-     <component name="n:cbrtools" long-name="Component Based Release (CBR) Tools" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/cbrtools/group" mrp="os/buildtools/toolsandutils/cbrtools/group/tools_cbr_tools.mrp"/> -->
-     </component>
-     <component name="n:prf" long-name="Product Realisation Framework" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/prf/group" mrp="os/buildtools/toolsandutils/prf/group/tools_cbr_prf.mrp"/> -->
-     </component>
-     <component name="n:cdb" long-name="Code Database" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/cdb/group" mrp="os/buildtools/toolsandutils/cdb/group/testtools_cdb.mrp"/> -->
-     </component>
-     <component name="e32tools" long-name="E32 Tools" deprecated="tb91" purpose="development" class="PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/toolsandutils/e32tools/group" mrp="/sf/os/buildtools/toolsandutils/e32tools/group/tools_e32tools.mrp"/>
-     </component>
-     <component name="n:kitcomparator" long-name="Kit Comparator" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/kitcomparator/group" mrp="os/buildtools/toolsandutils/kitcomparator/group/testtools_cts_kitcomparator.mrp"/> -->
-     </component>
-     <component name="wincredistribution" long-name="WinC Redistribution" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/buildtools/dist_os/redistributionwinceka2/tools_redistribution_winc.mrp"/>
-     </component>
-     <component name="additionalredistribution" long-name="Additional Redistribution" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/buildtools/perltoolsplat_os/redistribution/additional_tools.mrp"/>
-     </component>
-     <component name="n:testdriver" long-name="Test Driver" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/testdriver/Group" mrp="os/buildtools/toolsandutils/testdriver/Group/testtools_testdriver.mrp"/> -->
-     </component>
-     <component name="statapi" long-name="STAT API" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/statapi/source/statapi/console" mrp="os/buildtools/toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/> -->
-     </component>
-     <component name="n:statsource" long-name="STAT Source" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/buildtools/toolsandutils/statsource/group/testtools_stat_common_source.mrp"/>
-     </component>
-     <component name="n:statdesktop" long-name="STAT Desktop" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/statdesktop/group" mrp="os/buildtools/toolsandutils/statdesktop/group/testtools_stat_desktop.mrp"/> -->
-     </component>
-     <component name="n:systemmonitor" long-name="System Monitor" introduced="8.0" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/systemmonitor/group" mrp="os/buildtools/toolsandutils/systemmonitor/group/testtools_systemmonitor.mrp"/> -->
-     </component>
-     <component name="n:testtoolsdesktop" long-name="Test Tools Desktop" filter="gt" deprecated="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/testtoolsdesktop/group" mrp="os/buildtools/toolsandutils/testtoolsdesktop/group/testtools_desktop.mrp"/> -->
-     </component>
-     <component name="wintunnel" long-name="Wintunnel" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/buildtools/toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp"/>
-     </component>
-     <component name="n:usecasecontroller" long-name="Use Case Controller" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group" mrp="os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group/testtools_ucc.mrp"/> -->
-     </component>
-     <component name="autotest" long-name="Autotest" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/toolsandutils/autotest/group" mrp="/sf/os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-     </component>
-     <component name="n:testconfigfileparser" long-name="Test Config File Parser" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/testconfigfileparser/group" mrp="os/buildtools/toolsandutils/testconfigfileparser/group/tools_testconfigfileparser.mrp"/> -->
-     </component>
-     <component name="n:kitsetupapp" long-name="Kit Setup App" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/buildtools/toolsandutils/kitsetupapp/group/tools_devkits_kitsetupapp.mrp"/>
-     </component>
-     <component name="n:navigationpages" long-name="Navigation Pages" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/buildtools/toolsandutils/navigationpages/tools_sdk_eng_NavigationPages.mrp"/>
-     </component>
-     <component name="n:productinstaller" long-name="Product Installer" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/productinstaller/group" mrp="os/buildtools/toolsandutils/productinstaller/group/tools_custkits_productinstaller.mrp"/> -->
-     </component>
-     <component name="n:stlport" long-name="STL Port" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/toolsandutils/stlport/group" mrp="os/buildtools/toolsandutils/stlport/group/tools_stlport.mrp"/> -->
-     </component>
-    </collection>
-   <collection name="n:dist_os" long-name="Redistribution" level="mw">
-     <component name="n:redistributionwinceka2" long-name="Redistribution WINC EKA2" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/dist_os/redistributionwinceka2" mrp="/sf/os/buildtools/dist_os/redistributionwinceka2/tools_redistribution_cedar.mrp"/>
-     </component>
-    </collection>
-    <collection name="n:bintools_os" long-name="Binary Tools" level="fw">
-     <component name="n:rcomp" long-name="Resource Compiler" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/bintools_os/rcomp/group" mrp="os/buildtools/bintools_os/rcomp/group/tools_rcomp.mrp"/> -->
-     </component>
-     <component name="n:evalid" long-name="Evalid" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/bintools_os/evalid" mrp="os/buildtools/bintools_os/evalid/tools_evalid.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="n:perltoolsplat_os" long-name="Perl Tools Platform" level="mw">
-     <component name="n:redistribution" long-name="Redistribution" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/perltoolsplat_os/redistribution" mrp="os/buildtools/perltoolsplat_os/redistribution/tools_redistribution_common.mrp"/> -->
-     </component>
-     <component name="n:legacycommonperl" long-name="Legacy Common Perl Libraries" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/perltoolsplat_os/legacycommonperl/group" mrp="os/buildtools/perltoolsplat_os/legacycommonperl/group/tools_sdk_eng_perllibrary.mrp"/> -->
-     </component>
-     <component name="n:commonperl" long-name="Common Perl Libraries" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/perltoolsplat_os/commonperl/group" mrp="os/buildtools/perltoolsplat_os/commonperl/group/tools_sdk_eng_perl_shared.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
-     <component name="e32toolp" long-name="E32 Perl Tools" purpose="development" class="PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/sbsv1_os/e32toolp/group" mrp="/sf/os/buildtools/sbsv1_os/e32toolp/group/tools_e32toolp.mrp"/>
-     </component>
-     <component name="n:bldtools" long-name="Build Tools" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/sbsv1_os/bldtools/group" mrp="os/buildtools/sbsv1_os/bldtools/group/tools_sdk_eng_build-tools.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="n:srcanamdw_os" long-name="Source Analysis Middleware" level="fw">
-     <component name="n:leavescan" long-name="Leavescan" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/srcanamdw_os/leavescan/group" mrp="os/buildtools/srcanamdw_os/leavescan/group/testtools_leavescan.mrp"/> -->
-     </component>
-     <component name="n:programchecker" long-name="Program Checker" deprecated="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/srcanamdw_os/programchecker/group" mrp="os/buildtools/srcanamdw_os/programchecker/group/testtools_programchecker.mrp"/> -->
-     </component>
-     <component name="n:migrationtool" long-name="Migration Tool" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/srcanamdw_os/migrationtool/group" mrp="os/buildtools/srcanamdw_os/migrationtool/group/testtools_migrationtool.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="imgtools_os" long-name="Image Tools" level="fw">
-     <component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/imgtools_os/romkiteka2/group" mrp="/sf/os/buildtools/imgtools_os/romkiteka2/group/tools_romkit.mrp"/>
-     </component>
-    </collection>
-    <collection name="n:binanamdw_os" long-name="Binary Analysis Middleware" level="fw">
-     <component name="n:captools" long-name="Capability Tools" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/binanamdw_os/captools/group" mrp="os/buildtools/binanamdw_os/captools/group/testtools_captools.mrp"/> -->
-     </component>
-     <component name="n:depcheck" long-name="Dependency Checker" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/binanamdw_os/depcheck" mrp="os/buildtools/binanamdw_os/depcheck/tools_depcheck.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="n:devlib" long-name="Developer Library" level="ui">
-     <component name="n:devlibhelp" long-name="Developer Library Help" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/devlib/devlibhelp/group/devlib94" mrp="os/buildtools/devlib/devlibhelp/group/devlib94/developerlibrary_doc_html.mrp" version="9.4"/> -->
-     </component>
-     <component name="n:toolsdocs" long-name="Tools Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/buildtools/devlib/toolsdocs/tools_documentation.mrp"/>
-     </component>
-    </collection>
-    <collection name="misccomponents" long-name="Misc Components" level="mw">
-     <component name="n:runperl" long-name="Run PERL" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/runperl/group" mrp="os/buildtools/misccomponents/runperl/group/tools_sdk_eng_runperl.mrp"/> -->
-     </component>
-     <component name="n:assertion" long-name="Assertion" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/assertion/group" mrp="os/buildtools/misccomponents/assertion/group/tools_sdk_eng_assertion.mrp"/> -->
-     </component>
-     <component name="n:enum" long-name="Enum" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/enum/group" mrp="os/buildtools/misccomponents/enum/group/tools_sdk_eng_enum.mrp"/> -->
-     </component>
-     <component name="n:logger" long-name="Logger" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/logger/group" mrp="os/buildtools/misccomponents/logger/group/tools_sdk_eng_logger.mrp"/> -->
-     </component>
-     <component name="n:filesys" long-name="Filesys" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/filesys/group" mrp="os/buildtools/misccomponents/filesys/group/tools_sdk_eng_filesys.mrp"/> -->
-     </component>
-     <component name="n:envvar" long-name="Envvar" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/envvar/group" mrp="os/buildtools/misccomponents/envvar/group/tools_sdk_eng_envvar.mrp"/> -->
-     </component>
-     <component name="n:installutils" long-name="Install Utils" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/installutils/group" mrp="os/buildtools/misccomponents/installutils/group/tools_sdk_eng_installutils.mrp"/> -->
-     </component>
-     <component name="n:mnemonicfix" long-name="Mnemonic Fix" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/mnemonicfix/group" mrp="os/buildtools/misccomponents/mnemonicfix/group/tools_sdk_eng_mnemonicfix.mrp"/> -->
-     </component>
-     <component name="n:pathbrowser" long-name="Path Browser" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/pathbrowser/group" mrp="os/buildtools/misccomponents/pathbrowser/group/tools_sdk_eng_pathbrowser.mrp"/> -->
-     </component>
-     <component name="n:shellexec" long-name="Shell Exec" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/shellexec/group" mrp="os/buildtools/misccomponents/shellexec/group/tools_sdk_eng_shellexec.mrp"/> -->
-     </component>
-     <component name="n:swingworker" long-name="Swing Worker" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/swingworker/group" mrp="os/buildtools/misccomponents/swingworker/group/tools_sdk_eng_swingworker.mrp"/> -->
-     </component>
-     <component name="n:testcaserunner" long-name="Test Case Runner" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/testcaserunner/group" mrp="os/buildtools/misccomponents/testcaserunner/group/tools_sdk_eng_testcaserunner.mrp"/> -->
-     </component>
-     <component name="n:toolbarpanel" long-name="Tool Bar Panel" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/toolbarpanel/group" mrp="os/buildtools/misccomponents/toolbarpanel/group/tools_sdk_eng_toolbarpanel.mrp"/> -->
-     </component>
-     <component name="n:javahelp" long-name="Java Help" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/javahelp/group" mrp="os/buildtools/misccomponents/javahelp/group/tools_sdk_eng_javahelp.mrp"/> -->
-     </component>
-     <component name="n:langconfig" long-name="Language Config" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/langconfig/group" mrp="os/buildtools/misccomponents/langconfig/group/tools_sdk_eng_langconfig.mrp"/> -->
-     </component>
-     <component name="n:sdkinfo" long-name="SDK Info" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/sdkinfo/group" mrp="os/buildtools/misccomponents/sdkinfo/group/tools_sdk_eng_sdkinfo.mrp"/> -->
-     </component>
-     <component name="n:jade" long-name="Jade " filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/jade/group" mrp="os/buildtools/misccomponents/jade/group/tools_sdk_eng_jade.mrp"/> -->
-     </component>
-     <component name="n:sdkpackagemgr" long-name="SDK Package Manager" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/sdkpackagemgr/group" mrp="os/buildtools/misccomponents/sdkpackagemgr/group/tools_sdk_eng_sdkpkg-manager.mrp"/> -->
-     </component>
-     <component name="n:sdkpkgtools" long-name="SDK Package Tools" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/sdkpkgtools/group" mrp="os/buildtools/misccomponents/sdkpkgtools/group/tools_sdk_eng_sdkpkg-tools.mrp"/> -->
-     </component>
-     <component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/buildtools/misccomponents/emulatorlauncher/group" mrp="/sf/os/buildtools/misccomponents/emulatorlauncher/group/tools_sdk_eng_emulator_launcher.mrp"/>
-     </component>
-     <component name="n:pkgmgrgui" long-name="SDK Package Manager GUI" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/pkgmgrgui/group" mrp="os/buildtools/misccomponents/pkgmgrgui/group/tools_sdk_eng_pkgmgrgui.mrp"/> -->
-     </component>
-     <component name="n:launch" long-name="Launch" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/launch/group" mrp="os/buildtools/misccomponents/launch/group/tools_sdk_eng_launch.mrp"/> -->
-     </component>
-     <component name="n:toolsstubs" long-name="Devices Tools Stubs" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/toolsstubs/group" mrp="os/buildtools/misccomponents/toolsstubs/group/tools_sdk_eng_tools_stubs.mrp"/> -->
-     </component>
-     <component name="n:bspbuilder" long-name="BSP Builder" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/bspbuilder/group" mrp="os/buildtools/misccomponents/bspbuilder/group/tools_bspbuilder.mrp"/> -->
-     </component>
-     <component name="n:splash" long-name="Splash Screen" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/splash/group" mrp="os/buildtools/misccomponents/splash/group/tools_sdk_eng_splash.mrp"/> -->
-     </component>
-     <component name="n:sdkbuilder" long-name="SDK Building Tools" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/misccomponents/sdkbuilder/group" mrp="os/buildtools/misccomponents/sdkbuilder/group/tools_sdk_eng_sdk_builder.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="n:javatoolsplat" long-name="Java Tools Platform" level="mw">
-     <component name="n:javalib" long-name="Java Library " filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/javatoolsplat/javalib/group" mrp="os/buildtools/javatoolsplat/javalib/group/tools_sdk_eng_javalibrary.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="n:fileconv" long-name="File Converters" level="mw">
-     <component name="n:cjpeg" long-name="CJpeg" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/fileconv/cjpeg/group" mrp="os/buildtools/fileconv/cjpeg/group/tools_sdk_eng_cjpeg.mrp"/> -->
-     </component>
-     <component name="n:alp2csh" long-name="ALP to CSH" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/fileconv/alp2csh/group" mrp="os/buildtools/fileconv/alp2csh/group/tools_sdk_eng_alp2csh.mrp"/> -->
-     </component>
-     <component name="n:rtf2ptml" long-name="RTF to PTML" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/buildtools/fileconv/rtf2ptml/group" mrp="os/buildtools/fileconv/rtf2ptml/group/tools_sdk_eng_rtf2ptml.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="buildtools_info" long-name="Build Tools Info" level="ui">
-     <component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/buildtools/buildtools_info/buildtools_metadata/buildtools_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/buildtools/sources.csv
--- a/3k/os/buildtools/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/cellularsrv/package_definition.xml
--- a/3k/os/cellularsrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="cellularsrv" long-name="Cellular Baseband Services" tech_domain="vc" level="services" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
-     <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
-     </component>
-    </collection>
-    <collection name="fax" long-name="Fax" level="server">
-     <component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/fax/faxclientandserver/Group" mrp="/sf/os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
-     </component>
-    </collection>
-    <collection name="smsprotocols" long-name="SMS Protocols" level="framework">
-     <component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/smsprotocols/smsstack/group" mrp="/sf/os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
-     </component>
-     <component name="n:cdmasmsstack" long-name="CDMA SMS Stack" introduced="8.0" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/cellularsrv/smsprotocols/cdmasmsstack/group" mrp="os/cellularsrv/smsprotocols/cdmasmsstack/group/nbprotocols_cdmasmsstack.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="telephonyprotocols" long-name="Telephony Protocols" level="framework">
-     <component name="csdagt" long-name="CSD AGT" introduced="6.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/csdagt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/csdagt/group/networking_csdagt.mrp"/>
-     </component>
-     <component name="psdagt" long-name="PSD AGT" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/psdagt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/psdagt/group/networking_psdagt.mrp"/>
-     </component>
-     <component name="gprsumtsqosprt" long-name="GPRS/UMTS QoS PRT" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group" mrp="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp"/>
-     </component>
-     <component name="gprsumtsqosinterface" long-name="GPRS/UMTS QoS Interface" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group" mrp="/sf/os/cellularsrv/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp"/>
-     </component>
-     <component name="qosextnapi" long-name="QoS Extn API" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/qosextnapi/group" mrp="/sf/os/cellularsrv/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
-     </component>
-     <component name="secondarypdpcontextumtsdriver" long-name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="/sf/os/cellularsrv/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
-     </component>
-     <component name="umtsgprsscpr" long-name="UMTS/GPRS SCPR" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/umtsgprsscpr/group" mrp="/sf/os/cellularsrv/telephonyprotocols/umtsgprsscpr/group/networking_UmtsGprsSCPR.mrp"/>
-     </component>
-     <component name="qos3gppcpr" long-name="QoS 3GPP CPR" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/qos3gppcpr/group" mrp="/sf/os/cellularsrv/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp"/>
-     </component>
-     <component name="rawipnif" long-name="Raw IP NIF" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyprotocols/rawipnif/group" mrp="/sf/os/cellularsrv/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp"/>
-     </component>
-    </collection>
-    <collection name="telephonyserver" long-name="Telephony Server" level="server">
-     <component name="etelserverandcore" long-name="ETel Server and Core" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group" mrp="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel.mrp"/>
-     </component>
-     <component name="etelconfig" long-name="ETel Config" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/cellularsrv/telephonyserver/etelserverandcore/group/telephony_etel-config.mrp"/>
-     </component>
-     <component name="etelmultimode" long-name="ETel Multimode" introduced="7.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelmultimode/group" mrp="/sf/os/cellularsrv/telephonyserver/etelmultimode/group/telephony_etelmm.mrp"/>
-     </component>
-     <component name="etelpacketdata" long-name="ETel Packet Data" introduced="7.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelpacketdata/group" mrp="/sf/os/cellularsrv/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp"/>
-     </component>
-     <component name="etelsimtoolkit" long-name="ETel SIM Toolkit" introduced="6.1" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelsimtoolkit/group" mrp="/sf/os/cellularsrv/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp"/>
-     </component>
-     <component name="n:etelcdma" long-name="ETel CDMA" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/cellularsrv/telephonyserver/etelcdma/group" mrp="os/cellularsrv/telephonyserver/etelcdma/group/telephony_etelcdma.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="telephonyserverplugins" long-name="Telephony Server Plugins" level="plugin">
-     <!--Component manually removed, already declared in OS-->
-     <!--<component name="common_tsy">
-       -  <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/test/component/group"/>  -
-       -  <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/group"/>  -
-       -  <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group"/>  -
-       -  <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/group"/>  -
-       -  <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/test/integration/group"/>  -
-       -  <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/test/integration/testsuites/group"/>  -
-     </component>-->
-     <!--Component manually removed as empty and name conflicts with an OS component-->
-     <!--<component name="multimodetsy"/>-->
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="cdmatsy"/>-->
-     <!--Component manually removed as empty and name conflicts with an OS component-->
-     <!--<component name="simtsy"/>-->
-    <component name="common_tsy" long-name="Common TSY" introduced="tb92" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
-     </component>
-     <component name="licenseetsystub" long-name="Licensee TSY Stub" introduced="tb91" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp"/>
-     </component>
-     <component name="multimodetsy" long-name="Multimode TSY" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/multimodetsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp"/>
-     </component>
-     <component name="cdmatsy" long-name="CDMA TSY" introduced="7.0" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/cdmatsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/cdmatsy/group/telephony_cdmatsy.mrp"/>
-     </component>
-     <component name="simtsy" long-name="SIM TSY" introduced="7.0" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/telephonyserverplugins/simtsy/group" mrp="/sf/os/cellularsrv/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp"/>
-     </component>
-    </collection>
-    <collection name="commonnetworkinterface" long-name="Common Network Interface" level="hw-if">
-     <component name="gennif" long-name="Generic NIF" origin-model="foundation">
-      <unit bldFile="/sf/os/cellularsrv/commonnetworkinterface/gennif/group"/>
-     </component>
-     <component name="gprsumtsagent" long-name="GPRS UMTS Agent" origin-model="foundation">
-      <unit bldFile="/sf/os/cellularsrv/commonnetworkinterface/gprsumtsagent/group"/>
-     </component>
-     <component unofficial="yes" name="commonnetworkinterface_build" long-name="Common Network Interface Build" origin-model="foundation">
-      <unit bldFile="/sf/os/cellularsrv/commonnetworkinterface/group"/>
-     </component>
-    </collection>
-    <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
-     <component name="isc_if" long-name="ISC Interface" origin-model="foundation">
-      <unit bldFile="/sf/os/cellularsrv/basebandabstraction/isc_if/group"/>
-     </component>
-     <!--Component manually removed and merged to OS, unit originately commented out by Bob's script-->
-     <!--<component name="basebandchanneladaptor">
-       -  <unit bldFile="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/test/te_bca/group"/>  -
-     </component>-->
-     <!--Component manually removed as empty and name conflicts with an OS component-->
-     <!--<component name="intersystemcomm"/>-->
-    <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
-     </component>
-     <component name="intersystemcomm" long-name="Inter-System Communication" filter="gt" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/basebandabstraction/intersystemcomm/group" mrp="/sf/os/cellularsrv/basebandabstraction/intersystemcomm/group/networking_isc.mrp"/>
-     </component>
-    </collection>
-	<!-- Collection manually added due to faulty merge XSLT -->
-	<collection name="telephonyutils" long-name="Telephony Utilities" level="app-if">
-	 <component name="dial" long-name="Dial" deprecated="9.1" purpose="optional">
-	  <unit bldFile="/sf/os/cellularsrv/telephonyutils/dial/group" mrp="/sf/os/cellularsrv/telephonyutils/dial/group/telephony_dial.mrp"/>
-	 </component>
-	 <component name="telephonywatchers" long-name="Telephony Watchers" introduced="6.0" purpose="optional" plugin="Y">
-	  <unit bldFile="/sf/os/cellularsrv/telephonyutils/telephonywatchers/group" mrp="/sf/os/cellularsrv/telephonyutils/telephonywatchers/group/telephony_watchers.mrp"/>
-	 </component>
-	 <component name="etel3rdpartyapi" long-name="ETel 3rd Party API" introduced="7.0" purpose="mandatory">
-	  <unit bldFile="/sf/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group" mrp="/sf/os/cellularsrv/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp"/>
-	 </component>
-	</collection>
-    <collection name="cellularsrv_info" long-name="Cellular Baseband Services Info" level="app-if">
-     <component unofficial="yes" name="cellularsrv_build" long-name="Cellular Baseband Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/cellularsrv/group"/>
-     </component>
-     <component unofficial="yes" name="cellularsrv_plat" long-name="Cellular Baseband Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/os/cellularsrv/cellularsrv_plat/group"/>
-     </component>
-    <component name="telephonyconfidentialdocs" long-name="Telephony Confidential Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/cellularsrv/cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
-     </component>
-     <component name="telephonydocs" long-name="Telephony Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/cellularsrv/cellularsrv_info/telephonydocs/telephony_documentation.mrp"/>
-     </component>
-     <component name="cellularsrv_metadata" long-name="Cellular Baseband Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
-     </component>
-    </collection>
-   <collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
-     <component name="mocksy" long-name="MockSY" introduced="tb91" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="/sf/os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
-     </component>
-    </collection>
-    <collection name="cellularsrvapitest" long-name="Telephony API Tests" level="app-if">
-     <component name="datatransferhaitest" long-name="Data Transfer HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-	<unit mrp="cellularsrvapitest/datatransferhaitest/group/datatransferhai.mrp"/>
-	-->
-     </component>
-     <component name="telephonyhaitest" long-name="Telephony HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-	<unit mrp="cellularsrvapitest/telephonyhaitest/group/telephonyhai.mrp"/>
-	-->
-     </component>
-     <component name="telephonydevsoundhaitest" long-name="DevSound Telephony HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-	<unit mrp="cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhai.mrp"/>
-	-->
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/cellularsrv/sources.csv
--- a/3k/os/cellularsrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/commsfw/package_definition.xml
--- a/3k/os/commsfw/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="commsfw" long-name="Communications Framework" tech_domain="dc" level="services" levels="server support framework process app-if">
-    <collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
-     <component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
-     </component>
-    </collection>
-    <collection name="commsprocess" long-name="Comms Process" level="process">
-     <component name="commsrootserver" long-name="Comms Root Server" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/commsfw/commsprocess/commsrootserverconfig/group" mrp="/sf/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver.mrp"/>
-     </component>
-     <component name="commsrootserverconfig" long-name="Comms Root Server Config" introduced="9.1" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/commsfw/commsprocess/commsrootserverconfig/group/comms-infras_rootserver-config.mrp"/>
-     </component>
-    </collection>
-	<!-- Collection manually added due to faulty merge XSLT -->
-	<collection name="commsconfig" long-name="Comms Config" level="process">
-	 <component name="commsdatabase" long-name="Comms Database" purpose="mandatory">
-	  <unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group" mrp="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/group/comms-infras_commsdat.mrp"/>
-	 </component>
-	 <component name="commsdatabaseshim" long-name="Comms Database Shim" introduced="8.1" purpose="mandatory">
-	  <unit bldFile="/sf/os/commsfw/commsconfig/commsdatabaseshim/group" mrp="/sf/os/commsfw/commsconfig/commsdatabaseshim/group/comms-infras_commdbshim.mrp"/>
-	 </component>
-	</collection>
-    <collection name="datacommsserver" long-name="Data Comms Server" level="framework">
-     <component name="esockserver" long-name="ESock Server" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/commsfw/datacommsserver/esockserver/group" mrp="/sf/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock.mrp" version="2"/>
-     </component>
-     <component name="esockserverconfig" long-name="ESock Server Config" introduced="9.1" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/commsfw/datacommsserver/esockserver/group/comms-infras_esock-config.mrp" version="2"/>
-     </component>
-     <component name="networkinterfacemgr" long-name="Network Interface Manager" introduced="ER5U" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/commsfw/datacommsserver/networkinterfacemgr/group" mrp="/sf/os/commsfw/datacommsserver/networkinterfacemgr/group/comms-infras_nifman.mrp" version="1"/>
-     </component>
-     <component name="networkingdialogapi" long-name="Networking Dialog API" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/commsfw/datacommsserver/networkingdialogapi/group" mrp="/sf/os/commsfw/datacommsserver/networkingdialogapi/group/networking_dialog.mrp"/>
-     </component>
-     <component name="networkingdialogstub" long-name="Networking Dialog Stub" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/commsfw/datacommsserver/networkingdialogapi/default" mrp="/sf/os/commsfw/datacommsserver/networkingdialogapi/default/networking_dialog_default.mrp"/>
-     </component>
-     <component name="networkcontroller" long-name="Network Controller" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/commsfw/datacommsserver/networkcontroller/group" mrp="/sf/os/commsfw/datacommsserver/networkcontroller/group/networking_netcon.mrp"/>
-     </component>
-    </collection>
-    <collection name="serialserver" long-name="Serial Server" level="server">
-     <component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" class="placeholder" plugin="Y" origin-model="Symbian">
-      <!-- placeholder for ser-comms_serialportcsy, currently built by C32 -->
-     </component>
-     <component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/commsfw/serialserver/packetloopbackcsy/group" mrp="/sf/os/commsfw/serialserver/packetloopbackcsy/group/PacketLoopbackCSY.mrp"/>
-     </component>
-     <component name="c32serialserver" long-name="C32 Serial Server" introduced="ER5" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/commsfw/serialserver/c32serialserver/group" mrp="/sf/os/commsfw/serialserver/c32serialserver/group/ser-comms_c32.mrp"/>
-     </component>
-     <component name="c32serialserverconfig" long-name="C32 Serial Server Config" introduced="ER5" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/commsfw/serialserver/c32serialserverconfig" mrp="/sf/os/commsfw/serialserver/c32serialserverconfig/ser-comms_c32-config.mrp"/>
-     </component>
-     <component name="c32serialserverdocs" long-name="C32 Serial Server Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/commsfw/serialserver/c32serialserverdocs/ser-comms_documentation.mrp"/>
-     </component>
-    </collection>
-    <collection name="baseconnectionproviders" long-name="Base Connection Providers" level="framework">
-     <component name="refcpr" long-name="Reference CPR" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/commsfw/baseconnectionproviders/refcpr/group" mrp="/sf/os/commsfw/baseconnectionproviders/refcpr/group/networking_ReferenceCPR.mrp"/>
-     </component>
-     <component name="refscpr" long-name="Reference SCPR" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/commsfw/baseconnectionproviders/refscpr/group" mrp="/sf/os/commsfw/baseconnectionproviders/refscpr/group/networking_ReferenceSCPR.mrp"/>
-     </component>
-    </collection>
-    <collection name="commsfwutils" long-name="Comms Framework Utilities" level="framework">
-     <component name="commfw" long-name="Comms Framework" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/commsfw/commsfwutils/commfw/group" mrp="/sf/os/commsfw/commsfwutils/commfw/group/comms-infras_commsfw.mrp" priority="10"/>
-     </component>
-     <component name="mbufmgr" long-name="MBuf Manager" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/commsfw/commsfwutils/mbufmgr/group" mrp="/sf/os/commsfw/commsfwutils/mbufmgr/group/comms-infras_mbufmgr.mrp"/>
-     </component>
-    </collection>
-    <collection name="commsfw_info" long-name="Comms Framework Info" level="app-if">
-     <component name="commsinfrastructuredocs" long-name="Comms Infrastructure Documentation" introduced="7.0" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/commsfw/commsfw_info/commsinfrastructuredocs/comms-infras_documentation.mrp"/>
-     </component>
-     <component name="commsfw_metadata" long-name="Communications Framework Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/commsfw/commsfw_info/commsfw_metadata/commsfw_metadata.mrp"/>
-     </component>
-    </collection>
-    <collection name="commsfwsupport" long-name="Comms Framework Support" level="support">
-     <component name="commselements" long-name="Comms Elements" introduced="8.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/commsfw/commsfwsupport/commselements/group" mrp="/sf/os/commsfw/commsfwsupport/commselements/group/comms-infras_elements.mrp"/>
-     </component>
-    </collection>
-    <collection name="commsfwtools" long-name="Comms Framework Tools" level="app-if">
-     <!-- Removing GT commdb
-<component name="preparedefaultcommsdatabase" long-name="Prepare Default Comms Database" filter="gt" purpose="mandatory" class="config PC">
-<unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/comms-infras_defaultcommdb.mrp"/>
-</component>
--->
-     <!-- <component name="installdefaultcommsdatabase" long-name="Install Default Comms Database" purpose="mandatory" class="PC">
-<unit bldFile="/sf/os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group" mrp="os/commsfw/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/comms-infras_installdefaultcommdb.mrp" priority="1010"/>
-</component> -->
-     <component name="commstools" long-name="Comms Tools" introduced="tb91" purpose="development" class="PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/commsfw/commsfwtools/commstools/group/comms-infras_tools.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/commsfw/sources.csv
--- a/3k/os/commsfw/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/deviceplatformrelease/package_definition.xml
--- a/3k/os/deviceplatformrelease/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="deviceplatformrelease" long-name="Device Platform Release" tech_domain="to" level="services" levels="bld mid top">
-    <collection name="s60extras" long-name="S60 Extras" level="mid">
-     <component name="s60extras_build" long-name="S60 Extras Component" origin-model="foundation">
-      <unit bldFile="/sf/os/deviceplatformrelease/s60extras/group"/>
-     </component>
-    </collection>
-    <collection name="s60locfiles" long-name="S60 Loc Files" level="mid">
-     <component name="s60locfiles_build" long-name="S60 Loc Files Component" origin-model="foundation">
-      <unit bldFile="/sf/os/deviceplatformrelease/s60locfiles/group"/>
-     </component>
-    </collection>
-    <collection name="version" long-name="Version" level="top">
-     <component name="version_build" long-name="Version Component" origin-model="foundation">
-      <unit bldFile="/sf/os/deviceplatformrelease/version/group"/>
-     </component>
-    </collection>
-    <collection name="sf_config" long-name="SF Config" level="mid">
-     <component name="config" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/deviceplatformrelease/sf_config/config/apac/group"/> -->
-      <!-- <unit bldFile="/sf/os/deviceplatformrelease/sf_config/config/group"/> -->
-      <!-- <unit bldFile="/sf/os/deviceplatformrelease/sf_config/config/japan/group"/> -->
-      <!-- <unit bldFile="/sf/os/deviceplatformrelease/sf_config/config/western/group"/> -->
-     </component>
-    </collection>
-    <collection name="s60bld">
-     <component unofficial="yes" name="buildplatforms" origin-model="foundation">
-      <unit bldFile="/sf/tools/buildplatforms/group"/>
-     </component>
-    </collection>
-   <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
-     <component name="cedarutils" long-name="Cedar Utils" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
-     </component>
-     <component name="productionbldcbrconfig" long-name="Production Build CBR Config" filter="gt" purpose="development" class="config" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/deviceplatformrelease/symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
-     </component>
-    </collection>
-    <collection name="foundation_system" long-name="Foundation System" level="top">
-     <component name="systemdocs" long-name="System Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/deviceplatformrelease/foundation_system/systemdocs/group/system.mrp"/>
-     </component>
-     <component name="system_model" long-name="System Model" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/deviceplatformrelease/foundation_system/system_model/system_model.mrp"/>
-     </component>
-    </collection>
-    <collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
-     <component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/deviceplatformrelease/deviceplatformrelease_info/deviceplatformrelease_metadata/deviceplatformrelease_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/deviceplatformrelease/sources.csv
--- a/3k/os/deviceplatformrelease/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/devicesrv/package_definition.xml
--- a/3k/os/devicesrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="devicesrv" long-name="Device Services" tech_domain="hb" level="services" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="accessoryservices" long-name="Accessory Services" level="framework">
-     <component name="accessorymonitor" long-name="Accessory Monitor" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonconnectionemulator/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/tests/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/accmontesttimer/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/accfwuinotifierstub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/asystub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessorymonitor/tsrc/public/basic/stubs/group"/> -->
-     </component>
-     <component name="accessoryremotecontrol" long-name="Accessory Remote Control" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dosservercontrol/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfcore/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/dsytesttool/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/audio/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/phone/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryremotecontrol/tsrc/stub/remcon/group"/> -->
-     </component>
-     <component name="accessoryserver" long-name="Accessory Server" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dosservercontrol/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfcore/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/dsytesttool/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/accessorytestcontrol/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/accfwuinotifierstub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/asystub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/btasystub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/accessoryserver/tsrc/public/basic/stubs/group"/> -->
-     </component>
-     <component name="headsetstatusapi" long-name="Headset Status Api" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/headsetstatusapi/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/headsetstatusapi/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="tspclientmapper" long-name="TSP Client Mapper" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/tspclientmapper/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/accessoryservices/tspclientmapper/tsrc/public/basic/group"/> -->
-     </component>
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="remotecontrolfw">
-       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/bearerplugin/group"/>
-       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/client"/>
-       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/converterplugin/group"/>
-       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/reference"/>
-       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/server/group"/>
-       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/targetselectorplugin/group"/>
-       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/test"/>
-       <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/types/group"/>
-     </component>-->
-     <component name="reftsp" origin-model="foundation"/>
-     <component unofficial="yes" name="accessoryservices_build" long-name="Accessory Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/group"/>
-     </component>
-    <component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
-     </component>
-    </collection>
-    <collection name="commonservices" long-name="Common Services" level="app-if">
-     <component name="commonengine" long-name="Common Engine" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/commonservices/commonengine/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/commonengine/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="commonengineresources" long-name="Common Engine Resources" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/commonservices/commonengineresources/group"/>
-     </component>
-     <component name="platformenv" long-name="Platform Env" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/disknotifyhandler/group"/> -->
-      <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/platformver/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/sysversioninfo/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/platformenv/tsrc/public/basic/group"/> -->
-     </component>
-     <component name="sysutil" long-name="Sysutil" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/commonservices/sysutil/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/sysutil/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/commonservices/sysutil/tsrc/public/basic/sysutiltests/group"/> -->
-     </component>
-     <component name="activitymanager" long-name="Activity Manager" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/commonservices/activitymanager/group"/>
-      <unit bldFile="/sf/os/devicesrv/commonservices/activitymanager/tsrc/public/basic/group"/>
-     </component>
-     <component unofficial="yes" name="commonservices_build" long-name="Common Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/commonservices/group"/>
-     </component>
-    </collection>
-    <collection name="dosservices" long-name="Dos Services" level="hw-if">
-     <component name="commondsy" long-name="Common DSY" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/dosservices/commondsy/group"/>
-     </component>
-     <component name="dosserver" long-name="Dos Server" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/dosservices/dosserver/group"/>
-     </component>
-     <component unofficial="yes" name="dosservices_test" long-name="Dos Services Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/dsytesttool/dosservercontrol/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/public/basic/stubs/dsystub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/dsytesttool/dsytfcore/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/public/basic/dosservertestplugin/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/dsytesttool/dsytfstifadapter/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/dosservices/tsrc/dsytesttool/group"/> -->
-     </component>
-     <component unofficial="yes" name="dosservices_build" long-name="Dos Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/dosservices/group"/>
-     </component>
-    </collection>
-    <collection name="resourcemgmt" long-name="Resource Management" level="hw-if">
-     <component name="serverexe" long-name="Server Exe" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/serverexe/group"/> -->
-     </component>
-     <component name="hwrmfmtxwatcherplugin" long-name="HWRM FM Transmitter Watcher Plugin" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwrmfmtxwatcherplugin/group"/> -->
-     </component>
-     <component name="clientdll" long-name="Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/clientdll/group"/> -->
-     </component>
-     <component name="commondll" long-name="Common DLL" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/commondll/group"/> -->
-     </component>
-     <component name="vibraclientdll" long-name="Vibra Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/vibraclientdll/group"/> -->
-     </component>
-     <component name="extendedlightclientdll" long-name="Extended Light Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/extendedlightclientdll/group"/> -->
-     </component>
-     <component name="lightclientdll" long-name="Light Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/lightclientdll/group"/> -->
-     </component>
-     <component name="fmtxclientdll" long-name="FM TX Client DLL" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/fmtxclientdll/group"/> -->
-     </component>
-     <component name="hwrmtargetmodifierplugin" long-name="HWRM Target Modifier Plugin" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwrmtargetmodifierplugin/tsrc/hwrmtargetmodifierplugintest/group"/> -->
-     </component>
-     <component name="vibractrl" long-name="Vibra Control" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/resourcemgmt/vibractrl/group"/>
-     </component>
-     <component name="hwresourcesmgr" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/test/group"/>
-      <unit bldFile="/sf/os/devicesrv/resourcemgmt/hwresourcesmgr/test/plugins/targetmodifierplugin/group"/>
-     </component>
-     <!--Component manually removed as empty and name conflicts with an OS component-->
-     <!--<component name="powerandmemorynotificationservice"/>-->
-     <component unofficial="yes" name="resourcemgmt_build" long-name="Resource Management Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/resourcemgmt/group"/>
-     </component>
-     <component unofficial="yes" name="resourcemgmt_test" long-name="Resource Management Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/resourcemgmt/tsrc/public/basic/group"/> -->
-     </component>
-    <component name="powerandmemorynotificationservice" long-name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group" mrp="/sf/os/devicesrv/resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
-     </component>
-    </collection>
-    <collection name="hwrmhaptics" long-name="HWRM Haptics" level="plugin">
-     <component name="hapticseffectdatagetterfw" long-name="Haptics Effect Data Getter Framework" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticseffectdatagetterfw/group"/>
-     </component>
-     <component name="hapticspluginservice" long-name="Haptics Plugin Service" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspluginservice/group"/>
-     </component>
-     <component name="hapticspacketizer" long-name="Haptics Packetizer" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspacketizer/group"/>
-     </component>
-     <component name="hapticspluginmanager" long-name="Haptics Plugin Manager" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticspluginmanager/group"/>
-     </component>
-     <component name="hapticsserver" long-name="Haptics Server" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticsserver/group"/>
-     </component>
-     <component name="hapticsclient" long-name="Haptics Client" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/hapticsclient/group"/>
-     </component>
-     <component unofficial="yes" name="hwrmhaptics_build" long-name="HWRM Haptics Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/hwrmhaptics/group"/>
-     </component>
-    </collection>
-    <collection name="mediator" long-name="Mediator" level="app-if">
-     <component unofficial="yes" name="mediator_test" long-name="Mediator Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/mediator/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/mediator/tsrc/public/basic/stub/group"/> -->
-     </component>
-     <component unofficial="yes" name="mediator_build" long-name="Mediator Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/mediator/group"/>
-     </component>
-    </collection>
-    <collection name="psmservices" long-name="PSM Services" level="app-if">
-     <component name="psmserver" long-name="PSM Server" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/psmservices/psmserver/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/psmservices/psmserver/tsrc/public/basic/group"/> -->
-     </component>
-     <component unofficial="yes" name="psmservices_build" long-name="PSM Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/psmservices/group"/>
-     </component>
-    </collection>
-    <collection name="sensorservices" long-name="Sensor Services" level="framework">
-     <component name="sensorserver" long-name="Sensor Server" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/condevalstub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/sensrvcondevalplugin/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/ssystub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensorserver/tsrc/public/basic/sensortestmodule/stubprocess/group"/> -->
-     </component>
-     <component name="orientationssy" long-name="Orientation SSY" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/sensorservices/orientationssy/group"/>
-     </component>
-     <component name="tiltcompensationssy" long-name="Tilt Compensation SSY" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/sensorservices/tiltcompensationssy/group"/>
-     </component>
-     <component name="sensordatacompensator" long-name="Sensor Data Compensator" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/sensorservices/sensordatacompensator/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensordatacompensator/tsrc/sensordatacompensatorpluginstub/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group"/> -->
-     </component>
-     <component unofficial="yes" name="sensorservices_build" long-name="Sensor Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/sensorservices/group"/>
-     </component>
-    </collection>
-    <collection name="sysstatemgmt" long-name="System State Management" level="server">
-     <component name="starter" long-name="Starter" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/starter/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/sysstatemgmt/starter/strtsecnote/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/sysstatemgmt/starter/strtsecobs/group"/> -->
-     </component>
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="systemstarter">
-       -  <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/sysmondemo/group"/>  -
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tamastarter/group"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tapstart/group"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tdscstore/group"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testappgood"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testappnorv"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testapprvafterretry"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testapprverror"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testappslow"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/testprocgood"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/trestartsys/group"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tstartsafe/group"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tstartupproperties/group"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tsysmon/group"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart/group"/>
-       <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/test/tsysstart2/group"/>
-     </component>-->
-     <component unofficial="yes" name="sysstatemgmt_build" long-name="System State Management Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/group"/>
-     </component>
-     <component unofficial="yes" name="sysstatemgmt_test" long-name="System State Management Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/sysstatemgmt/tsrc/public/basic/group"/> -->
-     </component>
-    <component name="systemstarter" long-name="System Starter" introduced="9.1" deprecated="tb92" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/devicesrv/sysstatemgmt/systemstarter/group" mrp="/sf/os/devicesrv/sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
-     </component>
-    </collection>
-    <collection name="devicesrvapitest" long-name="Devices Services API Tests" level="app-if">
-     <component name="accessorieshaitest" long-name="Accessories HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-	<unit mrp="devicesrvapitest/accessorieshaitest/gropup/accessorieshai.mrp"/>
-	-->
-     </component>
-     <component name="hwrmhaitest" long-name="HWRM HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-	<unit mrp="devicesrvapitest/hwrmhaitest/group/hwrmhai.mrp"/>
-	-->
-     </component>
-    </collection>
-    <collection name="devicesrv_info" long-name="Device Services Info" level="app-if">
-     <component unofficial="yes" name="devicesrv_pub" long-name="Device Services Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/accessory_monitoring_api/tsrc/bc/accmonapibctests/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/feature_discovery_api/tsrc/bc/featurediscovery/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/find_item_api/tsrc/bc/finditem/group"/> -->
-      <unit bldFile="/sf/os/devicesrv/devicesrv_pub/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/hwrm_power_state_api/tsrc/bc/powerstate/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/light_api/tsrc/bc/light/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/phone_parser_api/tsrc/bc/phoneparser/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/platform_environment_api/tsrc/bc/platformenv/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/sensor_channel_api/tsrc/bc/sensor/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/sensor_data_compensator_api/tsrc/bc/sensordatacompensatortest/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/sysutil_api/tsrc/bc/sysutil/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/text_resolver_api/tsrc/bc/textresolver/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/version_info_api/tsrc/bc/platformvertest/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_pub/vibra_api/tsrc/bc/vibra/group"/> -->
-     </component>
-     <component unofficial="yes" name="devicesrv_build" long-name="Device Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/group"/>
-     </component>
-     <component unofficial="yes" name="devicesrv_plat" long-name="Device Services Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/devicesrv_plat/activity_manager_api/tsrc/group"/> -->
-      <unit bldFile="/sf/os/devicesrv/devicesrv_plat/group"/>
-     </component>
-    <component name="devicesrv_metadata" long-name="Device Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/devicesrv/devicesrv_info/devicesrv_metadata/devicesrv_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/devicesrv/sources.csv
--- a/3k/os/devicesrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/graphics/package_definition.xml
--- a/3k/os/graphics/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="graphics" long-name="Graphics" tech_domain="ui" level="services" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-    <collection name="graphicsaccelaration" long-name="Graphics Accelaration" level="adaptation">
-     <component name="vgi" long-name="VGI" origin-model="foundation">
-      <unit bldFile="/sf/os/graphics/graphicsaccelaration/vgi/group"/>
-     </component>
-     <component name="2d_openvg_1_0" long-name="2D Open VG 1.0" origin-model="foundation"/>
-     <component name="3d_opengl_es_1_1" long-name="3d OpenGL ES 1.1" origin-model="foundation"/>
-    </collection>
-    <collection name="m3g" long-name="M3G" level="internal-adaptations">
-     <component name="m3gcore11" long-name="M3G Core 11" origin-model="foundation">
-      <unit bldFile="/sf/os/graphics/m3g/m3gcore11/group"/>
-     </component>
-    </collection>
-    <collection name="graphicstest" long-name="Graphics Test" level="app-if">
-     <component name="graphicstestharness" long-name="Graphics Test Harness" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/graphics/graphicstest/graphicstestharness/group/graphics_testharness.mrp"/>
-     </component>
-     <component name="uibench" long-name="UI Bench" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/graphicstest/uibench/group" mrp="/sf/os/graphics/graphicstest/uibench/group/graphics_ui_bench.mrp"/>
-     </component>
-    </collection>
-    <collection name="graphics_info" long-name="Graphics Info" level="app-if">
-     <component unofficial="yes" name="graphicssvs" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/graphics/graphicsapitest/graphicssvs/wserv/animplugin/group"/> -->
-      <!-- <unit bldFile="/sf/os/graphics/graphicsapitest/graphicssvs/wserv/twsgraphicshare"/> -->
-	  <unit mrp="/sf/os/graphics/graphicsapitest/graphicssvs/group/graphicssvs.mrp"/>
-     </component>
-     <component unofficial="yes" name="graphics_pub" long-name="Graphics Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/graphics/graphics_pub/group"/> -->
-     </component>
-     <component unofficial="yes" name="graphics_build" long-name="Graphics Build" origin-model="foundation">
-      <unit bldFile="/sf/os/graphics/group"/>
-     </component>
-     <component unofficial="yes" name="graphics_plat" long-name="Graphics Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/os/graphics/graphics_plat/group"/>
-     </component>
-    <component name="graphicsdocs" long-name="Graphics Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/graphics/graphics_info/graphicsdocs/graphics_documentation.mrp"/>
-     </component>
-     <component name="graphics_metadata" long-name="Graphics Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/graphics/graphics_info/graphics_metadata/graphics_metadata.mrp"/>
-     </component>
-    </collection>
-   <collection name="windowing" long-name="Windowing" level="app-if">
-     <component name="windowserver" long-name="Window Server" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/windowing/windowserver/group" mrp="/sf/os/graphics/windowing/windowserver/group/graphics_wserv.mrp"/>
-     </component>
-    </collection>
-    <collection name="printingservices" long-name="Printing Services" level="app-if">
-     <component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/printingservices/printerdriversupport/group" mrp="/sf/os/graphics/printingservices/printerdriversupport/group/graphics_pdrstore.mrp"/>
-     </component>
-     <component name="printerdrivers" long-name="Printer Drivers" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/printingservices/printerdrivers/group" mrp="/sf/os/graphics/printingservices/printerdrivers/group/graphics_printdrv.mrp"/>
-     </component>
-    </collection>
-    <collection name="fbs" long-name="Font and Bitmap Server" level="device-interface">
-     <component name="fontandbitmapserver" long-name="Font and Bitmap Server" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/fbs/fontandbitmapserver/group" mrp="/sf/os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
-     </component>
-    </collection>
-    <collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
-     <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/opengles/openglesinterface/group" mrp="/sf/os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
-     </component>
-     <component name="n:openglesimplementation" long-name="OpenGL ES Implementation" filter="gt" introduced="8.0" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/graphics/opengles/openglesimplementation/group/" mrp="os/graphics/opengles/openglesimplementation/group/graphics_opengles.mrp"/> -->
-     </component>
-     <component name="n:openglesdisplayproperties" long-name="OpenGL ES Display Properties" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/graphics/opengles/openglesdisplayproperties/group" mrp="os/graphics/opengles/openglesdisplayproperties/group/graphics_openglesdisplayproperty.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
-     <component name="openvginterface" long-name="OpenVG Interface" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/openvg/openvginterface/group" mrp="/sf/os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
-     </component>
-	 <component name="openvg11" long-name="OpenVG11" level="internal-adaptations">
-      <unit bldFile="/sf/os/graphics/openvg/openvginterface/group/openvg11"/>
-     </component>
-    </collection>
-    <collection name="egl" long-name="EGL" level="internal-adaptations">
-     <component name="eglinterface" long-name="EGL Interface" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/egl/eglinterface/group" mrp="/sf/os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
-     </component>
-     <component name="n:eglimplementation" long-name="EGL Implementation" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/graphics/egl/eglimplementation/group/" mrp="os/graphics/egl/eglimplementation/group/graphics_egl.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
-     <component name="gdi" long-name="GDI" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/gdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
-     </component>
-     <component name="bitgdi" long-name="BitGDI" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/bitgdi/group" mrp="/sf/os/graphics/graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
-     </component>
-     <component name="colourpalette" long-name="Colour Palette" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/colourpalette/group" mrp="/sf/os/graphics/graphicsdeviceinterface/colourpalette/group/graphics_palette.mrp"/>
-     </component>
-     <component name="screendriver" long-name="Screen Driver" introduced="6.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/graphicsdeviceinterface/screendriver/group" mrp="/sf/os/graphics/graphicsdeviceinterface/screendriver/group/graphics_screendriver.mrp"/>
-     </component>
-    </collection>
-    <collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
-	 <!-- Following component removed to avoid bmconv.exe collision with S60 version, collaterals: fontcomp.exe not built by OS anymore -->
-<!--     <component name="gdi_tools" long-name="GDI Tools" purpose="development" class="PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/graphicstools/gdi_tools/group" mrp="os/graphics/graphicstools/gdi_tools/group/graphics_gditools.mrp"/>
-     </component>
--->
-    </collection>
-    <collection name="graphcisapitest" long-name="Graphics API Tests" level="app-if">
-     <component name="screendriverhaitest" long-name="Screen Driver HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-      <unit mrp="graphicsapitest/screendriverhaitest/group/screendriverhai.mrp"/>
-	-->
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/graphics/sources.csv
--- a/3k/os/graphics/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/graphics/,/sf/os/graphics,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/imagingext/package_definition.xml
--- a/3k/os/imagingext/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="imagingext" long-name="Imaging Extensions" tech_domain="mm" level="services" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
-     <component name="iclextjpegapi" long-name="ICL Ext JPEG API" origin-model="foundation">
-      <unit bldFile="/sf/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-     </component>
-     <component unofficial="yes" name="imageadaptationextensions_build" long-name="Image Adaptation Extensions Build" origin-model="foundation">
-      <unit bldFile="/sf/os/imagingext/imageadaptationextensions/group"/>
-     </component>
-    </collection>
-    <collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
-     <component name="exiflib" long-name="Exif Lib" origin-model="foundation">
-      <unit bldFile="/sf/os/imagingext/imagingmodules/exiflib/group"/>
-     </component>
-     <component name="jp2kcodec" long-name="JP2K Codec" origin-model="foundation">
-      <unit bldFile="/sf/os/imagingext/imagingmodules/jp2kcodec/group"/>
-     </component>
-     <component name="h264avcvideoencarm" long-name="H264AVC VideoEnc ARM" origin-model="foundation"/>
-     <component name="videoencpluginarm" long-name="VideoEnc Plugin ARM" origin-model="foundation"/>
-    </collection>
-    <collection name="imagingext_info" long-name="Imaging Extensions Info" level="app-if">
-     <component unofficial="yes" name="imagingext_plat" long-name="Imaging Extensions Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/os/imagingext/imagingext_plat/group"/>
-     </component>
-     <component unofficial="yes" name="imagingext_build" long-name="Imaging Extensions Build" origin-model="foundation">
-      <unit bldFile="/sf/os/imagingext/group"/>
-     </component>
-     <component unofficial="yes" name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/imagingext/imagingext_pub/exif_api/tsrc/group"/> -->
-      <unit bldFile="/sf/os/imagingext/imagingext_pub/group"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/imagingext/sources.csv
--- a/3k/os/imagingext/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/kernelhwsrv/package_definition.xml
--- a/3k/os/kernelhwsrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" long-name="Kernel and Hardware Services" tech_domain="hb" level="hw" levels="hw-if adaptation framework test">
-    <collection name="baseintegtests" long-name="Base Integration Testing" level="test">
-     <component name="baseintegrationtest" long-name="Base Integration Test" introduced="9.3" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/baseintegtests/baseintegrationtest/group" mrp="/sf/os/kernelhwsrv/baseintegtests/baseintegrationtest/group/base_integration_test.mrp"/>
-     </component>
-    </collection>
-    <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
-     <component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
-     </component>
-    </collection>
-    <collection name="n:unistore2" long-name="UniStore2 Flash Translation Layer" level="hw-if">
-     <component name="n:uiidrivers" long-name="UniStore2 Drivers" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/unistore2" mrp="os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2.mrp"/> -->
-     </component>
-     <component name="n:uiicore" long-name="UniStore2 Core" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/unistore2/base_drivers_unistore2_undeliverable.mrp"/>
-     </component>
-     <component name="n:uiicrashlogger" long-name="UniStore2 Crash Logger" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2" mrp="os/kernelhwsrv/kernel/eka/drivers/crashflash/unistore2/base_crashflash_unistore2.mrp"/> -->
-     </component>
-     <component name="n:uiibootsupport" long-name="UniStore2 Boot Support" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/unistore2/uiibootsupport/nandloader/unistore2" mrp="os/kernelhwsrv/unistore2/uiibootsupport/base_nandboot_unistore2.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="bsptemplate" long-name="BSP Template" level="hw-if">
-     <component name="asspandvariant" long-name="Template ASSP and Variant" introduced="6.0" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="/sf/os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
-     </component>
-    </collection>
-    <collection name="kernel" long-name="Kernel Architecture" level="adaptation">
-     <component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/kernel/eka" mrp="/sf/os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
-     </component>
-    </collection>
-    <collection name="kerneltest" long-name="Kernel Test" level="hw-if">
-     <component name="e32test" long-name="E32 Tests" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/kerneltest/e32test/group" mrp="/sf/os/kernelhwsrv/kerneltest/e32test/group/base_e32test.mrp"/>
-     </component>
-     <component name="n:sdiotest" long-name="SDIO Tests" filter="gt" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/kerneltest/sdiotest" mrp="os/kernelhwsrv/kerneltest/sdiotest/base_sdiotests.mrp"/> -->
-     </component>
-     <component name="n:e32utils" long-name="E32 Utilities" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/kerneltest/e32utils/group" mrp="os/kernelhwsrv/kerneltest/e32utils/group/base_e32utils.mrp"/> -->
-     </component>
-     <component name="n:f32test" long-name="File Server Tests" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
-     <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
-     </component>
-     <component name="audioldd" long-name="Audio Drivers" introduced="8.1b" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/esound" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/esound/base_e32_drivers_sound.mrp"/>
-     </component>
-     <component name="serialldd" long-name="Serial Port Drivers" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/ecomm" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/ecomm/base_e32_drivers_ecomm.mrp"/>
-     </component>
-     <component name="legacydrivers" long-name="Legacy Drivers" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/adc/base_e32_drivers_adc.mrp"/>
-     </component>
-     <component name="locmedia" long-name="Local Media Subsystem" introduced="8.1b" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <!-- these are LDDs for storage media-->
-      <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/locmedia" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
-     </component>
-     <component name="runmodedebugger" long-name="Run Mode Debugger" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/debug" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/debug/base_e32_drivers_debug.mrp"/>
-     </component>
-     <component name="btrace" long-name="Kernel Trace Tool" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/trace" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
-     </component>
-    </collection>
-    <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-     <component name="n:sdcard3c" long-name="SD Card 3C Driver" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c" mrp="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard3c/base_e32_sd3c.mrp"/> -->
-     </component>
-     <component name="n:sdcard4c" long-name="SD Card 4C Driver" filter="gt" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c" mrp="os/kernelhwsrv/kernel/eka/drivers/pbus/mmc/sdcard/sdcard4c/base_e32_sd4c.mrp"/> -->
-     </component>
-     <component name="mediadrivers" long-name="Media Drivers" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- these are for storage media-->
-      <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/media" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/media/base_e32_drivers_media.mrp"/>
-     </component>
-     <component name="genericboardsupport" long-name="Generic Board Support" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/bsp" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/bsp/base_e32_drivers_bsp.mrp"/>
-     </component>
-    </collection>
-    <collection name="userlibandfileserver" long-name="User Library and File Server" level="framework">
-     <component name="euser" long-name="User Library" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/euser" mrp="/sf/os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
-     </component>
-     <component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/compsupp" mrp="/sf/os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
-     </component>
-     <component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
-     </component>
-     <component name="n:nandftl" long-name="SSR Flash Translation Layer" filter="gt" introduced="7.0s" deprecated="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sftl" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/sftl/base_f32_sftl.mrp"/> -->
-     </component>
-     <component name="estart" long-name="Base Starter" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/estart" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
-     </component>
-     <component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/domainmgr/group" mrp="/sf/os/kernelhwsrv/userlibandfileserver/domainmgr/group/base_domain.mrp"/>
-     </component>
-     <component name="basedocs" long-name="Base Documentation" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/kernelhwsrv/userlibandfileserver/basedocs/base_documentation.mrp"/>
-     </component>
-    </collection>
-    <collection name="filesystems" long-name="File Systems" level="framework">
-     <component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srom/base_f32_srom.mrp"/>
-     </component>
-     <component name="rofs" long-name="ROFS" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srofs" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/srofs/base_f32_srofs.mrp"/>
-     </component>
-     <component name="usbmsfs" long-name="USB Mass Storage File System" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/smassstorage/base_f32_smassstorage.mrp"/>
-     </component>
-     <component name="fat32fs" long-name="FAT32 File System" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat32/base_f32_sfat32.mrp"/>
-     </component>
-     <component name="fatfs" long-name="FAT File System" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/sfat/base_f32_sfat.mrp"/>
-     </component>
-     <component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/scomp" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/scomp/base_f32_scomp.mrp"/>
-     </component>
-     <component name="n:ntfs" long-name="NTFS" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/ntfs" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/ntfs/base_f32_sntfs.mrp"/> -->
-     </component>
-     <component name="n:iso9660fs" long-name="ISO9660 File System" filter="gt" introduced="8.1b" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/iso9660" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/iso9660/base_f32_siso9660.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="halservices" long-name="HAL Services" level="framework">
-     <component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/halservices/hal" mrp="/sf/os/kernelhwsrv/halservices/hal/base_hal.mrp"/>
-     </component>
-    </collection>
-    <collection name="textmodeshell" long-name="Text Mode Shell" level="test">
-     <component name="e32wsrv" long-name="Text Window Server" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/ewsrv" mrp="/sf/os/kernelhwsrv/kernel/eka/ewsrv/base_e32_ewsrv.mrp"/>
-     </component>
-     <component name="textshell" long-name="Text Shell" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/etshell" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fileserver/etshell/base_f32_eshell.mrp"/>
-     </component>
-    </collection>
-    <collection name="baseapitest" long-name="Base API Tests" level="test">
-     <component name="basesvs" long-name="Base Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/kernelhwsrv/baseapitest/basesvs/group/basesvs.mrp"/>
-     </component>
-    </collection>
-    <collection name="kernelhwsrv_info" long-name="Kernel and Hardware Services Info" level="test">
-     <component unofficial="yes" name="localesupport" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/kernelhwsrv/localisation/localesupport/mmpfiles"/> -->
-     </component>
-    <component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/kernelhwsrv/kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/kernelhwsrv/sources.csv
--- a/3k/os/kernelhwsrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/lbs/package_definition.xml
--- a/3k/os/lbs/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="lbs" long-name="Locating Services" tech_domain="lo" level="services" levels="hw-if data-acquisition adaptation management application-interface">
-    <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
-     <component name="locationnpppsy" long-name="Location NPP PSY" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
-     </component>
-     <component name="locationsuplpsy" long-name="Location SUPL PSY" origin-model="foundation">
-      <unit bldFile="/sf/mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
-     </component>
-    <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
-     </component>
-     <component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp"/>
-     </component>
-     <component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="tb91" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
-     </component>
-     <component name="n:agpsintegrationmodule" long-name="A-GPS Integration Module" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/lbs/datasourcemodules/agpsintegrationmodule/group" mrp="os/lbs/datasourcemodules/agpsintegrationmodule/group/lbs_datasourceplugins.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-     <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
-     </component>
-    </collection>
-    <collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
-     <component name="locationserver" long-name="Location Server" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/lbs/locationrequestmgmt/locationserver/group" mrp="/sf/os/lbs/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp"/>
-     </component>
-     <component name="networkrequesthandler" long-name="Network Request Handler" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/lbs/locationrequestmgmt/networkrequesthandler/group" mrp="/sf/os/lbs/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp"/>
-     </component>
-    </collection>
-    <collection name="lbstest" long-name="Locating Services Tests" level="application-interface">
-     <component name="lbstestproduct" long-name="LBS Test Product" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/lbs/lbstest/lbstestproduct/group/lbs_testproduct.mrp"/>
-     </component>
-     <component name="locationprotocoltest" long-name="Location Protocol Tests" introduced="9.2" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/lbs/lbstest/locationprotocoltest/group" mrp="/sf/os/lbs/lbstest/locationprotocoltest/group/lbs_networktest.mrp"/>
-     </component>
-    </collection>
-    <collection name="locationmgmt" long-name="Location Management" level="management">
-     <component name="agpslocationmgr" long-name="A-GPS Location Manager" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/lbs/locationmgmt/agpslocationmgr/group" mrp="/sf/os/lbs/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp"/>
-     </component>
-     <component name="networklocationmgr" long-name="Network Location Manager" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/lbs/locationmgmt/networklocationmgr/group" mrp="/sf/os/lbs/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp"/>
-     </component>
-     <component name="locationcore" long-name="Location Core" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/lbs/locationmgmt/locationcore/group" mrp="/sf/os/lbs/locationmgmt/locationcore/group/lbs_admin.mrp"/>
-     </component>
-     <component name="networkgateway" long-name="Network Gateway" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/lbs/locationmgmt/networkgateway/group" mrp="/sf/os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
-     </component>
-    </collection>
-    <collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
-     <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
-     </component>
-     <component name="n:suplprotocolmodule" long-name="SUPL Protocol Module" introduced="tb91" deprecated="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
-     <component name="lbshaitest" long-name="Location HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-      <unit mrp="lbsapitest/lbshaitest/group/lbshai.mrp"/>
-	-->
-     </component>
-    </collection>
-    <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-     <component unofficial="yes" name="lbs_build" long-name="Locating Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/lbs/group"/>
-     </component>
-    <component name="lbs_metadata" long-name="Locating Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/lbs/lbs_info/lbs_metadata/lbs_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/lbs/sources.csv
--- a/3k/os/lbs/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/mm/package_definition.xml
--- a/3k/os/mm/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="mm" long-name="Multimedia" tech_domain="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if">
-    <collection name="audio" long-name="Audio Codecs" level="middleware">
-     <component name="arm_cmmf_codecs" long-name="ARM CMMF Codecs" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/audio/arm_cmmf_codecs/group"/>
-     </component>
-     <component unofficial="yes" name="audio_build" long-name="Audio Codecs Build" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/audio/group"/>
-     </component>
-    </collection>
-    <collection name="video" long-name="Video Codecs" level="middleware">
-     <component name="arm_mdf_decoders" long-name="ARM MDF Decoders" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/video/group"/>
-     </component>
-    </collection>
-    <collection name="devsoundextensions" long-name="Devsound Extensions" level="device-fw">
-     <component name="drmaudioplayer" long-name="DRM Audio Player" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/mm/devsoundextensions/drmaudioplayer/drmplayserver/group"/> -->
-      <!-- <unit bldFile="/sf/os/mm/devsoundextensions/drmaudioplayer/drmplayutility/group"/> -->
-      <unit bldFile="/sf/os/mm/devsoundextensions/drmaudioplayer/group"/>
-     </component>
-     <component name="mmextfw" long-name="MM Ext Framework" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/devsoundextensions/mmextfw/group"/>
-     </component>
-     <component name="audiorouting" long-name="Audio Routing" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/devsoundextensions/audiorouting/group"/>
-     </component>
-     <component name="effects" long-name="Effects" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/mm/devsoundextensions/effects/effecttest"/> -->
-      <unit bldFile="/sf/os/mm/devsoundextensions/effects/group"/>
-     </component>
-     <component name="effectspresets" long-name="Effects Presets" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/group"/>
-     </component>
-     <component name="telephonyaudiorouting" long-name="Telephony Audio Routing" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/devsoundextensions/telephonyaudiorouting/group"/>
-      <!-- <unit bldFile="/sf/os/mm/devsoundextensions/telephonyaudiorouting/server/group"/> -->
-      <!-- <unit bldFile="/sf/os/mm/devsoundextensions/telephonyaudiorouting/session/group"/> -->
-      <!-- <unit bldFile="/sf/os/mm/devsoundextensions/telephonyaudiorouting/telephonyaudioroutingbase/group"/> -->
-      <!-- <unit bldFile="/sf/os/mm/devsoundextensions/telephonyaudiorouting/telephonyaudioroutingmanager/group"/> -->
-     </component>
-     <component name="mmfcustominterfaces" long-name="MMF Custom Interfaces" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/devsoundextensions/mmfcustominterfaces/group"/>
-     </component>
-     <component name="addeddevsoundcontrol" long-name="Added DevSound Control" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/devsoundextensions/addeddevsoundcontrol/group"/>
-     </component>
-     <component name="globalaudiosettings" long-name="Global Audio Settings" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/devsoundextensions/globalaudiosettings/group"/>
-     </component>
-     <component name="restrictedaudiooutput" long-name="Restricted Audio Output" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/devsoundextensions/restrictedaudiooutput/group"/>
-     </component>
-     <component name="ciextnfactoryplugins" long-name="CI Extension Factory Plugins" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/devsoundextensions/ciextnfactoryplugins/group"/>
-     </component>
-     <component unofficial="yes" name="devsoundextensions_build" long-name="Devsound Extensions Build" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/devsoundextensions/group"/>
-     </component>
-    </collection>
-    <collection name="mdfdevvideoextensions" long-name="MDF devvideo Extensions" level="device-fw">
-     <component name="arm_mdf_postprocessor" long-name="ARM MDF Postprocessor" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/mdfdevvideoextensions/arm_mdf_postprocessor/group"/>
-     </component>
-     <component unofficial="yes" name="mdfdevvideoextensions_build" long-name="MDF devvideo Extensions Build" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/mdfdevvideoextensions/group"/>
-     </component>
-    </collection>
-    <collection name="videoadaptationextensions" long-name="Video Adaptation Extensions" level="adaptation">
-     <component name="postingsurface" long-name="Posting Surface" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/videoadaptationextensions/postingsurface/group"/>
-     </component>
-     <component unofficial="yes" name="videoadaptationextensions_build" long-name="Video Adaptation Extensions Build" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/videoadaptationextensions/group"/>
-     </component>
-    </collection>
-    <collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
-     <component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/imagingandcamerafws/imagingfws/group" mrp="/sf/os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
-     </component>
-     <component name="imagingunittest" long-name="Imaging Unit Tests" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/mm/imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp"/>
-     </component>
-     <component name="imaginginttest" long-name="Imaging Integration Tests" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/mm/imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp"/>
-     </component>
-     <component name="camerafw" long-name="Camera Framework" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/imagingandcamerafws/camerafw/group" mrp="/sf/os/mm/imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
-     </component>
-     <component name="cameraunittest" long-name="Camera Unit Tests" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/mm/imagingandcamerafws/cameraunittest/group/multimedia_unittest_ecam_source.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmlibs" long-name="Multimedia Libraries" level="middleware">
-     <component name="mmutilitylib" long-name="Multimedia Utility Library" introduced="8.1" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/mmlibs/mmutilitylib/group" mrp="/sf/os/mm/mmlibs/mmutilitylib/group/multimedia_common.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-     <component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/imagingandcamerafws/imagingfws/plugins/group" mrp="/sf/os/mm/imagingandcamerafws/imagingfws/plugins/group/multimedia_icl_plugin.mrp"/>
-      <!-- PLACEHOLDER="DEF137831" REMOVE -->
-      <!-- PLACEHOLDER="DEF137831"
-		<unit bldFile="mmplugins/imagingplugins/plugins/group" mrp="mmplugins/imagingplugins/plugins/group/multimedia_icl_plugin.mrp"/>
-		-->
-     </component>
-     <component name="cameraplugins" long-name="Camera Plugins" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/mmplugins/cameraplugins/group" mrp="/sf/os/mm/mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
-     </component>
-     <component name="3gplib" long-name="3GP Library" introduced="Future" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/mmplugins/3gplib/group" mrp="/sf/os/mm/mmplugins/3gplib/group/multimedia_3gplibrary.mrp"/>
-     </component>
-     <component name="3gpunittest" long-name="3GP Unit Tests" introduced="Future" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/mm/mmplugins/3gpunittest/group/multimedia_unittest_3gplibrary_source.mrp"/>
-     </component>
-    </collection>
-    <collection name="mm_info" long-name="Multimedia Info" level="app-if">
-     <component unofficial="yes" name="mm_pub" long-name="Multimedia Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/mm_pub/audio_effects_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_pub/audio_effects_presets_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_pub/drm_audio_player_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_pub/group"/>
-     </component>
-     <component unofficial="yes" name="mm_build" long-name="Multimedia Build" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/group"/>
-     </component>
-     <component unofficial="yes" name="mm_test" long-name="Multimedia Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/mm/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="mm_plat" long-name="Multimedia Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/os/mm/mm_plat/aac_decoder_config_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/audio_routing_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/audio_visualization_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/eaac_plus_decoder_interface_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/error_concealment_interface_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/g711_decoder_interface_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/g711_encoder_interface_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/g729_decoder_interface_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/g729_encoder_interface_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/global_audio_settings_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/ilbc_decoder_interface_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/ilbc_encoder_interface_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/ra8_decoder_interface_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/restricted_audio_output_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/sbc_encoder_interface_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/speech_encoder_config_api/tsrc/group"/>
-      <unit bldFile="/sf/os/mm/mm_plat/wma_decoder_interface_api/tsrc/group"/>
-     </component>
-    <component name="mmdocs" long-name="Multimedia Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/mm/mm_info/mmdocs/multimedia_documentation.mrp"/>
-     </component>
-     <component name="mm_metadata" long-name="Multimedia Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/mm/mm_info/mm_metadata/mm_metadata.mrp"/>
-     </component>
-    </collection>
-   <collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
-     <component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/mmresourcemgmt/mmresctrl/group" mrp="/sf/os/mm/mmresourcemgmt/mmresctrl/group/multimedia_a3f_refmmrc.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmdevicefw" long-name="Multimedia Device Framework" level="device-fw">
-     <component name="n:mdf" long-name="Media Device Framework" introduced="9.2" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/mmdevicefw/mdf/group" mrp="/sf/os/mm/mmdevicefw/mdf/group/multimedia_mdf.mrp"/>
-     </component>
-     <component name="mdfunittest" long-name="MDF Unit Tests" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/mm/mmdevicefw/mdfunittest/group/multimedia_unittest_mdf_source.mrp"/>
-     </component>
-     <component name="asrcontroller" long-name="Speech Recognition Controller" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/ASR/group" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/ASR/group/multimedia_mmf_ASR.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw">
-     <component name="mmtestfw" long-name="Multimedia Test Framework" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/mm/mmtestenv/mmtestfw/group/multimedia_testframework_source.mrp"/>
-     </component>
-     <component name="mmtestfwunittest" long-name="Multimedia Test Framework Unit Tests" introduced="7.0s" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/mm/mmtestenv/mmtestfwunittest/group/multimedia_unittest_testframework_source.mrp"/>
-     </component>
-     <component name="mmtestagent" long-name="Multimedia Test Agent" introduced="8.0" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/mm/mmtestenv/mmtestagent/group/multimediatestagent_source.mrp"/>
-     </component>
-     <component name="mmtesttools" long-name="Multimedia Test Tools" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/mm/mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp"/>
-     </component>
-    </collection>
-    <collection name="omxil" long-name="OpenMAX IL" level="hw-if">
-     <component name="openmax" long-name="OpenMAX" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/omxil/openmax/group" mrp="/sf/os/mm/omxil/openmax/group/multimedia_openmax.mrp"/>
-     </component>
-    </collection>
-    <collection name="devsound" long-name="Sound Device" level="devices">
-     <component name="devsoundapi" long-name="DevSound API" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_api/multimedia_mdf_devsound_api.mrp"/>
-     </component>
-     <component name="a3fdevsound" long-name="A3F DevSound" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/devsound/a3fdevsound/group" mrp="/sf/os/mm/devsound/a3fdevsound/group/multimedia_a3f_devsound.mrp"/>
-     </component>
-     <component name="a3facf" long-name="A3F Audio Component Framework" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/devsound/a3facf/group" mrp="/sf/os/mm/devsound/a3facf/group/multimedia_a3f_acf.mrp"/>
-     </component>
-     <component name="devsoundpluginsupport" long-name="DevSound Plugin Support" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_pluginsupport/multimedia_mdf_devsound_pluginsupport.mrp"/>
-     </component>
-     <component name="refdevsound" long-name="Reference DevSound Plugins" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_refplugin/multimedia_mdf_devsound_refplugin.mrp"/>
-     </component>
-     <component name="btdevsound" long-name="Bluetooth DevSound Plugin" introduced="7.0s" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/sounddevbt/group/multimedia_mdf_devsound_refbtplugin.mrp"/>
-     </component>
-     <component name="a3ftrace" long-name="A3F Trace Utility" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/devsound/a3ftrace/group" mrp="/sf/os/mm/devsound/a3ftrace/group/multimedia_a3f_traces.mrp"/>
-     </component>
-     <component name="a3fintegrationtest" long-name="A3F Integration Tests" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/mm/devsound/a3fintegrationtest/group/multimedia_inttest_a3f_devsound_source.mrp"/>
-     </component>
-     <component name="a3fcharacterisationtest" long-name="A3F Characterisation Tests" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/mm/devsound/a3fcharacterisationtest/group/multimedia_a3f_devsound_char.mrp"/>
-     </component>
-     <component name="a3fsrvstart" long-name="A3F Server Start" introduced="tb92" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/devsound/a3fsrvstart/group" mrp="/sf/os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
-     <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev/multimedia_mdf_devsound_hwdev.mrp"/>
-     </component>
-     <component name="a3facl" long-name="A3F Audio Component Library" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/mmhais/a3facl/group" mrp="/sf/os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
-     </component>
-     <component name="a3fdevsoundcustomisation" long-name="A3F DevSound Customisation" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="/sf/os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
-     </component>
-     <component name="refacladapt" long-name="Reference ACL Adaptation" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/mmhais/refacladapt/group" mrp="/sf/os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
-     </component>
-     <component name="videohai" long-name="Video HAI" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/mmhais/videohai/group" mrp="/sf/os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
-     </component>
-     <component name="dvbhreceiverhai" long-name="Mobile TV DVB-H Receiver HAI" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp="/sf/os/mm/mmhais/dvbhreceiverhai/hai/dvbh/group/multimedia_mobiletv_dvbh_hai.mrp"/>
-     </component>
-     <component name="dvbhunittest" long-name="Mobile TV DVB-H Unit Tests" introduced="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp"/>
-     </component>
-    </collection>
-    <collection name="mmapitest" long-name="Multimedia API Tests" level="app-if">
-     <component name="mmsvs" long-name="Multimedia Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/mm/mmapitest/mmsvs/group/mmsvs.mrp"/>
-     </component>
-     <component name="devvideohaitest" long-name="DevVideo HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-      <unit mrp="mmapitest/devvideohaitest/group/devvideohai.mrp"/>
-	-->
-     </component>
-     <component name="devsoundhaitest" long-name="DevSound HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-      <unit mrp="mmapitest/devsoundhaitest/group/devsoundhai.mrp"/>
-	-->
-     </component>
-     <component name="devsoundexthaitest" long-name="DevSound Extensions HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-      <unit mrp="mmapitest/devsoundexthaitest/group/devsoundexthai.mrp"/>
-	-->
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/mm/sources.csv
--- a/3k/os/mm/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/networkingsrv/package_definition.xml
--- a/3k/os/networkingsrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="networkingsrv" long-name="Networking Services" tech_domain="dc" level="services" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="commsdb" long-name="Comms DB" level="server">
-     <component name="s60_commsdb" long-name="S60 Commsdb" origin-model="foundation">
-      <unit bldFile="/sf/os/networkingsrv/commsdb/s60_commsdb/group"/>
-     </component>
-     <component unofficial="yes" name="commsdb_build" long-name="Comms DB Build" origin-model="foundation">
-      <unit bldFile="/sf/os/networkingsrv/commsdb/group"/>
-     </component>
-    </collection>
-    <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
-     <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/sf/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
-     </component>
-    </collection>
-    <collection name="tcpiputils" long-name="TCP/IP Utilities" level="plugin">
-     <component name="dnd" long-name="DND" introduced="7.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/tcpiputils/dnd/group" mrp="/sf/os/networkingsrv/tcpiputils/dnd/group/networking_dnd.mrp"/>
-     </component>
-     <component name="dndconfig" long-name="DND Config" introduced="7.0" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/networkingsrv/tcpiputils/dnd/group/networking_dnd-config.mrp"/>
-     </component>
-     <component name="dhcp" long-name="DHCP" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/tcpiputils/dhcp/group" mrp="/sf/os/networkingsrv/tcpiputils/dhcp/group/networking_dhcp.mrp"/>
-     </component>
-     <component name="networkaddressandporttranslation" long-name="Network Address and Port Translation" introduced="tb91" purpose="mandatory" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group" mrp="/sf/os/networkingsrv/tcpiputils/networkaddressandporttranslation/group/networking_napt.mrp"/>
-     </component>
-    </collection>
-    <collection name="linklayercontrol" long-name="Link Layer Control" level="hw-if">
-     <component name="nullagt" long-name="NULL AGT" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/linklayercontrol/nullagt/group" mrp="/sf/os/networkingsrv/linklayercontrol/nullagt/group/networking_nullagt.mrp"/>
-     </component>
-    </collection>
-    <collection name="linklayerprotocols" long-name="Link Layer Protocols" level="hw-if">
-     <component name="ethernetnif" long-name="Ethernet NIF" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/ethernetnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/ethernetnif/group/networking_ether802.mrp"/>
-     </component>
-     <component name="ethernetpacketdriver" long-name="Ethernet Packet Driver" introduced="7.0" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit mrp="/sf/os/networkingsrv/linklayerprotocols/ethernetpacketdriver/group/networking_etherdrv_srconly.mrp"/>
-     </component>
-     <component name="pppnif" long-name="PPP NIF" introduced="ER5" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/pppnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp.mrp" version="1"/>
-     </component>
-     <component name="pppconfig" long-name="PPP Config" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/networkingsrv/linklayerprotocols/pppnif/group/networking_ppp-config.mrp" version="1"/>
-     </component>
-     <component name="slipnif" long-name="SLIP NIF" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/slipnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/slipnif/group/networking_slip.mrp"/>
-     </component>
-     <component name="tunnelnif" long-name="Tunnel NIF" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group" mrp="/sf/os/networkingsrv/linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
-     </component>
-    </collection>
-    <collection name="linklayerutils" long-name="Link Layer Utilities" level="hw-if">
-     <component name="packetlogger" long-name="Packet Logger" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/linklayerutils/packetlogger/group" mrp="/sf/os/networkingsrv/linklayerutils/packetlogger/group/networking_packetlogger.mrp"/>
-     </component>
-    </collection>
-    <collection name="networkcontrol" long-name="Network Control" level="plugin">
-     <component name="qosfwconfig" long-name="QoS Framework Config" introduced="7.0s" purpose="optional" class="config" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos-config.mrp"/>
-     </component>
-     <component name="qoslib" long-name="QoS Library" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/networkcontrol/qoslib/group" mrp="/sf/os/networkingsrv/networkcontrol/qoslib/group/networking_qoslib.mrp"/>
-     </component>
-     <component name="pfqoslib" long-name="PF QoS Library" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/networkcontrol/pfqoslib/group" mrp="/sf/os/networkingsrv/networkcontrol/pfqoslib/group/networking_pfqoslib.mrp"/>
-     </component>
-     <component name="qosfwprt" long-name="QoS Framework PRT" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group" mrp="/sf/os/networkingsrv/networkcontrol/qosfwconfig/qos/group/networking_qos.mrp"/>
-     </component>
-     <component name="ipcpr" long-name="IP CPR" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/networkcontrol/ipcpr/group" mrp="/sf/os/networkingsrv/networkcontrol/ipcpr/group/networking_ipcpr.mrp"/>
-     </component>
-     <component name="ipscpr" long-name="IP SCPR" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/networkcontrol/ipscpr/group" mrp="/sf/os/networkingsrv/networkcontrol/ipscpr/group/networking_ipscpr.mrp"/>
-     </component>
-     <component name="ipcprshim" long-name="IP CPR Shim" deprecated="Future" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/networkcontrol/ipcprshim/group" mrp="/sf/os/networkingsrv/networkcontrol/ipcprshim/group/networking_shimcpr.mrp"/>
-     </component>
-    </collection>
-    <collection name="networkprotocols" long-name="Network Protocols" level="plugin">
-     <component name="tcpipv4config" long-name="TCP/IPv4/v6 Config" introduced="7.0" purpose="mandatory" class="config" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6-config.mrp"/>
-     </component>
-     <component name="ipeventnotifier" long-name="IP Event Notifier" introduced="8.1" purpose="mandatory" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/networkprotocols/ipeventnotifier/group" mrp="/sf/os/networkingsrv/networkprotocols/ipeventnotifier/group/networking_ipeventnotifier.mrp"/>
-     </component>
-     <component name="tcpipv4v6prt" long-name="TCP/IPv4/v6 PRT" introduced="7.0" purpose="mandatory" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group" mrp="/sf/os/networkingsrv/networkprotocols/tcpipv4v6prt/group/networking_tcpip6.mrp"/>
-     </component>
-     <component name="iphook" long-name="IP Hook" introduced="7.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/networkprotocols/iphook/inhook6/group" mrp="/sf/os/networkingsrv/networkprotocols/iphook/inhook6/group/networking_inhook6.mrp"/>
-     </component>
-     <component name="mobileip" long-name="Mobile IP" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/networkprotocols/mobileip/group" mrp="/sf/os/networkingsrv/networkprotocols/mobileip/group/networking_mobileip.mrp"/>
-     </component>
-    </collection>
-    <collection name="networksecurity" long-name="Network Security" level="framework">
-     <component name="tls" long-name="TLS" introduced="6.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/networksecurity/tls/group" mrp="/sf/os/networkingsrv/networksecurity/tls/group/networking_tls.mrp"/>
-     </component>
-     <component name="tlsprovider" long-name="TLS Provider" introduced="8.1" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/networksecurity/tlsprovider/group" mrp="/sf/os/networkingsrv/networksecurity/tlsprovider/group/security_tlsprovider.mrp"/>
-     </component>
-     <component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/networksecurity/ipsec/group" mrp="/sf/os/networkingsrv/networksecurity/ipsec/group/networking_ipsec.mrp"/>
-     </component>
-     <component name="ipsecvpn" long-name="IPsec VPN" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DEF140049"
-        <unit bldFile="networksecurity/ipsecvpn/group" mrp="networksecurity/ipsecvpn/group/networking_ipsecvpn.mrp"/>
-		-->
-     </component>
-    </collection>
-    <collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
-     <component name="networkingunittest" long-name="Networking Unit Test" introduced="7.0" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/networkingsrv/networkingtestandutils/networkingunittest/group/networking_unittest.mrp"/>
-     </component>
-     <component name="networkingexamples" long-name="Networking Examples" introduced="7.0" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingexamples/examplecode/group/networking_examplecode.mrp"/>
-     </component>
-     <component name="exampleinternetutilities" long-name="Example Internet Utilities" introduced="ER5" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/networkingsrv/networkingtestandutils/exampleinternetutilities/group/networking_inetutil.mrp"/>
-     </component>
-     <component name="ipprobe" long-name="IP Probe" introduced="7.0s" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipprobe/group/networking_probe.mrp"/>
-     </component>
-     <component name="ipv6to4tunnel" long-name="IPv6 to 4 Tunnel" purpose="development" plugin="Y" origin-model="Symbian">
-      <unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipv6to4tunnel/group/networking_6to4.mrp"/>
-     </component>
-     <component name="ipanalyzer" long-name="IP Analyzer" introduced="7.0" deprecated="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/networkingsrv/networkingtestandutils/ipanalyzer/group/networking_iprotor.mrp"/>
-     </component>
-     <component name="networkingintegrationtest" long-name="Networking Integration Test" introduced="ER5" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group" mrp="/sf/os/networkingsrv/networkingtestandutils/networkingintegrationtest/Group/networking_integrationtest.mrp"/>
-     </component>
-    </collection>
-    <collection name="networkingsrv_info" long-name="Networking Services Info" level="app-if">
-     <component unofficial="yes" name="networkingsrv_build" long-name="Networking Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/networkingsrv/group"/>
-     </component>
-    <component name="networkingrom" long-name="Networking ROM" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <!--  production component: contains the IBY files -->
-      <unit bldFile="/sf/os/networkingsrv/networkingsrv_info/networkingrom/group" mrp="/sf/os/networkingsrv/networkingsrv_info/networkingrom/group/networking_general.mrp"/>
-     </component>
-     <component name="networkingdocs" long-name="Networking Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/networkingsrv/networkingsrv_info/networkingdocs/networking_documentation.mrp"/>
-     </component>
-     <component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/networkingsrv/networkingsrv_info/networkingsrv_metadata/networkingsrv_metadata.mrp"/>
-     </component>
-    </collection>
-   <collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
-     <component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/networkingsrv/pppcompressionplugins/predictorcompression/group" mrp="/sf/os/networkingsrv/pppcompressionplugins/predictorcompression/group/networking_predcomp.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/networkingsrv/sources.csv
--- a/3k/os/networkingsrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/ossrv/package_definition.xml
--- a/3k/os/ossrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="ossrv" long-name="Generic OS Services" tech_domain="hb" level="services" levels="physical-abstraction app-libs encoding translation data-services utilities">
-    <collection name="utilitylibraries" long-name="Utility Libraries" level="encoding">
-     <component name="libutils" long-name="Utility Library" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/utilitylibraries/libutils/group"/>
-      <unit bldFile="/sf/os/ossrv/utilitylibraries/libutils/tsrc/group"/>
-      <!-- <unit bldFile="/sf/os/ossrv/utilitylibraries/libutils/tsrc/nft/group"/> -->
-     </component>
-    </collection>
-    <collection name="ofdbus" long-name="OF Dbus" level="utilities">
-     <component name="dbus" long-name="Dbus" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/ofdbus/dbus/group"/>
-      <unit bldFile="/sf/os/ossrv/ofdbus/dbus/tsrc/group"/>
-     </component>
-     <component name="dbus-glib" long-name="Dbus glib" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/ofdbus/dbus-glib/group"/>
-      <unit bldFile="/sf/os/ossrv/ofdbus/dbus-glib/tsrc/group"/>
-     </component>
-     <component unofficial="yes" name="ofdbus_build" long-name="OF Dbus Build" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/ofdbus/group"/>
-     </component>
-     <component unofficial="yes" name="ofdbus_test" long-name="OF Dbus Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/ossrv/ofdbus/tsrc/nft/idle_daemon_run/group"/> -->
-      <!-- <unit bldFile="/sf/os/ossrv/ofdbus/tsrc/nft/g_n_messages/group"/> -->
-      <!-- <unit bldFile="/sf/os/ossrv/ofdbus/tsrc/nft/g_file_send/group"/> -->
-      <!-- <unit bldFile="/sf/os/ossrv/ofdbus/tsrc/nft/send_messages1/group"/> -->
-      <!-- <unit bldFile="/sf/os/ossrv/ofdbus/tsrc/nft/stif_glib_1_simple_message/group"/> -->
-      <!-- <unit bldFile="/sf/os/ossrv/ofdbus/tsrc/nft/file_transfer_time/group"/> -->
-      <!-- <unit bldFile="/sf/os/ossrv/ofdbus/tsrc/nft/g_n_messages1/group"/> -->
-      <!-- <unit bldFile="/sf/os/ossrv/ofdbus/tsrc/nft/send_messages/group"/> -->
-     </component>
-    </collection>
-    <collection name="glib" long-name="Glib" level="utilities">
-     <component name="glibbackend" long-name="Glib Backend" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/glib/glibbackend/group"/>
-     </component>
-     <component name="libglib" long-name="Libglib" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/glib/libglib/group"/>
-     </component>
-     <component name="libgthread" long-name="Libg Thread" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/glib/libgthread/group"/>
-     </component>
-     <component name="libgmodule" long-name="Libg Module" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/glib/libgmodule/group"/>
-     </component>
-     <component name="libgobject" long-name="Libg Object" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/glib/libgobject/group"/>
-     </component>
-     <component unofficial="yes" name="glib_test" long-name="Glib Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/ossrv/glib/tsrc/bc/group"/> -->
-      <unit bldFile="/sf/os/ossrv/glib/tsrc/group"/>
-     </component>
-    </collection>
-    <collection name="ssl" long-name="SSL" level="data-services">
-     <component name="libcrypto" long-name="Libcrypto" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/ssl/libcrypto/group"/>
-     </component>
-     <component name="libssl" long-name="Libssl" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/ssl/libssl/group"/>
-     </component>
-     <component unofficial="yes" name="ssl_test" long-name="SSL Test" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/ssl/tsrc/group"/>
-      <!-- <unit bldFile="/sf/os/ossrv/ssl/tsrc/bc/group"/> -->
-     </component>
-    </collection>
-    <collection name="stdcpp" long-name="Stdcpp" level="translation">
-     <component unofficial="yes" name="stdcpp_build" long-name="Stdcpp Build" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/stdcpp/group"/>
-     </component>
-     <component unofficial="yes" name="stdcpp_test" long-name="Stdcpp Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/twsd_manual/group"/> -->
-      <!-- <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/ood_manual/group"/> -->
-      <!-- <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/stdcpp_test/stlport/manual/group"/> -->
-      <!-- <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/boost_test/multi_array/manual/group"/> -->
-      <!-- <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/io_manual/group"/> -->
-      <!-- <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/bc/group"/> -->
-      <!-- <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/boost_test/graph/manual/group"/> -->
-      <!-- <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/stdcpp_test/tstdcpp/multithread/manual/group"/> -->
-      <unit bldFile="/sf/os/ossrv/stdcpp/tsrc/group"/>
-     </component>
-    </collection>
-    <collection name="stdlibs" long-name="Stdlibs" level="translation">
-     <component name="libz" long-name="Libz" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/stdlibs/libz/group"/>
-     </component>
-     <component name="libcrypt" long-name="Libcrypt" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/stdlibs/libcrypt/group"/>
-     </component>
-    </collection>
-    <collection name="genericservices" long-name="Generic Services" level="utilities">
-     <component name="s60compatibilityheaders" long-name="S60 Compatibility Headers" filter="gt" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/ossrv/genericservices/s60compatibilityheaders/group94" mrp="/sf/os/ossrv/genericservices/s60compatibilityheaders/group94/tools_s60_header_compat94.mrp" version="9.4"/>
-     </component>
-     <component name="mimerecognitionfw" long-name="MIME Recognition Framework" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/ossrv/genericservices/mimerecognitionfw/group" mrp="/sf/os/ossrv/genericservices/mimerecognitionfw/group/app-framework_emime.mrp"/>
-     </component>
-     <component name="systemagent" long-name="System Agent" introduced="9.0" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/ossrv/genericservices/systemagent/group" mrp="/sf/os/ossrv/genericservices/systemagent/group/syslibs_sysagent2.mrp"/>
-     </component>
-     <component name="taskscheduler" long-name="Task Scheduler" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/ossrv/genericservices/taskscheduler/group" mrp="/sf/os/ossrv/genericservices/taskscheduler/group/syslibs_schsvr.mrp"/>
-     </component>
-     <component name="activebackupclient" long-name="Active Backup Client" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/ossrv/genericservices/activebackupclient/group" mrp="/sf/os/ossrv/genericservices/activebackupclient/group/connectivity_abclient.mrp"/>
-     </component>
-     <component name="syslibsdocs" long-name="Syslibs Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/ossrv/genericservices/syslibsdocs/syslibs_documentation.mrp"/>
-     </component>
-     <component name="httputils" long-name="HTTP Utilities Library" introduced="6.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/ossrv/genericservices/httputils/group" mrp="/sf/os/ossrv/genericservices/httputils/group/application-protocols_inetprotutil.mrp"/>
-     </component>
-    </collection>
-    <collection name="syslibsapitest" long-name="SysLibs API Tests" level="utilities">
-     <component name="syslibssvs" long-name="Syslibs Verfication Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/ossrv/syslibsapitest/syslibssvs/group/syslibssvs.mrp"/>
-     </component>
-    </collection>
-    <collection name="compressionlibs" long-name="Compression Libraries" level="data-services">
-     <component name="ziplib" long-name="Zip Compression Library" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/ossrv/compressionlibs/ziplib/group" mrp="/sf/os/ossrv/compressionlibs/ziplib/group/syslibs_ezlib.mrp"/>
-     </component>
-    </collection>
-    <collection name="genericopenlibs" long-name="Generic Open Libraries" level="translation">
-     <component name="cstdlib" long-name="C Standard Library" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/ossrv/genericopenlibs/cstdlib/group" mrp="/sf/os/ossrv/genericopenlibs/cstdlib/group/syslibs_stdlib.mrp"/>
-     </component>
-     <component name="openenvcore" long-name="Open Environment Core" introduced="tb91" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/ossrv/genericopenlibs/openenvcore/group" mrp="/sf/os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
-     </component>
-    </collection>
-    <collection name="lowlevellibsandfws" long-name="Low Level Libraries and Frameworks" level="app-libs">
-     <component name="pluginfw" long-name="Plugin Framework" introduced="6.2" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/ossrv/lowlevellibsandfws/pluginfw/Group" mrp="/sf/os/ossrv/lowlevellibsandfws/pluginfw/Group/syslibs_ecom.mrp" version="2"/>
-     </component>
-     <component name="apputils" long-name="Application Utilities" introduced="ER5" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/ossrv/lowlevellibsandfws/apputils/group" mrp="/sf/os/ossrv/lowlevellibsandfws/apputils/group/syslibs_bafl.mrp"/>
-     </component>
-    </collection>
-    <collection name="ossrv_info" long-name="Generic OS Services Info" level="utilities">
-     <component unofficial="yes" name="ossrv_test" long-name="Generic OS Services Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/ossrv/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="ossrv_plat" long-name="Generic OS Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/ossrv_plat/libutils/group"/>
-     </component>
-     <component unofficial="yes" name="ossrv_build" long-name="Generic OS Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/ossrv/group"/>
-     </component>
-     <component unofficial="yes" name="ossrv_pub" long-name="Generic OS Services Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/ossrv/ossrv_pub/boost_apis/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/os/ossrv/ossrv_pub/glib_arrays/tsrc/group"/> -->
-      <unit bldFile="/sf/os/ossrv/ossrv_pub/group"/>
-      <!-- <unit bldFile="/sf/os/ossrv/ossrv_pub/ssl_general_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/os/ossrv/ossrv_pub/stl/tsrc/group"/> -->
-     </component>
-    <component name="ossrv_metadata" long-name="Generic OS Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/ossrv/ossrv_info/ossrv_metadata/ossrv_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/ossrv/sources.csv
--- a/3k/os/ossrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/persistentdata/package_definition.xml
--- a/3k/os/persistentdata/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="persistentdata" long-name="Persistent Data Services" tech_domain="hb" level="services" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="featuremgmt" long-name="Feature Management" level="framework">
-     <component name="featuremanager" long-name="Feature Manager" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/devicesrv/featuremgmt/featuremanager/clientdll/group"/> -->
-      <unit bldFile="/sf/os/devicesrv/featuremgmt/featuremanager/group"/>
-      <!-- <unit bldFile="/sf/os/devicesrv/featuremgmt/featuremanager/serverexe/group"/> -->
-      <!-- <unit bldFile="/sf/os/devicesrv/featuremgmt/featuremanager/tsrc/public/basic/group"/> -->
-     </component>
-     <component unofficial="yes" name="featuremgmt_build" long-name="Feature Management Build" origin-model="foundation">
-      <unit bldFile="/sf/os/devicesrv/featuremgmt/group"/>
-     </component>
-    <component name="featureregistry" long-name="Feature Registry" introduced="9.2" deprecated="tb92" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/persistentdata/featuremgmt/featureregistry/group" mrp="/sf/os/persistentdata/featuremgmt/featureregistry/group/syslibs_featreg.mrp"/>
-     </component>
-    </collection>
-   <collection name="loggingservices" long-name="Logging Services" level="server">
-     <component name="eventlogger" long-name="Event Logger" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/persistentdata/loggingservices/eventlogger/group" mrp="/sf/os/persistentdata/loggingservices/eventlogger/group/syslibs_logeng.mrp"/>
-     </component>
-     <component name="filelogger" long-name="File Logger" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/persistentdata/loggingservices/filelogger/group" mrp="/sf/os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
-     </component>
-     <component name="rfilelogger" long-name="RFile Logger" introduced="9.1" deprecated="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/persistentdata/loggingservices/rfilelogger/group" mrp="/sf/os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
-     </component>
-    </collection>
-    <collection name="traceservices" long-name="Trace Services" level="server">
-     <component name="commsdebugutility" long-name="Comms Debug Utility" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/persistentdata/traceservices/commsdebugutility/group" mrp="/sf/os/persistentdata/traceservices/commsdebugutility/group/comms-infras_commsdebugutility.mrp"/>
-     </component>
-     <component name="tracefw" long-name="Trace Framework" introduced="9.2" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/persistentdata/traceservices/tracefw/ulogger/group" mrp="/sf/os/persistentdata/traceservices/tracefw/ulogger/group/tools_debug_trace.mrp"/>
-     </component>
-     <component name="utrace" long-name="UTrace" introduced="9.3" deprecated="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/persistentdata/traceservices/utrace/group" mrp="/sf/os/persistentdata/traceservices/utrace/group/testtools_utrace_api.mrp"/>
-     </component>
-    </collection>
-    <collection name="persistentstorage" long-name="Persistent Storage" level="framework">
-     <component name="store" long-name="Store" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/persistentdata/persistentstorage/store/group" mrp="/sf/os/persistentdata/persistentstorage/store/group/syslibs_store.mrp"/>
-     </component>
-     <component name="dbms" long-name="DBMS" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/persistentdata/persistentstorage/dbms/group" mrp="/sf/os/persistentdata/persistentstorage/dbms/group/syslibs_dbms.mrp"/>
-     </component>
-     <component name="centralrepository" long-name="Central Repository" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/persistentdata/persistentstorage/centralrepository/group" mrp="/sf/os/persistentdata/persistentstorage/centralrepository/group/syslibs_centralrepository.mrp"/>
-     </component>
-     <component name="sql" long-name="SQL" introduced="9.3" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/persistentdata/persistentstorage/sql/GROUP" mrp="/sf/os/persistentdata/persistentstorage/sql/GROUP/syslibs_sql.mrp"/>
-     </component>
-    </collection>
-    <collection name="persistentdata_info" long-name="Persistent Data Services Info" level="app-if">
-     <component name="persistentdata_metadata" long-name="Persistent Data Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/persistentdata/persistentdata_info/persistentdata_metadata/persistentdata_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/persistentdata/sources.csv
--- a/3k/os/persistentdata/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/security/package_definition.xml
--- a/3k/os/security/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="security" long-name="OS Security" tech_domain="se" level="services" levels="physical-abstraction plugins libraries management services utilities">
-    <collection name="contentmgmt" long-name="Content Management" level="utilities">
-     <component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/security/contentmgmt/contentaccessfwfordrm/group" mrp="/sf/os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
-     </component>
-     <component name="cafrecogniserconfig" long-name="CAF Recogniser Config" introduced="9.1" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/security/contentmgmt/cafrecogniserconfig" mrp="/sf/os/security/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp"/>
-     </component>
-    </collection>
-    <collection name="crypto" long-name="Crypto Libraries" level="libraries">
-     <component name="weakcrypto" long-name="Weak Cryptography Library" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/security/crypto/weakcrypto/group" mrp="/sf/os/security/crypto/weakcrypto/group/security_crypto_weak.mrp"/>
-     </component>
-     <component name="strongcrypto" long-name="Strong Cryptography Library" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/security/crypto/weakcrypto/strong" mrp="/sf/os/security/crypto/weakcrypto/group/security_crypto_strong.mrp"/>
-     </component>
-    </collection>
-    <collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
-     <component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/security/cryptomgmtlibs/securityutils/group" mrp="/sf/os/security/cryptomgmtlibs/securityutils/group/security_common.mrp"/>
-     </component>
-     <component name="securitytestfw" long-name="Security Test Framework" introduced="7.0" deprecated="tb92" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/security/cryptomgmtlibs/securitytestfw/group/security_testframework.mrp"/>
-     </component>
-     <component name="securitydocs" long-name="Security Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/security/cryptomgmtlibs/securitydocs/security_documentation.mrp"/>
-     </component>
-     <component name="cryptotokenfw" long-name="Crypto Token Framework" introduced="7.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/security/cryptomgmtlibs/cryptotokenfw/group" mrp="/sf/os/security/cryptomgmtlibs/cryptotokenfw/group/security_cryptotokens.mrp"/>
-     </component>
-    </collection>
-    <collection name="securityanddataprivacytools" long-name="Security and Data Privacy Tools" level="services">
-     <component name="securityconfig" long-name="Security Config" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/security/securityanddataprivacytools/securityconfig/group" mrp="/sf/os/security/securityanddataprivacytools/securityconfig/group/security_config.mrp"/>
-     </component>
-     <component name="securitytools" long-name="Security Tools" introduced="tb92" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/security/securityanddataprivacytools/securitytools/group" mrp="/sf/os/security/securityanddataprivacytools/securitytools/group/security_tools.mrp"/>
-     </component>
-    </collection>
-    <collection name="cryptoservices" long-name="Crypto Services" level="plugins">
-     <component name="certificateandkeymgmt" long-name="Certificate and Key Management" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/security/cryptoservices/certificateandkeymgmt/group" mrp="/sf/os/security/cryptoservices/certificateandkeymgmt/group/security_certman.mrp"/>
-     </component>
-     <component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="/sf/os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
-     </component>
-     <component name="rootcertificates" long-name="Root Certificates" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/security/cryptoservices/rootcertificates/rootcerts.mrp"/>
-     </component>
-     <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/security/cryptoservices/asnpkcs/group" mrp="/sf/os/security/cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
-     </component>
-    </collection>
-    <collection name="security_info" long-name="OS Security Info" level="utilities">
-     <component name="security_metadata" long-name="OS Security Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/security/security_info/security_metadata/security_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/security/sources.csv
--- a/3k/os/security/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/shortlinksrv/package_definition.xml
--- a/3k/os/shortlinksrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="shortlinksrv" long-name="Short Link Services" tech_domain="de" level="services" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if">
-     <component name="bluetoothsvs" long-name="Bluetooth Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/shortlinksrv/bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp"/>
-     </component>
-    </collection>
-    <collection name="usbldd" long-name="Shortlink Logical Device Drivers" level="hw-if">
-     <component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
-     </component>
-    </collection>
-    <collection name="bluetooth" long-name="Bluetooth" level="framework">
-     <component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/bluetooth/btstack" mrp="/sf/os/shortlinksrv/bluetooth/btstack/bluetooth_stack.mrp"/>
-     </component>
-     <component name="btcomm" long-name="Bluetooth CSY" introduced="6.0" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/bluetooth/btcomm" mrp="/sf/os/shortlinksrv/bluetooth/btcomm/bluetooth_btcomm.mrp"/>
-     </component>
-     <component name="btsdp" long-name="Bluetooth SDP" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/bluetooth/btsdp" mrp="/sf/os/shortlinksrv/bluetooth/btsdp/bluetooth_sdp.mrp"/>
-     </component>
-     <component name="btextnotifiers" long-name="Bluetooth Notifiers Support" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/bluetooth/btextnotifiers" mrp="/sf/os/shortlinksrv/bluetooth/btextnotifiers/bluetooth_btextnotifiers.mrp"/>
-     </component>
-     <component name="gavdp" long-name="Bluetooth GAVDP" introduced="8.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/bluetooth/gavdp/group" mrp="/sf/os/shortlinksrv/bluetooth/gavdp/group/bluetooth_gavdp.mrp"/>
-     </component>
-     <component name="btexample" long-name="Bluetooth Examples and Tests" introduced="6.1" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/shortlinksrv/bluetooth/btexample/test/bluetooth_tests_examples.mrp"/>
-     </component>
-     <component name="btlogger" long-name="Bluetooth Logging Engine" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/bluetooth/btlogger/group" mrp="/sf/os/shortlinksrv/bluetooth/btlogger/group/bluetooth_logger.mrp"/>
-     </component>
-     <component name="btdocs" long-name="Bluetooth Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/shortlinksrv/bluetooth/btdocs/bluetooth_documentation.mrp"/>
-     </component>
-    </collection>
-    <collection name="bluetoothmgmt" long-name="Bluetooth Management" level="plugin">
-     <component name="btmgr" long-name="Bluetooth Manager" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/bluetoothmgmt/btmgr" mrp="/sf/os/shortlinksrv/bluetoothmgmt/btmgr/bluetooth_manager.mrp"/>
-     </component>
-     <component name="btconfig" long-name="Bluetooth Config" purpose="optional" class="config" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/bluetoothmgmt/btconfig" mrp="/sf/os/shortlinksrv/bluetoothmgmt/btconfig/bluetooth_config.mrp"/>
-     </component>
-     <component name="btrom" long-name="Bluetooth ROM" introduced="9.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/bluetoothmgmt/btrom" mrp="/sf/os/shortlinksrv/bluetoothmgmt/btrom/bluetooth_rom.mrp"/>
-     </component>
-     <component name="bluetoothclientlib" long-name="Bluetooth Client Library" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/bluetoothmgmt/bluetoothclientlib" mrp="/sf/os/shortlinksrv/bluetoothmgmt/bluetoothclientlib/bluetooth_user.mrp"/>
-     </component>
-     <component name="btcommon" long-name="Bluetooth Build Utilities" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/shortlinksrv/bluetoothmgmt/btcommon/bluetooth_common.mrp"/>
-     </component>
-    </collection>
-    <collection name="bluetoothcommsprofiles" long-name="Bluetooth Comms Profiles" level="app-if">
-     <component name="btpan" long-name="Bluetooth PAN Profile" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/bluetoothcommsprofiles/btpan/group" mrp="/sf/os/shortlinksrv/bluetoothcommsprofiles/btpan/group/bluetooth_pan.mrp"/>
-     </component>
-    </collection>
-    <collection name="bthci" long-name="Host Controller Interface" level="server">
-     <component name="bthci1" long-name="Bluetooth HCI Framework 1" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/bthci/bthci1" mrp="/sf/os/shortlinksrv/bthci/bthci1/bluetooth_hci.mrp"/>
-     </component>
-     <component name="bthci2" long-name="Bluetooth HCI Framework 2" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/bthci/bthci2/group" mrp="/sf/os/shortlinksrv/bthci/bthci2/group/bluetooth_hci_v2_framework.mrp"/>
-     </component>
-     <component name="hciextensioninterface" long-name="Bluetooth HCI Extension Interface" introduced="6.1" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/bthci/hciextensioninterface" mrp="/sf/os/shortlinksrv/bthci/hciextensioninterface/bluetooth_hciproxy.mrp"/>
-     </component>
-     <component name="hci2implementations" long-name="Bluetooth HCI 2 Reference Implementations" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/bthci/hci2implementations/group" mrp="/sf/os/shortlinksrv/bthci/hci2implementations/group/bluetooth_hci_v2_implementations.mrp"/>
-     </component>
-    </collection>
-    <collection name="usbmgmt" long-name="USB Management" level="server">
-     <component name="usbmgr" long-name="USB Manager" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/usbmgmt/usbmgr/group" mrp="/sf/os/shortlinksrv/usbmgmt/usbmgr/group/usb_manager.mrp" version="2"/>
-     </component>
-     <component name="usbmgrtest" long-name="USB Manager Tests" introduced="7.0" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/shortlinksrv/usbmgmt/usbmgrtest/group/usb_test.mrp" version="2"/>
-     </component>
-     <component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/shortlinksrv/usbmgmt/usbclassandmgrdocs/usb_documentation.mrp"/>
-     </component>
-    </collection>
-    <collection name="irda" long-name="IrDA" level="plugin">
-     <component name="irdastack" long-name="IrDA Stack" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/shortlinksrv/irda/irdastack/group" mrp="/sf/os/shortlinksrv/irda/irdastack/group/infra-red_irda.mrp"/>
-     </component>
-    </collection>
-    <collection name="shortlinksrv_info" long-name="Short Link Services Info" level="app-if">
-     <component unofficial="yes" name="shortlinksrv_build" origin-model="foundation">
-      <unit bldFile="/sf/os/shortlinksrv/group"/>
-     </component>
-     <component unofficial="yes" name="shortlinksrv_plat" class="api" origin-model="foundation">
-      <unit bldFile="/sf/os/shortlinksrv/shortlinksrv_plat/group"/>
-     </component>
-    <component name="shortlinksrv_metadata" long-name="Short Link Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/shortlinksrv/shortlinksrv_info/shortlinksrv_metadata/shortlinksrv_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/shortlinksrv/sources.csv
--- a/3k/os/shortlinksrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/textandloc/package_definition.xml
--- a/3k/os/textandloc/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="textandloc" long-name="Text and Localisation" tech_domain="ui" level="services" levels="encoding util fonts tools text">
-    <collection name="charconvfw" long-name="Character Conversion FW" level="encoding">
-     <component name="charconv" long-name="Charconv" origin-model="foundation">
-      <unit bldFile="/sf/os/textandloc/charconvfw/charconv/ongoing/group"/>
-     </component>
-     <component name="charconvplugin" long-name="Charconv Plugin" origin-model="foundation">
-      <unit bldFile="/sf/os/textandloc/charconvfw/charconvplugin/group"/>
-     </component>
-     <component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional" plugin="N" origin-model="foundation">
-      <unit bldFile="/sf/os/textandloc/charconvfw/charconv_fw/group" mrp="/sf/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
-     </component>
-     <!--Component manually removed and merged to OS-->
-     <!--<component name="charconvplugins"/>-->
-    <component name="charconvplugins" long-name="Character Encoding and Conversion Plugins" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/textandloc/charconvfw/charconvplugins/group" mrp="/sf/os/textandloc/charconvfw/charconvplugins/group/syslibs_charconv_plugins.mrp"/>
-     </component>
-     <component name="fatfilenameconversionplugins" long-name="FAT Filename Conversion Plugins" introduced="9.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group" mrp="/sf/os/kernelhwsrv/userlibandfileserver/fatfilenameconversionplugins/group/syslibs_FATCharsetConv.mrp"/>
-     </component>
-    </collection>
-    <collection name="fontandtxtsrv" long-name="Font and Text Services" level="fonts">
-     <component name="iculayoutengine" long-name="ICU Layout Engine" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/textandloc/fontservices/textshaperplugin/group" mrp="/sf/os/textandloc/fontservices/textshaperplugin/group/graphics_iculayoutengine.mrp"/>
-     </component>
-     <component name="fontstore" long-name="Font Store" purpose="mandatory" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/textandloc/fontservices/fontstore/group" mrp="/sf/os/textandloc/fontservices/fontstore/group/graphics_fntstore.mrp"/>
-     </component>
-     <component name="textrendering" long-name="Text Rendering" purpose="mandatory" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- placeholder for text code from GDI -->
-     </component>
-     <component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/textandloc/fontservices/freetypefontrasteriser/group" mrp="/sf/os/textandloc/fontservices/freetypefontrasteriser/group/graphics_freetype.mrp"/>
-     </component>
-     <component name="n:itypefontrasteriser" long-name="iType Font Rasteriser" filter="gt" introduced="tb92" purpose="development" plugin="Y" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/graphics/fbs/itypefontrasteriser/group" mrp="os/graphics/fbs/itypefontrasteriser/group/graphics_itype.mrp"/> -->
-     </component>
-     <component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/textandloc/fontservices/referencefonts/group" mrp="/sf/os/textandloc/fontservices/referencefonts/group/graphics_fonts.mrp"/>
-     </component>
-     <component name="n:testfonts" long-name="Test Fonts" filter="gt" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/os/textandloc/fontservices/graphicstestfonts/group" mrp="os/textandloc/fontservices/graphicstestfonts/group/graphics_testfonts.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="textlayout" long-name="Text Layout" level="text">
-     <component name="texthandling" long-name="Text Handling" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/textandloc/textrendering/texthandling/group" mrp="/sf/os/textandloc/textrendering/texthandling/group/app-framework_etext.mrp"/>
-     </component>
-     <component name="textformatting" long-name="Text Formatting" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/textandloc/textrendering/textformatting/group" mrp="/sf/os/textandloc/textrendering/textformatting/group/app-framework_form.mrp"/>
-     </component>
-     <component name="word" long-name="Word" purpose="development" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/textandloc/textrendering/word/group/app-framework_word.mrp"/>
-     </component>
-    </collection>
-    <collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
-     <component name="localizer" long-name="Localizer" origin-model="foundation">
-      <unit bldFile="/sf/os/textandloc/charconvfw/localizer/group"/>
-     </component>
-     <component name="findutil" long-name="Find Util" origin-model="foundation">
-      <unit bldFile="/sf/os/textandloc/charconvfw/findutil/group"/>
-     </component>
-     <component name="numbergrouping" long-name="Number Grouping" origin-model="foundation">
-      <unit bldFile="/sf/os/textandloc/charconvfw/numbergrouping/group"/>
-     </component>
-     <component name="gamerecognizer" long-name="Game Recognizer" origin-model="foundation">
-      <unit bldFile="/sf/os/textandloc/charconvfw/gamerecognizer/group"/>
-     </component>
-     <component name="jplangutil" long-name="JP Lang Util" origin-model="foundation">
-      <unit bldFile="/sf/os/textandloc/charconvfw/jplangutil/group"/>
-     </component>
-     <component name="sortutil" long-name="Sort Util" origin-model="foundation">
-      <unit bldFile="/sf/os/textandloc/charconvfw/sortutil/group"/>
-     </component>
-     <component name="aknjapanesereading" long-name="Akn Japanese Reading" origin-model="foundation">
-      <unit bldFile="/sf/os/textandloc/charconvfw/aknjapanesereading/group"/>
-     </component>
-     <component name="inlinetext" long-name="Inline Text" origin-model="foundation">
-      <unit bldFile="/sf/os/textandloc/charconvfw/inlinetext/group"/>
-     </component>
-    <component name="nearestlangutil" long-name="Nearest Language Util" introduced="tb91" purpose="mandatory" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- placeholder for split from bafl -->
-     </component>
-     <component name="numberformatting" long-name="Number Formatting" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/textandloc/textrendering/numberformatting/group" mrp="/sf/os/textandloc/textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>
-     </component>
-    </collection>
-    <collection name="localesupport" long-name="Locale Support" level="util">
-     <component name="reflocales" long-name="Reference Locales" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/kernelhwsrv/localisation/localesupport" mrp="/sf/os/kernelhwsrv/localisation/localesupport/mmpfiles/base_loce32.mrp"/>
-     </component>
-     <component name="initlocale" long-name="Initialise Locale" introduced="tb91" purpose="mandatory" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- placeholder for split from bafl -->
-     </component>
-    </collection>
-    <collection name="textandloctools" long-name="Text and Localisation Tools" level="tools">
-     <component name="fontcompiler" long-name="Font Compiler" purpose="development" class="placeholder PC" plugin="N" origin-model="Symbian">
-      <!-- placeholder for split from GDI Tools -->
-     </component>
-     <component name="bitmapfonttools" long-name="Bitmap Font Tools" purpose="development" class="PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/graphics/graphicstools/bitmapfonttools/group" mrp="/sf/os/graphics/graphicstools/bitmapfonttools/group/graphics_gdtran.mrp"/>
-     </component>
-    </collection>
-    <collection name="textandloc_info" long-name="Text and Localisation Info" level="text">
-     <component unofficial="yes" name="textandloc_pub" long-name="Text and Localisation Public Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/textandloc/textandloc_pub/character_conversion_plugin_provider_api/tsrc/group"/> -->
-      <unit bldFile="/sf/os/textandloc/textandloc_pub/group"/>
-     </component>
-     <component unofficial="yes" name="textandloc_build" long-name="Text and Localisation Build" origin-model="foundation">
-      <unit bldFile="/sf/os/textandloc/group"/>
-     </component>
-     <component unofficial="yes" name="textandloc_plat" long-name="Text and Localisation Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/os/textandloc/textandloc_plat/findutil_api/tsrc/group"/> -->
-      <unit bldFile="/sf/os/textandloc/textandloc_plat/group"/>
-      <!-- <unit bldFile="/sf/os/textandloc/textandloc_plat/sortutil_api/tsrc/group"/> -->
-     </component>
-    <component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/textandloc/textandloc_info/textandloc_metadata/textandloc_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/textandloc/sources.csv
--- a/3k/os/textandloc/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/graphics/,/sf/os/graphics,branch,default,
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/wlan/package_definition.xml
--- a/3k/os/wlan/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="wlan" long-name="WLAN" tech_domain="dc" level="services" levels="hw low mid high tools test">
-    <collection name="wlan_bearer" long-name="WLAN Bearer" level="hw">
-     <component name="wlanpsmplugin" long-name="WLAN PSM Plugin" origin-model="foundation">
-      <unit bldFile="/sf/os/wlan/wlan_bearer/wlanpsmplugin/group"/>
-     </component>
-     <component name="wlanagent" long-name="WLAN Agent" origin-model="foundation">
-      <unit bldFile="/sf/os/wlan/wlan_bearer/wlanagent/group"/>
-     </component>
-     <component name="wlandbif_cd" long-name="WLAN CommsDat interface" origin-model="foundation">
-      <unit bldFile="/sf/os/wlan/wlan_bearer/wlandbif_cd/group"/>
-     </component>
-     <component name="wlanengine" long-name="WLAN Engine" origin-model="foundation">
-      <unit bldFile="/sf/os/wlan/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
-     </component>
-     <component name="wlanldd" long-name="WLAN LDD" origin-model="foundation">
-      <unit bldFile="/sf/os/wlan/wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
-     </component>
-     <component name="wlannwif" long-name="WLAN Network Interface" origin-model="foundation">
-      <unit bldFile="/sf/os/wlan/wlan_bearer/wlannwif/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_bearer_build" origin-model="foundation">
-      <unit bldFile="/sf/os/wlan/wlan_bearer/group"/>
-     </component>
-    </collection>
-    <collection name="wlantools" long-name="WLAN Tools" level="tools">
-     <component name="dut" long-name="Dut" origin-model="foundation"/>
-     <component name="ping" long-name="Ping" origin-model="foundation"/>
-    </collection>
-    <collection name="wlanapitest" long-name="WLAN API Tests" level="test">
-     <component name="wlanhaitest" long-name="WLAN HAI Tests" introduced="tb91" purpose="development" class="placeholder" plugin="N" origin-model="Symbian">
-      <!-- PLACEHOLDER="DS.1645"
-	<unit mrp="wlanapitest/wlanhaitest/group/wlanhai.mrp"/>
-	-->
-     </component>
-    </collection>
-    <collection name="wlan_info" long-name="WLAN Info" level="test">
-     <component unofficial="yes" name="wlan_pub" long-name="WLAN Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/os/wlan/wlan_pub/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_build" long-name="WLAN Build" origin-model="foundation">
-      <unit bldFile="/sf/os/wlan/group"/>
-     </component>
-     <component unofficial="yes" name="wlan_plat" long-name="WLAN Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/os/wlan/wlan_plat/group"/>
-     </component>
-    <component name="wlan_metadata" long-name="WLAN Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/wlan/wlan_info/wlan_metadata/wlan_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/wlan/sources.csv
--- a/3k/os/wlan/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/xmlsrv/package_definition.xml
--- a/3k/os/xmlsrv/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
-<systemModel>
-<layer name="os" long-name="OS" levels="hw services">
-<block name="xmlsrv" long-name="XML Services" tech_domain="rt" level="services" levels="plugin server framework generic specific">
-    <collection name="xmlengine" long-name="XML Engine" level="server">
-     <component name="libxml2" long-name="Libxml2" origin-model="foundation">
-      <unit bldFile="/sf/os/xmlsrv/xmlengine/libxml2/group"/>
-     </component>
-     <component name="xmlengineutils" long-name="XML Engine Utils" origin-model="foundation">
-      <unit bldFile="/sf/os/xmlsrv/xmlengine/xmlengineutils/group"/>
-     </component>
-     <component name="domxpathwrapper" long-name="DOM XPath Wrapper" origin-model="foundation">
-      <unit bldFile="/sf/os/xmlsrv/xmlengine/domxpathwrapper/group"/>
-     </component>
-     <component name="xmlengineserializer" long-name="XML Engines Erializer" origin-model="foundation">
-      <unit bldFile="/sf/os/xmlsrv/xmlengine/xmlengineserializer/group"/>
-     </component>
-     <component name="xmlenginesaxplugin" long-name="XML Engine SAX Plugin" origin-model="foundation">
-      <unit bldFile="/sf/os/xmlsrv/xmlengine/xmlenginesaxplugin/group"/>
-     </component>
-     <component unofficial="yes" name="xmlengine_build" long-name="XML Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/os/xmlsrv/xmlengine/group"/>
-     </component>
-    </collection>
-    <collection name="xmlsecurityengine" long-name="XML Security Engine" level="framework">
-     <component name="xmlseccertman" long-name="XML Security Certman" origin-model="foundation">
-      <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlseccertman/group"/>
-     </component>
-     <component name="xmlsec" long-name="XML Security" origin-model="foundation">
-      <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlsec/group"/>
-     </component>
-     <component name="xmlseccrypto" long-name="XML Security Crypto" origin-model="foundation">
-      <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlseccrypto/group"/>
-     </component>
-     <component name="xmlsecwrapper" long-name="XML Security Wrapper" origin-model="foundation">
-      <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/xmlsecwrapper/group"/>
-     </component>
-     <component unofficial="yes" name="xmlsecurityengine_build" long-name="XML Security Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/os/xmlsrv/xmlsecurityengine/group"/>
-     </component>
-    </collection>
-    <collection name="xml" long-name="XML" level="generic">
-     <component name="xmlfw" long-name="XML Framework" introduced="7.0s" purpose="optional" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/os/xmlsrv/xml/xmlfw/group" mrp="/sf/os/xmlsrv/xml/xmlfw/group/syslibs_xml.mrp"/>
-     </component>
-     <component name="xmlexpatparser" long-name="XML Expat Parser" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/xmlsrv/xml/xmlexpatparser/group" mrp="/sf/os/xmlsrv/xml/xmlexpatparser/group/syslibs_xmlparser.mrp"/>
-     </component>
-     <component name="wbxmlparser" long-name="WBXML Parser" introduced="7.0s" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/xmlsrv/xml/wbxmlparser/group" mrp="/sf/os/xmlsrv/xml/wbxmlparser/group/syslibs_wbxmlparser.mrp"/>
-     </component>
-    </collection>
-    <collection name="xmlsrv_info" long-name="XML Services Info" level="specific">
-     <component unofficial="yes" name="xmlsrv_plat" long-name="XML Services Platform Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/group"/>
-      <!-- <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_encryption_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_engine_serializer_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_engine_utils_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_engine_xpath_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_security_engine_utils_api/tsrc/group"/> -->
-      <!-- <unit bldFile="/sf/os/xmlsrv/xmlsrv_plat/xml_signature_api/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="xmlsrv_build" long-name="XML Services Build" origin-model="foundation">
-      <unit bldFile="/sf/os/xmlsrv/group"/>
-     </component>
-     <component unofficial="yes" name="xmlsrv_pub" long-name="XML Services Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/os/xmlsrv/xmlsrv_pub/group"/>
-      <!-- <unit bldFile="/sf/os/xmlsrv/xmlsrv_pub/xml_engine_dom_api/tsrc/group"/> -->
-     </component>
-    <component name="xmlsrv_metadata" long-name="XML Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/os/xmlsrv/xmlsrv_info/xmlsrv_metadata/xmlsrv_metadata.mrp"/>
-     </component>
-    </collection>
-   </block>
-</layer>
-</systemModel>
-</SystemDefinition>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 3k/os/xmlsrv/sources.csv
--- a/3k/os/xmlsrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/ostools/osrndtools/package_definition.xml
--- a/3k/ostools/osrndtools/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
- <systemModel>
-  <layer name="ostools" long-name="OS Tools">
-   <block name="osrndtools" long-name="OS RD tools" tech_domain="to" level="services" levels="fw trace">
-    <collection name="stif" long-name="STIF" level="fw">
-     <component name="testinterface" long-name="Test Interface" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/stif/testinterface/group"/>
-     </component>
-     <component name="testserver" long-name="Test Server" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/stif/testserver/group"/>
-     </component>
-     <component name="testengine" long-name="Test Engine" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/stif/testengine/group"/>
-     </component>
-     <component name="testserverstarter" long-name="Test Server Starter" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/stif/testserverstarter/group"/>
-     </component>
-     <component name="stiftfwif" long-name="STIF TFwIf" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/stif/stiftfwif/group"/>
-     </component>
-     <component name="consoleui" long-name="Console UI" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/stif/consoleui/group"/>
-     </component>
-     <component name="testcombiner" long-name="Test Combiner" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/stif/testcombiner/group"/>
-     </component>
-     <component name="demomodule" long-name="Demo Module" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/stif/demomodule/group"/>
-     </component>
-     <component name="atslogger" long-name="ATS Logger" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/stif/atslogger/group"/>
-     </component>
-     <component name="atsinterface" long-name="ATS Interface" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/stif/atsinterface/group"/>
-     </component>
-     <component name="testscripter" long-name="Test Scripter" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/stif/testscripter/group"/>
-     </component>
-     <component name="suevent" long-name="SU Event" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/stif/suevent/group"/>
-     </component>
-     <component name="stifkerneltestclassbase" long-name="STIF Kernel Test Class Base" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/stif/stifkerneltestclassbase/group"/>
-     </component>
-     <component name="examples" long-name="Examples" origin-model="foundation">
-      <!-- <unit bldFile="/sf/ostools/osrndtools/stif/examples/stiftestmeasurementstub/group"/> -->
-      <!-- <unit bldFile="/sf/ostools/osrndtools/stif/examples/stifhwresetstub/group"/> -->
-     </component>
-     <component name="testmoduletemplates" long-name="Test Module Templates" origin-model="foundation">
-      <!-- <unit bldFile="/sf/ostools/osrndtools/stif/testmoduletemplates/templatescriptxxx/group"/> -->
-      <!-- <unit bldFile="/sf/ostools/osrndtools/stif/testmoduletemplates/templatekernelscriptxxx/group"/> -->
-      <!-- <unit bldFile="/sf/ostools/osrndtools/stif/testmoduletemplates/capsmodifierxxx/group"/> -->
-      <!-- <unit bldFile="/sf/ostools/osrndtools/stif/testmoduletemplates/testmodulexxx/group"/> -->
-      <!-- <unit bldFile="/sf/ostools/osrndtools/stif/testmoduletemplates/stifunitxxx/group"/> -->
-      <!-- <unit bldFile="/sf/ostools/osrndtools/stif/testmoduletemplates/hardcodedtestmodulexxx/group"/> -->
-     </component>
-     <component unofficial="yes" name="stif_build" long-name="STIF Build" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/stif/group"/>
-     </component>
-    </collection>
-    <collection name="memspy" long-name="Memspy" level="trace">
-     <component name="driver" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/memspy/driver/group"/>
-     </component>
-     <component name="memspy_engine" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/memspy/engine/group"/>
-     </component>
-     <component name="commandline" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/memspy/commandline/group"/>
-     </component>
-     <component name="console" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/memspy/console/group"/>
-     </component>
-     <component unofficial="yes" name="memspy_build" long-name="Memspy Build" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/memspy/group"/>
-     </component>
-    </collection>
-    <collection name="hti" long-name="HTI" level="trace">
-     <component name="hticfg" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/hti/hticfg/group"/>
-     </component>
-     <component name="htiautostart" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/hti/htiautostart/group"/>
-     </component>
-     <component name="htiframework" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/hti/htiframework/group"/>
-     </component>
-     <!-- Empty duplicate component HtiCommPlugins removed -->
-     <!-- Empty duplicate component HtiServicePlugins removed -->
-     <component name="htifilehlp" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/hti/htifilehlp/group"/>
-     </component>
-     <component name="htiwatchdog" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/hti/htiwatchdog/group"/>
-     </component>
-     <component unofficial="yes" name="hti_build" long-name="HTI Build" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/hti/group"/>
-     </component>
-    </collection>
-    <collection name="testexecfw1" long-name="Test Execution Framework v1" level="fw">
-     <component name="cinidata" long-name="CINI Data" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/osrndtools/testexecfw1/cinidata" mrp="os/osrndtools/testexecfw1/cinidata/tools_cinidata.mrp"/> -->
-     </component>
-     <component name="testexecute" long-name="Test Execute" deprecated="tb91" purpose="development" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="os/osrndtools/testexecfw1/testexecute/Group" mrp="os/osrndtools/testexecfw1/testexecute/Group/tools_testexecute.mrp"/> -->
-     </component>
-    </collection>
-    <collection name="osrndtools_info" long-name="OS RD tools Info" level="trace">
-     <component unofficial="yes" name="osrndtools_build" long-name="OS RD tools Build" origin-model="foundation">
-      <unit bldFile="/sf/ostools/osrndtools/group"/>
-     </component>
-    <component name="osrndtools_metadata" long-name="OS RD tools Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="os/osrndtools/osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
-     </component>
-    </collection>
-	<collection name="osrndtools_plat" long-name="OS RD tools Platform Interfaces" level="trace">
-     <component unofficial="yes" name="memspy_api" origin-model="Foundation">
-      <unit bldFile="/sf/ostools/osrndtools/osrndtools_plat/memspy_api/group"/>
-     </component>
-     <component unofficial="yes" name="stif_api" origin-model="Foundation">
-      <unit bldFile="/sf/ostools/osrndtools/osrndtools_plat/stif_api/group"/>
-     </component>
-     <component unofficial="yes" name="hti_api" origin-model="Foundation">
-      <unit bldFile="/sf/ostools/osrndtools/osrndtools_plat/hti_api/group"/>
-     </component>
-     <component unofficial="yes" name="open_system_trace_api" origin-model="Foundation">
-      <unit bldFile="/sf/ostools/osrndtools/osrndtools_plat/open_system_trace_api/group"/>
-     </component>
-    </collection>
-   </block>
-  </layer>
- </systemModel>
-</SystemDefinition>
diff -r 71e33828c0aa -r d58c47cf1f41 3k/ostools/osrndtools/sources.csv
--- a/3k/ostools/osrndtools/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/ostools/osrndtools/,/sf/ostools/osrndtools,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/tools/homescreentools/package_definition.xml
--- a/3k/tools/homescreentools/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
- <systemModel>
-  <layer name="tools" long-name="Tools">
-   <block name="homescreentools" long-name="Home Screen Tools" tech_domain="ui" level="services" levels="tool install">
-    <collection name="dtdinstaller" long-name="DTD Installer" level="install">
-     <component name="dtdinstaller_build" origin-model="foundation">
-      <unit bldFile="/sf/tools/homescreentools/dtdinstaller/group"/>
-     </component>
-    </collection>
-    <collection name="themeinstaller" long-name="Theme Installer" level="install">
-     <component name="themeinstaller_build" origin-model="foundation">
-      <unit bldFile="/sf/tools/homescreentools/themeinstaller/group"/>
-     </component>
-    </collection>
-    <collection name="themetool" long-name="Theme Tool" level="tool">
-     <component name="themetool_build" origin-model="foundation">
-      <unit bldFile="/sf/tools/homescreentools/themetool/group"/>
-     </component>
-    </collection>
-    <collection name="homescreentools_info" long-name="Home Screen Tools Info" level="install">
-     <component unofficial="yes" name="homescreentools_build" long-name="Home Screen Tools Build" origin-model="foundation">
-      <unit bldFile="/sf/tools/homescreentools/group"/>
-     </component>
-    </collection>
-   </block>
-  </layer>
- </systemModel>
-</SystemDefinition>
diff -r 71e33828c0aa -r d58c47cf1f41 3k/tools/homescreentools/sources.csv
--- a/3k/tools/homescreentools/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/tools/platformtools/package_definition.xml
--- a/3k/tools/platformtools/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
- <systemModel>
-<layer name="tools" long-name="Tools">
-   <block name="platformtools" long-name="Platform Tools" tech_domain="to" level="generic">
-    <collection name="gfxconversion" long-name="Graphics Conversion">
-     <component name="bmconv_s60" long-name="Bm Conv S60" origin-model="foundation">
-      <unit bldFile="/sf/tools/platformtools/gfxconversion/bmconv_s60/group"/>
-     </component>
-     <component name="mifconv" long-name="Mifconv" origin-model="foundation">
-      <unit bldFile="/sf/tools/platformtools/gfxconversion/mifconv/group"/>
-     </component>
-    </collection>
-    <collection name="platformtools_info" long-name="Platform Tools Info">
-     <component unofficial="yes" name="platformtools_build" long-name="Platform Tools Build" origin-model="foundation">
-      <unit bldFile="/sf/tools/platformtools/group"/>
-     </component>
-    </collection>
-   </block>
-  </layer>
- </systemModel>
-</SystemDefinition>
diff -r 71e33828c0aa -r d58c47cf1f41 3k/tools/platformtools/sources.csv
--- a/3k/tools/platformtools/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/platformtools/,/sf/tools/platformtools,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/tools/rndtools/package_definition.xml
--- a/3k/tools/rndtools/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
- <systemModel>
-<layer name="tools" long-name="Tools">
-   <block name="rndtools" long-name="RD tools" tech_domain="to" level="services" levels="app generic specific">
-    <collection name="creator" long-name="Creator" level="app">
-     <component name="creator_build" origin-model="foundation">
-      <unit bldFile="/sf/tools/rndtools/creator/group"/>
-     </component>
-    </collection>
-    <collection name="filebrowser" long-name="File Browser" level="specific">
-     <component name="fileopserver" long-name="File Op Server" origin-model="foundation">
-      <unit bldFile="/sf/tools/rndtools/filebrowser/fileopserver/group"/>
-     </component>
-     <component name="fileopclient" long-name="File Op Client" origin-model="foundation">
-      <unit bldFile="/sf/tools/rndtools/filebrowser/fileopclient/group"/>
-     </component>
-     <component name="filebrowser_build" origin-model="foundation">
-      <unit bldFile="/sf/tools/rndtools/filebrowser/group"/>
-     </component>
-    </collection>
-    <collection name="launcher" long-name="Launcher" level="specific">
-     <component name="launcher_build" origin-model="foundation">
-      <unit bldFile="/sf/tools/rndtools/launcher/group"/>
-     </component>
-    </collection>
-    <collection name="screengrabber" long-name="Screen Grabber" level="specific">
-     <component name="screengrabber_build" origin-model="foundation">
-      <unit bldFile="/sf/tools/rndtools/screengrabber/group"/>
-     </component>
-    </collection>
-    <collection name="stifui" long-name="STIF UI" level="generic">
-     <component name="stifui_stifui" long-name="STIF UI" origin-model="foundation">
-      <unit bldFile="/sf/tools/rndtools/stifui/stifui/group"/>
-     </component>
-     <component name="uitestserverstarter" long-name="UI Test Server Starter" origin-model="foundation">
-      <unit bldFile="/sf/tools/rndtools/stifui/uitestserverstarter/group"/>
-     </component>
-     <component unofficial="yes" name="stifui_build" long-name="STIF UI Build" origin-model="foundation">
-      <unit bldFile="/sf/tools/rndtools/stifui/group"/>
-     </component>
-    </collection>
-    <collection name="loadgen" long-name="Load Generator" level="app">
-     <component name="loadgen_build" origin-model="foundation">
-      <unit bldFile="/sf/tools/rndtools/loadgen/group"/>
-     </component>
-    </collection>
-    <collection name="perfmon" long-name="Performance Monitor" level="app">
-     <component name="perfmon_build" origin-model="foundation">
-      <unit bldFile="/sf/tools/rndtools/perfmon/group"/>
-     </component>
-    </collection>
-    <collection name="htiui" long-name="HTI UI" level="generic">
-     <!-- Empty duplicate component HtiCommPlugins removed -->
-     <!-- Empty duplicate component HtiServicePlugins removed -->
-     <component name="htidevicereboot" long-name="HTI DeviceR eboot" origin-model="foundation">
-      <unit bldFile="/sf/tools/rndtools/htiui/htidevicereboot/group"/>
-     </component>
-     <component name="htistartupwait" long-name="HTI Startup Wait" origin-model="foundation">
-      <unit bldFile="/sf/tools/rndtools/htiui/htistartupwait/group"/>
-     </component>
-     <component name="htiadmin" long-name="HTI Admin" origin-model="foundation">
-      <unit bldFile="/sf/tools/rndtools/htiui/htiadmin/group"/>
-     </component>
-     <component unofficial="yes" name="htiui_build" long-name="HTI UI Build" origin-model="foundation">
-      <unit bldFile="/sf/tools/rndtools/htiui/group"/>
-     </component>
-    </collection>
-    <collection name="memspyui" long-name="Memspy UI" level="generic">
-     <component name="memspyui_build" origin-model="foundation">
-      <unit bldFile="/sf/tools/rndtools/memspyui/group"/>
-     </component>
-    </collection>
-   </block>
-  </layer>
- </systemModel>
-</SystemDefinition>
-
diff -r 71e33828c0aa -r d58c47cf1f41 3k/tools/rndtools/sources.csv
--- a/3k/tools/rndtools/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/rndtools/,/sf/tools/rndtools,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 3k/tools/swconfigtools/package_definition.xml
--- a/3k/tools/swconfigtools/package_definition.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
- <systemModel>
-<layer name="tools" long-name="Tools">
-   <block name="swconfigtools" long-name="Software Config Tools" tech_domain="to" level="services">
-    <collection name="gid_pc_tool" long-name="GID PC Tool">
-     <component name="dbimporter" long-name="DB Importer" origin-model="foundation">
-      <unit bldFile="/sf/tools/swconfigtools/gid_pc_tool/group"/>
-     </component>
-    </collection>
-   </block>
-  </layer>
- </systemModel>
-</SystemDefinition>
diff -r 71e33828c0aa -r d58c47cf1f41 3k/tools/swconfigtools/sources.csv
--- a/3k/tools/swconfigtools/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/app/homescreen/job_props.ant.xml
--- a/FCL/app/homescreen/job_props.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-PROPS">
-	<property name="sf.project.type" value="package"/>
-    <property name="sf.spec.job.name" value="homescreen"/>
-    <property name="sf.spec.job.codeline" value="FCL"/>
-    <property name="sf.spec.systemdefinition.location" value="\sf\app\homescreen\package_definition.xml"/>
-</project>
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/app/homescreen/job_refs.ant.xml
--- a/FCL/app/homescreen/job_refs.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-REFS"/>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/app/homescreen/sources.csv
--- a/FCL/app/homescreen/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-\\bishare\mercurial_master_prod\sfl\FCL\sf\app\homescreen,\sf\app\homescreen,tag,tip,layers.sysdef.xml
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/app/organizer/job_props.ant.xml
--- a/FCL/app/organizer/job_props.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-PROPS">
-	<property name="sf.project.type" value="package"/>
-    <property name="sf.spec.job.name" value="organizer"/>
-    <property name="sf.spec.job.codeline" value="FCL"/>
-    <property name="sf.spec.systemdefinition.location" value="\sf\app\organizer\package_definition.xml"/>
-</project>
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/app/organizer/job_refs.ant.xml
--- a/FCL/app/organizer/job_refs.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-REFS"/>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/app/organizer/sources.csv
--- a/FCL/app/organizer/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-\\bishare\mercurial_master_prod\sfl\MCL\sf\app\organizer,\sf\app\organizer,tag,tip,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/app/webuis/job_props.ant.xml
--- a/FCL/app/webuis/job_props.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-PROPS">
-	<property name="sf.project.type" value="package"/>
-    <property name="sf.spec.job.name" value="webuis"/>
-    <property name="sf.spec.job.codeline" value="FCL"/>
-    <property name="sf.spec.systemdefinition.location" value="\sf\app\webuis\package_definition.xml"/>
-</project>
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/app/webuis/job_refs.ant.xml
--- a/FCL/app/webuis/job_refs.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-REFS"/>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/app/webuis/sources.csv
--- a/FCL/app/webuis/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-\\bishare\mercurial_master_prod\oss\FCL\sf\app\webuis,\sf\app\webuis,tag,tip,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/mw/homescreensrv/job_props.ant.xml
--- a/FCL/mw/homescreensrv/job_props.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-PROPS">
-	<property name="sf.project.type" value="package"/>
-    <property name="sf.spec.job.name" value="homescreensrv"/>
-    <property name="sf.spec.job.codeline" value="FCL"/>
-    <property name="sf.spec.systemdefinition.location" value="\sf\mw\homescreensrv\package_definition.xml"/>
-</project>
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/mw/homescreensrv/job_refs.ant.xml
--- a/FCL/mw/homescreensrv/job_refs.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-REFS"/>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/mw/homescreensrv/sources.csv
--- a/FCL/mw/homescreensrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-\\bishare\mercurial_master_prod\sfl\FCL\sf\mw\homescreensrv,\sf\mw\homescreensrv,tag,tip,layers.sysdef.xml
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/mw/serviceapi/job_props.ant.xml
--- a/FCL/mw/serviceapi/job_props.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-PROPS">
-	<property name="sf.project.type" value="package"/>
-    <property name="sf.spec.job.name" value="serviceapi"/>
-    <property name="sf.spec.job.codeline" value="FCL"/>
-    <property name="sf.spec.systemdefinition.location" value="\sf\mw\serviceapi\package_definition.xml"/>
-</project>
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/mw/serviceapi/job_refs.ant.xml
--- a/FCL/mw/serviceapi/job_refs.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-REFS"/>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/mw/serviceapi/sources.csv
--- a/FCL/mw/serviceapi/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-\\bishare\mercurial_master_prod\oss\FCL\sf\mw\serviceapi,\sf\mw\serviceapi,tag,tip,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/mw/serviceapifw/job_props.ant.xml
--- a/FCL/mw/serviceapifw/job_props.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-PROPS">
-	<property name="sf.project.type" value="package"/>
-    <property name="sf.spec.job.name" value="serviceapifw"/>
-    <property name="sf.spec.job.codeline" value="FCL"/>
-    <property name="sf.spec.systemdefinition.location" value="\sf\mw\serviceapifw\package_definition.xml"/>
-</project>
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/mw/serviceapifw/job_refs.ant.xml
--- a/FCL/mw/serviceapifw/job_refs.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-REFS"/>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/mw/serviceapifw/sources.csv
--- a/FCL/mw/serviceapifw/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-\\bishare\mercurial_master_prod\oss\FCL\sf\mw\serviceapifw,\sf\mw\serviceapifw,tag,tip,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/mw/web/job_props.ant.xml
--- a/FCL/mw/web/job_props.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-PROPS">
-	<property name="sf.project.type" value="package"/>
-    <property name="sf.spec.job.name" value="web"/>
-    <property name="sf.spec.job.codeline" value="FCL"/>
-    <property name="sf.spec.systemdefinition.location" value="\sf\mw\web\package_definition.xml"/>
-</project>
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/mw/web/job_refs.ant.xml
--- a/FCL/mw/web/job_refs.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-REFS"/>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/mw/web/sources.csv
--- a/FCL/mw/web/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-\\bishare\mercurial_master_prod\oss\FCL\sf\mw\web,\sf\mw\web,tag,tip,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/os/boardsupport/job_props.ant.xml
--- a/FCL/os/boardsupport/job_props.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-PROPS">
-	<property name="sf.project.type" value="package"/>
-    <property name="sf.spec.job.name" value="boardsupport"/>
-    <property name="sf.spec.job.codeline" value="FCL"/>
-    <property name="sf.spec.systemdefinition.location" value="\sf\os\boardsupport\package_definition.xml"/>
-</project>
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/os/boardsupport/job_refs.ant.xml
--- a/FCL/os/boardsupport/job_refs.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-REFS"/>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/os/boardsupport/sources.csv
--- a/FCL/os/boardsupport/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-\\bishare\mercurial_master_prod\sfl\MCL\sf\os\boardsupport,\sf\os\boardsupport,tag,tip,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/os/graphics/job_props.ant.xml
--- a/FCL/os/graphics/job_props.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-PROPS">
-	<property name="sf.project.type" value="package"/>
-    <property name="sf.spec.job.name" value="graphics"/>
-    <property name="sf.spec.job.codeline" value="FCL"/>
-    <property name="sf.spec.systemdefinition.location" value="\sf\os\graphics\package_definition.xml"/>
-</project>
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/os/graphics/job_refs.ant.xml
--- a/FCL/os/graphics/job_refs.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-REFS"/>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/os/graphics/sources.csv
--- a/FCL/os/graphics/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-\\bishare\mercurial_master_prod\sfl\MCL\sf\os\graphics,\sf\os\graphics,tag,tip,layers.sysdef.xml
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/os/kernelhwsrv/job_props.ant.xml
--- a/FCL/os/kernelhwsrv/job_props.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-PROPS">
-	<property name="sf.project.type" value="package"/>
-    <property name="sf.spec.job.name" value="kernelhwsrv"/>
-    <property name="sf.spec.job.codeline" value="FCL"/>
-    <property name="sf.spec.systemdefinition.location" value="\sf\os\kernelhwsrv\package_definition.xml"/>
-    <property name="sf.spec.smoketest.enable" value="false"/>
-</project>
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/os/kernelhwsrv/job_refs.ant.xml
--- a/FCL/os/kernelhwsrv/job_refs.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-REFS"/>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/os/kernelhwsrv/sources.csv
--- a/FCL/os/kernelhwsrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-\\bishare\mercurial_master_prod\sfl\MCL\sf\os\kernelhwsrv,\sf\os\kernelhwsrv,tag,tip,layers.sysdef.xml
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/os/ossrv/job_props.ant.xml
--- a/FCL/os/ossrv/job_props.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-PROPS">
-	<property name="sf.project.type" value="package"/>
-    <property name="sf.spec.job.name" value="ossrv"/>
-    <property name="sf.spec.job.codeline" value="FCL"/>
-    <property name="sf.spec.systemdefinition.location" value="\sf\os\ossrv\package_definition.xml"/>
-</project>
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/os/ossrv/job_refs.ant.xml
--- a/FCL/os/ossrv/job_refs.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-REFS"/>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/os/ossrv/sources.csv
--- a/FCL/os/ossrv/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-\\bishare\mercurial_master_prod\sfl\MCL\sf\os\ossrv,\sf\os\ossrv,tag,tip,layers.sysdef.xml
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/os/security/job_props.ant.xml
--- a/FCL/os/security/job_props.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-PROPS">
-	<property name="sf.project.type" value="package"/>
-    <property name="sf.spec.job.name" value="security"/>
-    <property name="sf.spec.job.codeline" value="FCL"/>
-    <property name="sf.spec.systemdefinition.location" value="\sf\os\security\package_definition.xml"/>
-</project>
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/os/security/job_refs.ant.xml
--- a/FCL/os/security/job_refs.ant.xml	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="SF-JOB-REFS"/>
\ No newline at end of file
diff -r 71e33828c0aa -r d58c47cf1f41 FCL/os/security/sources.csv
--- a/FCL/os/security/sources.csv	Wed Nov 11 18:02:02 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-\\bishare\mercurial_master_prod\oss\MCL\sf\os\security,\sf\os\security,tag,tip,layers.sysdef.xml