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