201025_02
authorhgs
Tue, 29 Jun 2010 10:40:11 +0300
changeset 46 eea20ed08f4b
parent 40 951aeeb3da43
child 51 50b444048a8d
201025_02
appfw/apparchitecture/apgrfx/apgrecog.cpp
appfw/apparchitecture/aplist/aplappinforeader.cpp
appfw/apparchitecture/aplist/aplappinforeader.h
appfw/apparchitecture/aplist/aplapplist.cpp
appfw/apparchitecture/apserv/APSSES.CPP
appfw/apparchitecture/apserv/APSSES.H
appfw/apparchitecture/bwins/APGRFXU.DEF
appfw/apparchitecture/bwins/TICONFORLEAKSu.DEF
appfw/apparchitecture/bwins/apfileu.def
appfw/apparchitecture/bwins/apgrfxu.def
appfw/apparchitecture/bwins/apservu.def
appfw/apparchitecture/bwins/ticonforleaksu.def
appfw/apparchitecture/eabi/APFILEU.DEF
appfw/apparchitecture/eabi/APGRFXU.DEF
appfw/apparchitecture/eabi/APSERVU.DEF
appfw/apparchitecture/eabi/TICONFORLEAKSu.DEF
appfw/apparchitecture/eabi/apfileu.def
appfw/apparchitecture/eabi/apgrfxu.def
appfw/apparchitecture/eabi/apservu.def
appfw/apparchitecture/eabi/ticonforleaksu.def
appfw/apparchitecture/group/BLD.INF
appfw/apparchitecture/group/apparcTest_new.iby
appfw/apparchitecture/group/apparctest_new.iby
appfw/apparchitecture/group/bld.inf
appfw/apparchitecture/tdata/Corrupted_reg.RSC
appfw/apparchitecture/tef/CustomiseDefaultIconApp.mmp
appfw/apparchitecture/tef/TCtrlPnlApp.mmp
appfw/apparchitecture/tef/TSTAPP_standalone_Stub.MMP
appfw/apparchitecture/tef/T_DataPrioritySystem3.mmp
appfw/apparchitecture/tef/T_groupname.mmp
appfw/apparchitecture/tef/T_groupname_ver1.mmp
appfw/apparchitecture/tef/T_groupname_ver2.mmp
appfw/apparchitecture/tef/TestTrustedPriorityApp1.mmp
appfw/apparchitecture/tef/TestTrustedPriorityApp2.mmp
appfw/apparchitecture/tef/TestUnTrustedPriorityApp1.mmp
appfw/apparchitecture/tef/TestUnTrustedPriorityApp2.mmp
appfw/apparchitecture/tef/app_CTRL2_stub.MMP
appfw/apparchitecture/tef/app_ctrl2_stub.mmp
appfw/apparchitecture/tef/customisedefaulticonapp.mmp
appfw/apparchitecture/tef/forceregapps/A0001010.rss
appfw/apparchitecture/tef/forceregapps/TForceRegAppRec.cpp
appfw/apparchitecture/tef/forceregapps/TForceRegAppRec.mmp
appfw/apparchitecture/tef/forceregapps/a0001010.rss
appfw/apparchitecture/tef/forceregapps/tforceregapprec.cpp
appfw/apparchitecture/tef/forceregapps/tforceregapprec.mmp
appfw/apparchitecture/tef/m_ctrl_v2_Stub.mmp
appfw/apparchitecture/tef/m_ctrl_v2_stub.mmp
appfw/apparchitecture/tef/refnativeplugin/10285BC3.rss
appfw/apparchitecture/tef/refnativeplugin/10285bc3.rss
appfw/apparchitecture/tef/scripts/apparctest_t_UpdateAppList.script
appfw/apparchitecture/tef/scripts/apparctest_t_updateapplist.script
appfw/apparchitecture/tef/t_dataprioritysystem3.mmp
appfw/apparchitecture/tef/t_groupname.mmp
appfw/apparchitecture/tef/t_groupname_ver1.mmp
appfw/apparchitecture/tef/t_groupname_ver2.mmp
appfw/apparchitecture/tef/tctrlpnlapp.mmp
appfw/apparchitecture/tef/testapp/testforceregistrationapp1/testforceregistrationapp1.mmp
appfw/apparchitecture/tef/testpkg/Nokia_RnDCert_02.der
appfw/apparchitecture/tef/testpkg/Nokia_RnDCert_02.key
appfw/apparchitecture/tef/testpkg/armv5/Corrupted.pkg
appfw/apparchitecture/tef/testpkg/armv5/CustomiseDefaultIconApp.pkg
appfw/apparchitecture/tef/testpkg/armv5/EndTaskTestApp.pkg
appfw/apparchitecture/tef/testpkg/armv5/ForceRegApp1.pkg
appfw/apparchitecture/tef/testpkg/armv5/ForceRegApp2.pkg
appfw/apparchitecture/tef/testpkg/armv5/ForceRegMultipleApps.pkg
appfw/apparchitecture/tef/testpkg/armv5/SimpleApparcTestApp.pkg
appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddableOnly_v2.pkg
appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddableUiNotStandAlone_v2.pkg
appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddableUiOrStandAlone_embedded.pkg
appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddableUiOrStandalone_standalone.pkg
appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddable_embedded.pkg
appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddable_standalone.pkg
appfw/apparchitecture/tef/testpkg/armv5/TAppInstall.pkg
appfw/apparchitecture/tef/testpkg/armv5/TAppNotEmbeddable_v2.pkg
appfw/apparchitecture/tef/testpkg/armv5/TApparcTestApp.pkg
appfw/apparchitecture/tef/testpkg/armv5/TCtrlPnlApp.pkg
appfw/apparchitecture/tef/testpkg/armv5/TNNApp1.pkg
appfw/apparchitecture/tef/testpkg/armv5/TNNApp2.pkg
appfw/apparchitecture/tef/testpkg/armv5/TRApaLsSessionStartAppTestApp_v2.pkg
appfw/apparchitecture/tef/testpkg/armv5/TSTAPP_standalone.pkg
appfw/apparchitecture/tef/testpkg/armv5/TStartDocApp_v2.pkg
appfw/apparchitecture/tef/testpkg/armv5/T_DataPrioritySystem1.pkg
appfw/apparchitecture/tef/testpkg/armv5/T_DataPrioritySystem2.pkg
appfw/apparchitecture/tef/testpkg/armv5/T_DataPrioritySystem3.pkg
appfw/apparchitecture/tef/testpkg/armv5/T_EnvSlots.pkg
appfw/apparchitecture/tef/testpkg/armv5/T_groupname.pkg
appfw/apparchitecture/tef/testpkg/armv5/T_groupname_ver1.pkg
appfw/apparchitecture/tef/testpkg/armv5/T_groupname_ver2.pkg
appfw/apparchitecture/tef/testpkg/armv5/TestTrustedPriorityApp1.pkg
appfw/apparchitecture/tef/testpkg/armv5/TestTrustedPriorityApp2.pkg
appfw/apparchitecture/tef/testpkg/armv5/TestUnTrustedPriorityApp1.pkg
appfw/apparchitecture/tef/testpkg/armv5/TestUnTrustedPriorityApp2.pkg
appfw/apparchitecture/tef/testpkg/armv5/UnProctectedUidApp.pkg
appfw/apparchitecture/tef/testpkg/armv5/app_CTRL.pkg
appfw/apparchitecture/tef/testpkg/armv5/app_CTRL2.pkg
appfw/apparchitecture/tef/testpkg/armv5/app_ctrl.pkg
appfw/apparchitecture/tef/testpkg/armv5/app_ctrl2.pkg
appfw/apparchitecture/tef/testpkg/armv5/corrupted.pkg
appfw/apparchitecture/tef/testpkg/armv5/customisedefaulticonapp.pkg
appfw/apparchitecture/tef/testpkg/armv5/endtasktestapp.pkg
appfw/apparchitecture/tef/testpkg/armv5/forceregapp1.pkg
appfw/apparchitecture/tef/testpkg/armv5/forceregapp2.pkg
appfw/apparchitecture/tef/testpkg/armv5/forceregmultipleapps.pkg
appfw/apparchitecture/tef/testpkg/armv5/simpleapparctestapp.pkg
appfw/apparchitecture/tef/testpkg/armv5/tRuleBasedApp1.pkg
appfw/apparchitecture/tef/testpkg/armv5/tRuleBasedApp2.pkg
appfw/apparchitecture/tef/testpkg/armv5/tRuleBasedApp3.pkg
appfw/apparchitecture/tef/testpkg/armv5/tRuleBasedApp4.pkg
appfw/apparchitecture/tef/testpkg/armv5/t_dataprioritysystem1.pkg
appfw/apparchitecture/tef/testpkg/armv5/t_dataprioritysystem2.pkg
appfw/apparchitecture/tef/testpkg/armv5/t_dataprioritysystem3.pkg
appfw/apparchitecture/tef/testpkg/armv5/t_envslots.pkg
appfw/apparchitecture/tef/testpkg/armv5/t_groupname.pkg
appfw/apparchitecture/tef/testpkg/armv5/t_groupname_ver1.pkg
appfw/apparchitecture/tef/testpkg/armv5/t_groupname_ver2.pkg
appfw/apparchitecture/tef/testpkg/armv5/t_winchainChild.pkg
appfw/apparchitecture/tef/testpkg/armv5/t_winchainLaunch.pkg
appfw/apparchitecture/tef/testpkg/armv5/t_winchainchild.pkg
appfw/apparchitecture/tef/testpkg/armv5/t_winchainlaunch.pkg
appfw/apparchitecture/tef/testpkg/armv5/tapparctestapp.pkg
appfw/apparchitecture/tef/testpkg/armv5/tappembeddable_embedded.pkg
appfw/apparchitecture/tef/testpkg/armv5/tappembeddable_standalone.pkg
appfw/apparchitecture/tef/testpkg/armv5/tappembeddableonly_v2.pkg
appfw/apparchitecture/tef/testpkg/armv5/tappembeddableuinotstandalone_v2.pkg
appfw/apparchitecture/tef/testpkg/armv5/tappembeddableuiorstandalone_embedded.pkg
appfw/apparchitecture/tef/testpkg/armv5/tappembeddableuiorstandalone_standalone.pkg
appfw/apparchitecture/tef/testpkg/armv5/tappinstall.pkg
appfw/apparchitecture/tef/testpkg/armv5/tappnotembeddable_v2.pkg
appfw/apparchitecture/tef/testpkg/armv5/tctrlpnlapp.pkg
appfw/apparchitecture/tef/testpkg/armv5/testtrustedpriorityapp1.pkg
appfw/apparchitecture/tef/testpkg/armv5/testtrustedpriorityapp2.pkg
appfw/apparchitecture/tef/testpkg/armv5/testuntrustedpriorityapp1.pkg
appfw/apparchitecture/tef/testpkg/armv5/testuntrustedpriorityapp2.pkg
appfw/apparchitecture/tef/testpkg/armv5/tnnapp1.pkg
appfw/apparchitecture/tef/testpkg/armv5/tnnapp2.pkg
appfw/apparchitecture/tef/testpkg/armv5/trapalssessionstartapptestapp_v2.pkg
appfw/apparchitecture/tef/testpkg/armv5/trulebasedapp1.pkg
appfw/apparchitecture/tef/testpkg/armv5/trulebasedapp2.pkg
appfw/apparchitecture/tef/testpkg/armv5/trulebasedapp3.pkg
appfw/apparchitecture/tef/testpkg/armv5/trulebasedapp4.pkg
appfw/apparchitecture/tef/testpkg/armv5/tstapp_standalone.pkg
appfw/apparchitecture/tef/testpkg/armv5/tstartdocapp_v2.pkg
appfw/apparchitecture/tef/testpkg/armv5/unproctecteduidapp.pkg
appfw/apparchitecture/tef/testpkg/nokia_rndcert_02.der
appfw/apparchitecture/tef/testpkg/nokia_rndcert_02.key
appfw/apparchitecture/tef/testpkg/stub_sis/TSTAPP_standalone_Stub.pkg
appfw/apparchitecture/tef/testpkg/stub_sis/app_CTRL2_stub.pkg
appfw/apparchitecture/tef/testpkg/stub_sis/app_ctrl2_stub.pkg
appfw/apparchitecture/tef/testpkg/stub_sis/m_ctrl_v2_Stub.pkg
appfw/apparchitecture/tef/testpkg/stub_sis/m_ctrl_v2_stub.pkg
appfw/apparchitecture/tef/testpkg/stub_sis/tstapp_standalone_stub.pkg
appfw/apparchitecture/tef/testpkg/winscw/Corrupted.pkg
appfw/apparchitecture/tef/testpkg/winscw/CustomiseDefaultIconApp.pkg
appfw/apparchitecture/tef/testpkg/winscw/EndTaskTestApp.pkg
appfw/apparchitecture/tef/testpkg/winscw/ForceRegApp1.pkg
appfw/apparchitecture/tef/testpkg/winscw/ForceRegApp2.pkg
appfw/apparchitecture/tef/testpkg/winscw/ForceRegMultipleApps.pkg
appfw/apparchitecture/tef/testpkg/winscw/ParentProcess.sis
appfw/apparchitecture/tef/testpkg/winscw/SimpleApparcTestApp.pkg
appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddableOnly_v2.pkg
appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddableUiNotStandAlone_v2.pkg
appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddableUiOrStandAlone_embedded.pkg
appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddableUiOrStandalone_standalone.pkg
appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddable_embedded.pkg
appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddable_standalone.pkg
appfw/apparchitecture/tef/testpkg/winscw/TAppInstall.pkg
appfw/apparchitecture/tef/testpkg/winscw/TAppNotEmbeddable_v2.pkg
appfw/apparchitecture/tef/testpkg/winscw/TApparcTestApp.pkg
appfw/apparchitecture/tef/testpkg/winscw/TCtrlPnlApp.pkg
appfw/apparchitecture/tef/testpkg/winscw/TNNApp1.pkg
appfw/apparchitecture/tef/testpkg/winscw/TNNApp2.pkg
appfw/apparchitecture/tef/testpkg/winscw/TRApaLsSessionStartAppTestApp_v2.pkg
appfw/apparchitecture/tef/testpkg/winscw/TSTAPP_standalone.pkg
appfw/apparchitecture/tef/testpkg/winscw/TStartDocApp_v2.pkg
appfw/apparchitecture/tef/testpkg/winscw/T_DataPrioritySystem1.pkg
appfw/apparchitecture/tef/testpkg/winscw/T_DataPrioritySystem2.pkg
appfw/apparchitecture/tef/testpkg/winscw/T_DataPrioritySystem3.pkg
appfw/apparchitecture/tef/testpkg/winscw/T_EnvSlots.pkg
appfw/apparchitecture/tef/testpkg/winscw/T_groupname.pkg
appfw/apparchitecture/tef/testpkg/winscw/T_groupname_ver1.pkg
appfw/apparchitecture/tef/testpkg/winscw/T_groupname_ver2.pkg
appfw/apparchitecture/tef/testpkg/winscw/TestTrustedPriorityApp1.pkg
appfw/apparchitecture/tef/testpkg/winscw/TestTrustedPriorityApp2.pkg
appfw/apparchitecture/tef/testpkg/winscw/TestUnTrustedPriorityApp1.pkg
appfw/apparchitecture/tef/testpkg/winscw/TestUnTrustedPriorityApp2.pkg
appfw/apparchitecture/tef/testpkg/winscw/UnProctectedUidApp.pkg
appfw/apparchitecture/tef/testpkg/winscw/app_CTRL.pkg
appfw/apparchitecture/tef/testpkg/winscw/app_CTRL2.pkg
appfw/apparchitecture/tef/testpkg/winscw/app_ctrl.pkg
appfw/apparchitecture/tef/testpkg/winscw/app_ctrl2.pkg
appfw/apparchitecture/tef/testpkg/winscw/corrupted.pkg
appfw/apparchitecture/tef/testpkg/winscw/customisedefaulticonapp.pkg
appfw/apparchitecture/tef/testpkg/winscw/endtasktestapp.pkg
appfw/apparchitecture/tef/testpkg/winscw/forceregapp1.pkg
appfw/apparchitecture/tef/testpkg/winscw/forceregapp2.pkg
appfw/apparchitecture/tef/testpkg/winscw/forceregmultipleapps.pkg
appfw/apparchitecture/tef/testpkg/winscw/parentprocess.sis
appfw/apparchitecture/tef/testpkg/winscw/simpleapparctestapp.pkg
appfw/apparchitecture/tef/testpkg/winscw/tRuleBasedApp1.pkg
appfw/apparchitecture/tef/testpkg/winscw/tRuleBasedApp2.pkg
appfw/apparchitecture/tef/testpkg/winscw/tRuleBasedApp3.pkg
appfw/apparchitecture/tef/testpkg/winscw/tRuleBasedApp4.pkg
appfw/apparchitecture/tef/testpkg/winscw/t_dataprioritysystem1.pkg
appfw/apparchitecture/tef/testpkg/winscw/t_dataprioritysystem2.pkg
appfw/apparchitecture/tef/testpkg/winscw/t_dataprioritysystem3.pkg
appfw/apparchitecture/tef/testpkg/winscw/t_envslots.pkg
appfw/apparchitecture/tef/testpkg/winscw/t_groupname.pkg
appfw/apparchitecture/tef/testpkg/winscw/t_groupname_ver1.pkg
appfw/apparchitecture/tef/testpkg/winscw/t_groupname_ver2.pkg
appfw/apparchitecture/tef/testpkg/winscw/t_winchainChild.pkg
appfw/apparchitecture/tef/testpkg/winscw/t_winchainLaunch.pkg
appfw/apparchitecture/tef/testpkg/winscw/t_winchainchild.pkg
appfw/apparchitecture/tef/testpkg/winscw/t_winchainlaunch.pkg
appfw/apparchitecture/tef/testpkg/winscw/tapparctestapp.pkg
appfw/apparchitecture/tef/testpkg/winscw/tappembeddable_embedded.pkg
appfw/apparchitecture/tef/testpkg/winscw/tappembeddable_standalone.pkg
appfw/apparchitecture/tef/testpkg/winscw/tappembeddableonly_v2.pkg
appfw/apparchitecture/tef/testpkg/winscw/tappembeddableuinotstandalone_v2.pkg
appfw/apparchitecture/tef/testpkg/winscw/tappembeddableuiorstandalone_embedded.pkg
appfw/apparchitecture/tef/testpkg/winscw/tappembeddableuiorstandalone_standalone.pkg
appfw/apparchitecture/tef/testpkg/winscw/tappinstall.pkg
appfw/apparchitecture/tef/testpkg/winscw/tappnotembeddable_v2.pkg
appfw/apparchitecture/tef/testpkg/winscw/tctrlpnlapp.pkg
appfw/apparchitecture/tef/testpkg/winscw/testtrustedpriorityapp1.pkg
appfw/apparchitecture/tef/testpkg/winscw/testtrustedpriorityapp2.pkg
appfw/apparchitecture/tef/testpkg/winscw/testuntrustedpriorityapp1.pkg
appfw/apparchitecture/tef/testpkg/winscw/testuntrustedpriorityapp2.pkg
appfw/apparchitecture/tef/testpkg/winscw/tnnapp1.pkg
appfw/apparchitecture/tef/testpkg/winscw/tnnapp2.pkg
appfw/apparchitecture/tef/testpkg/winscw/trapalssessionstartapptestapp_v2.pkg
appfw/apparchitecture/tef/testpkg/winscw/trulebasedapp1.pkg
appfw/apparchitecture/tef/testpkg/winscw/trulebasedapp2.pkg
appfw/apparchitecture/tef/testpkg/winscw/trulebasedapp3.pkg
appfw/apparchitecture/tef/testpkg/winscw/trulebasedapp4.pkg
appfw/apparchitecture/tef/testpkg/winscw/tstapp_standalone.pkg
appfw/apparchitecture/tef/testpkg/winscw/tstartdocapp_v2.pkg
appfw/apparchitecture/tef/testpkg/winscw/unproctecteduidapp.pkg
appfw/apparchitecture/tef/testtrustedpriorityapp1.mmp
appfw/apparchitecture/tef/testtrustedpriorityapp2.mmp
appfw/apparchitecture/tef/testuntrustedpriorityapp1.mmp
appfw/apparchitecture/tef/testuntrustedpriorityapp2.mmp
appfw/apparchitecture/tef/tssaac/tssaac.mmp
appfw/apparchitecture/tef/tstapp_standalone_stub.mmp
appfw/apparchitecture/tef/zerosizedicontestapp.mmp
appfw/uiftestfw/group/BLD.INF
appfw/uiftestfw/group/bld.inf
appfw/viewserver/group/BLD.INF
appfw/viewserver/group/bld.inf
appfw/viewserver/server/VWSERVER.CPP
appfw/viewserver/server/VWSEVENT.CPP
appfw/viewserver/server/vwspatchdata.cpp
appfw/viewserver/test/group/BLD.INF
appfw/viewserver/test/group/bld.inf
appsupport.pro
appsupport_plat/startup_configuration_api/inc/startupdomaincrkeys.h
appsupport_plat/system_application_notification_api/inc/coreapplicationuisdomainpskeys.h
commonappservices/alarmserver/Group/Bld.inf
commonappservices/alarmserver/Group/bld.inf
commonappservices/alarmserver/doc_pub/AlarmStateTransitionAndAlarmAlertCom.xls
commonappservices/alarmservertest/TestAlarmSrv/BLD.INF
commonappservices/alarmservertest/TestAlarmSrv/bld.inf
commonappservices/appservicesdocs/app-services_documentation.history.xml
commonappservices/appservicesdocs/app-services_documentation.mrp
commonappservices/appservicesdocs/architecturaldescription.eap
commonappservices/backuprestorenotification/group/Bld.inf
commonappservices/backuprestorenotification/group/bld.inf
commonappservices/coreappstest/Group/BLD.INF
commonappservices/coreappstest/Group/bld.inf
commonappservices/doc_pub/app-services_documentation.history.xml
commonappservices/doc_pub/app-services_documentation.mrp
commonappservices/doc_pub/architecturaldescription.eap
contenthandling/webrecognisers/Test/Group/t_ebookmark.mmp
contenthandling/webrecognisers/Test/Group/t_recogtest.mmp
contenthandling/webrecognisers/Test/Group/t_recwap.mmp
contenthandling/webrecognisers/Test/Group/t_recweb.mmp
contenthandling/webrecognisers/Test/Group/t_weburlrec.mmp
contenthandling/webrecognisers/doc_pub/Uid.txt
contenthandling/webrecognisers/group/BLD.INF
contenthandling/webrecognisers/group/bld.inf
contextframework/cfw/conf/contextframework.confml
contextframework/cfw/conf/contextframework_10282BCD.crml
contextframework/cfw/tsrc/public/basic/sis/rd-key.pem
contextframework/cfw/tsrc/public/basic/sis/rd.cer
coreapplicationuis/SysAp/CenRep/CoreApplicationUIsPrivateCRKeys.h
coreapplicationuis/SysAp/Data/SysAp.rss
coreapplicationuis/SysAp/Group/SysAp.mmp
coreapplicationuis/SysAp/Group/bld.inf
coreapplicationuis/SysAp/Inc/SysApApp.h
coreapplicationuis/SysAp/Inc/SysApAppUi.h
coreapplicationuis/SysAp/Inc/SysApDocument.h
coreapplicationuis/SysAp/Inc/SysApFeatureManager.h
coreapplicationuis/SysAp/Inc/SysApPubSubObserver.h
coreapplicationuis/SysAp/Inc/SysApShutdownImage.h
coreapplicationuis/SysAp/Inc/SysApTaskList.h
coreapplicationuis/SysAp/Inc/hbdevicepowermenusymbian.h
coreapplicationuis/SysAp/Inc/sysapaudioroutingobserver.h
coreapplicationuis/SysAp/Inc/sysapbatteryinfocontroller.h
coreapplicationuis/SysAp/Inc/sysapdefaultkeyhandler.h
coreapplicationuis/SysAp/Inc/sysapkeymanagement.h
coreapplicationuis/SysAp/Src/BtSap/SysApBtSapControllerImpl.cpp
coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.cpp
coreapplicationuis/SysAp/Src/CenRepObservers/sysapcenrepofflinemodeobserver.cpp
coreapplicationuis/SysAp/Src/CenRepObservers/sysapcenrepofflinemodeobserver.h
coreapplicationuis/SysAp/Src/OfflineModeController/SysApOfflineModeControllerImpl.cpp
coreapplicationuis/SysAp/Src/OfflineModeController/SysApOfflineModeControllerImpl.h
coreapplicationuis/SysAp/Src/SysApApp.cpp
coreapplicationuis/SysAp/Src/SysApAppUi.cpp
coreapplicationuis/SysAp/Src/SysApDocument.cpp
coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp
coreapplicationuis/SysAp/Src/SysApLightsController.cpp
coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp
coreapplicationuis/SysAp/Src/SysApShutdownImage.cpp
coreapplicationuis/SysAp/Src/SysApSimChanged.cpp
coreapplicationuis/SysAp/Src/SysApTaskList.cpp
coreapplicationuis/SysAp/Src/SysApTimer.cpp
coreapplicationuis/SysAp/Src/hbdevicepowermenusymbian.cpp
coreapplicationuis/SysAp/Src/sysapbatteryinfocontroller.cpp
coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp
coreapplicationuis/SysAp/Src/sysapkeymanagement.cpp
coreapplicationuis/SysAp/Src/sysapremconobserver.cpp
coreapplicationuis/SysAp/rom/SysAp.iby
coreapplicationuis/advancedtspcontroller/data/keyevent.rul
coreapplicationuis/advancedtspcontroller/group/RemConTspController.mmp
coreapplicationuis/advancedtspcontroller/inc/remcontspcontroller.h
coreapplicationuis/advancedtspcontroller/inc/tsptriggerevents.h
coreapplicationuis/advancedtspcontroller/src/remcontspcontroller.cpp
coreapplicationuis/advancedtspcontroller/src/tsptriggerevents.cpp
coreapplicationuis/devicepowermenuplugin/devicepowermenuplugin.pro
coreapplicationuis/devicepowermenuplugin/docml/powermenu.docml
coreapplicationuis/devicepowermenuplugin/hbdevicepowermenu.qrc
coreapplicationuis/devicepowermenuplugin/images/decrement.svg
coreapplicationuis/devicepowermenuplugin/images/increment.svg
coreapplicationuis/devicepowermenuplugin/images/muted.svg
coreapplicationuis/devicepowermenuplugin/images/unmuted.svg
coreapplicationuis/devicepowermenuplugin/inc/hbdevicepowermenuplugin_p.h
coreapplicationuis/devicepowermenuplugin/inc/hbdevicepowermenupluginerrors_p.h
coreapplicationuis/devicepowermenuplugin/inc/hbdevicepowermenuwidegt_p.h
coreapplicationuis/devicepowermenuplugin/rom/devicepowermenu_resources.iby
coreapplicationuis/devicepowermenuplugin/rom/devicepowermenuplugin.iby
coreapplicationuis/devicepowermenuplugin/src/hbdevicepowermenuplugin.cpp
coreapplicationuis/devicepowermenuplugin/src/hbdevicepowermenuwidegt.cpp
filehandling/fileconverterfw/Design/CONARC.MDL
filehandling/fileconverterfw/group/BLD.INF
filehandling/fileconverterfw/group/bld.inf
filehandling/htmltorichtextconverter/doc_pub/CHTMLTOCRTCONVERTER test code.rtf
filehandling/htmltorichtextconverter/group/Bld.inf
filehandling/htmltorichtextconverter/group/bld.inf
filehandling/richtexttohtmlconverter/Group/BLD.INF
filehandling/richtexttohtmlconverter/Group/bld.inf
layers.sysdef.xml
package_definition.xml
printingsupport/printinguisupport/group/BLD.INF
printingsupport/printinguisupport/group/bld.inf
startupservices/Startup/MediatorPlugin/src/102750AF.rss
startupservices/Startup/conf/startup.confml
startupservices/Startup/conf/startup_101F8763.crml
startupservices/Startup/src/StartupAppUi.cpp
sysdef_1_4_0.dtd
sysdef_1_5_1.dtd
sysresmonitoring/oodmonitor/oodmonitor2/resource/outofdiskmonitor.rss
sysresmonitoring/oommonitor/inc/oommemorymonitor.h
sysresmonitoring/oommonitor/inc/oommemorymonitorsession.h
sysresmonitoring/oommonitor/src/oomlog.cpp
sysresmonitoring/oommonitor/src/oommemorymonitorsession.cpp
sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappAppUi.cpp
sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappappui.cpp
systemsettings/accindicatorplugin/inc/accindicator.h
systemsettings/accindicatorplugin/src/accindicator.cpp
systemsettings/group/bld.inf
tzpcside/tzcompiler/group/BLD.INF
tzpcside/tzcompiler/group/bld.inf
tzservices/tzdatabase/group/BLD.INF
tzservices/tzdatabase/group/bld.inf
tzservices/tzloc/src/TzLocalizationDbAccessor.cpp
tzservices/tzserver/Server/Source/timezonesession.cpp
tzservices/tzserver/analysis/DAYLIGHT SAVINGS ANALYSIS.mdl
tzservices/tzserver/analysis/DAYLIGHT SAVINGS ANALYSIS.md~
tzservices/tzserver/analysis/Integration Test Design.cat
tzservices/tzserver/group/BLD.INF
tzservices/tzserver/group/bld.inf
tzservices/tzserver/group/release.txt
--- a/appfw/apparchitecture/apgrfx/apgrecog.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/appfw/apparchitecture/apgrfx/apgrecog.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -403,11 +403,15 @@
 
 /** Gets the data (MIME) type of data passed by buffer.
 
-@param aBuffer A buffer containing data 
+@param aBuffer A buffer containing data; Provide preferred size of buffer. 
+If MIME type could not be recognized using this buffer, provide a buffer of 
+larger size.
 @param aDataType On return, contains the result of the attempt to recognize 
 data. 
 @return KErrNone, if successful; otherwise one of the other system-wide error 
 codes. 
+
+@see RApaLsSession::GetPreferredBufSize()
 */
 EXPORT_C TInt RApaLsSession::RecognizeData(const TDesC8& aBuffer, TDataRecognitionResult& aDataType) const
     {
@@ -417,12 +421,15 @@
 /** Gets the data (MIME) type for data taken from a file with a specified name.
 
 @param aName The full filename, including drive and path, of the file containing the data.
-@param aBuffer A buffer containing data taken from the specified file; typically 
-the data is read from the beginning of the file.
+@param aBuffer A buffer containing data taken from the specified file; Provide preferred size of buffer 
+from beginning of the file. If MIME type could not be recognized using this buffer, provide a buffer of 
+larger size.
 @param aDataType On return, contains the result of the attempt to recognize 
 data. 
 @return KErrNone, if successful; otherwise one of the other system-wide error 
 codes. 
+
+@see RApaLsSession::GetPreferredBufSize()
 */
 EXPORT_C TInt RApaLsSession::RecognizeData(const TDesC& aName, const TDesC8& aBuffer, TDataRecognitionResult& aDataType) const
 	{
@@ -456,12 +463,15 @@
 data (MIME) type.
 
 @param aName The name of the file containing the data.
-@param aBuffer A buffer containing data taken from the specified file; typically 
-the data is read from the beginning of the file.
+@param aBuffer A buffer containing data taken from the specified file; Provide preferred size of buffer 
+from beginning of the file. If MIME type could not be recognized using this buffer, provide a buffer of 
+larger size.
 @param aDataType The data (MIME) type.
 @param aResult On return, contains the result of the test.
 @return KErrNone, if successful; otherwise one of the other system-wide error 
 codes. 
+
+@see RApaLsSession::GetPreferredBufSize()
 */
 EXPORT_C TInt RApaLsSession::RecognizeSpecificData(const TDesC& aName, const TDesC8& aBuffer, const TDataType& aDataType, TBool& aResult) const
 	{
--- a/appfw/apparchitecture/aplist/aplappinforeader.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/appfw/apparchitecture/aplist/aplappinforeader.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -233,13 +233,13 @@
     {
     ReadAppRegistrationInfoL();
     ReadLocalisationInfoL();  
-#ifdef _DEBUG    
+#ifdef APPARC_SHOW_TRACE    
     DisplayAppInfo();
 #endif
     return ETrue;
     }
 
-#ifdef _DEBUG
+#ifdef APPARC_SHOW_TRACE
 void CApaAppInfoReader::DisplayAppInfo()
     { 
     RDebug::Print(_L("[Apparc] Application UID: %X"), iAppUid.iUid);
--- a/appfw/apparchitecture/aplist/aplappinforeader.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/appfw/apparchitecture/aplist/aplappinforeader.h	Tue Jun 29 10:40:11 2010 +0300
@@ -172,7 +172,7 @@
     void ReadMimeTypesSupportedL(const RPointerArray<Usif::CDataType>& dataTypes, CArrayFixFlat<TDataTypeWithPriority>& aMimeTypesSupported);    
     void ReadLocalisationInfoL();
     void ReadViewInfoL(const RPointerArray<Usif::CAppViewData>& aViewData);    
-#ifdef _DEBUG   
+#ifdef APPARC_SHOW_TRACE   
     void DisplayAppInfo();
 #endif
     
--- a/appfw/apparchitecture/aplist/aplapplist.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/appfw/apparchitecture/aplist/aplapplist.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -830,7 +830,7 @@
 @param aObserver Observer to be notified when the update has finished. */
 	{
     
-#if _DEBUG    
+#ifdef APPARC_SHOW_TRACE    
     RDebug::Printf("[Apparc] *****************START CREATING APPLIST ****************************");
 #endif    
     
@@ -1225,7 +1225,7 @@
             iAppData=appData->iNext;
             }
 
-#if _DEBUG  
+#ifdef APPARC_SHOW_TRACE  
         if(appData)
             {
             RDebug::Print(_L("[Apparc] Application with UID: %X is deleted from applist"), appData->iUidType[2]);
@@ -1547,7 +1547,7 @@
 	aAppData->iNext=iAppData;
 	iAppData=aAppData;
 	
-#if _DEBUG	
+#ifdef APPARC_SHOW_TRACE	
     RDebug::Print(_L("[Apparc] Application with UID: %X is added to applist"), aAppData->iUidType[2]);
 #endif
     
@@ -1809,7 +1809,7 @@
 	iScrAppInfo=NULL;
     iScr.Close();
 #endif
-#if _DEBUG    
+#ifdef APPARC_SHOW_TRACE    
     RDebug::Printf("[Apparc] *****************END CREATING APPLIST ****************************");
 #endif    
 	}
--- a/appfw/apparchitecture/apserv/APSSES.CPP	Fri Jun 11 13:48:03 2010 +0300
+++ b/appfw/apparchitecture/apserv/APSSES.CPP	Tue Jun 29 10:40:11 2010 +0300
@@ -421,7 +421,7 @@
 
 void CApaAppArcServSession::ServiceL(const RMessage2& aMessage)
 	{
-#ifdef _DEBUG    
+#ifdef APPARC_SHOW_TRACE    
     TFullName* name = new(ELeave) TFullName();
     RThread client;
     if ( aMessage.Client( client ) == KErrNone )
@@ -624,13 +624,13 @@
 		break;
 	default:
 		iAppListSession->DoServiceL(aMessage);
-#ifdef _DEBUG   
+#ifdef APPARC_SHOW_TRACE   
 		RDebug::Print( _L("[Apparc] CApaAppListServSession::ServiceL(0x%08x) - END - op code: %04d, completeMessage: %d"), this, aMessage.Function(), completeMessage );
 #endif		
 		return;
 		}
 	
-#ifdef _DEBUG 	
+#ifdef APPARC_SHOW_TRACE 	
     RDebug::Print( _L("[Apparc] CApaAppListServSession::ServiceL(0x%08x) - END - op code: %04d, completeMessage: %d"), this, aMessage.Function(), completeMessage );
 #endif	
 	if (completeMessage && !aMessage.IsNull())
@@ -1456,30 +1456,59 @@
 	aInfo.iShortCaption = app->ShortCaption();
 	}
 	
-void CApaAppArcServSession::DoRecognizeUnpackLC(HBufC*& aName, HBufC8*& aBuffer, const RMessage2& aMessage)
-	{
-	ASSERT(aName==NULL);
-	ASSERT(aBuffer==NULL);
-	aName=HBufC::NewLC(User::LeaveIfError(aMessage.GetDesLength(1)));
-	TPtr name(aName->Des());
-	aMessage.ReadL(1, name);
-	aBuffer=HBufC8::NewLC(User::LeaveIfError(aMessage.GetDesLength(2)));
-	TPtr8 buffer(aBuffer->Des());
-	aMessage.ReadL(2, buffer);
-	}
+TPtrC8 CApaAppArcServSession::DoRecognizeUnpackLC(HBufC*& aName, RChunk& aLocalChunk, const RMessage2& aMessage)
+    {
+    ASSERT(aName==NULL);
+    
+    aName=HBufC::NewLC(User::LeaveIfError(aMessage.GetDesLength(1)));
+    TPtr name(aName->Des());
+    aMessage.ReadL(1, name);
+    
+    HBufC8* buffer=NULL;
+    TInt error=KErrNone;
+    TInt bufferSize= aMessage.GetDesLength(2);
+    User::LeaveIfError(bufferSize);
+    //Allocate memory in apparc's process heap.
+    TRAP(error, buffer=HBufC8::NewL(bufferSize));
+
+    if(error==KErrNone)
+        {
+        CleanupStack::PushL(buffer);
+        TPtr8 bufPtr(buffer->Des());
+        aMessage.ReadL(2, bufPtr);   
+        return bufPtr;
+        }
+    else if(error==KErrNoMemory)
+        {
+        //If memory is not available in apparc's process heap, then allocate in kernel heap
+        User::LeaveIfError(aLocalChunk.CreateLocal(bufferSize,bufferSize));
+        CleanupClosePushL(aLocalChunk);
+        TPtr8 bufPtr(aLocalChunk.Base(), bufferSize);
+        aMessage.ReadL(2, bufPtr); 
+        return bufPtr;        
+        }
+    else
+        {
+        User::Leave(error);
+        }
+    
+    TPtrC8 bufPtr(NULL,0); //Never executed. To make compiler happy
+    return bufPtr;
+    }
 
 void CApaAppArcServSession::RecognizeDataL(const RMessage2& aMessage)
 // Recognize the data type of an object
-	{
-	HBufC* name=NULL;
-	HBufC8* buffer=NULL;
-	DoRecognizeUnpackLC(name,buffer,aMessage);
+    {
+    HBufC* name=NULL;
+    RChunk localChunk;
+    
+    TPtrC8 bufPtr=DoRecognizeUnpackLC(name, localChunk, aMessage);
 
-	const TDataRecognitionResult result = iServ.RecognizeDataL(*name, *buffer);
+    const TDataRecognitionResult result = iServ.RecognizeDataL(*name, bufPtr);
 
-	CleanupStack::PopAndDestroy(2); // name & buffer
-	aMessage.WriteL(0,TPckgC<TDataRecognitionResult>(result));
-	}
+    CleanupStack::PopAndDestroy(2); // name & buffer or localChunk
+    aMessage.WriteL(0,TPckgC<TDataRecognitionResult>(result));
+    }
 
 
 void CApaAppArcServSession::RecognizeFilesL(const RMessage2& aMessage)
@@ -1754,16 +1783,17 @@
 	
 void CApaAppArcServSession::RecognizeSpecificDataL(const RMessage2& aMessage)
 // Determine whether an object is of a specific data type
-	{
-	HBufC* name=NULL;
-	HBufC8* buffer=NULL;
-	DoRecognizeUnpackLC(name,buffer,aMessage);
-	TDataType dataType;
-	{TPckg<TDataType> dataType_asDescriptor(dataType);
-	aMessage.ReadL(0, dataType_asDescriptor);}
-	aMessage.Complete(iServ.RecognizeDataL(*name,*buffer,dataType));
-	CleanupStack::PopAndDestroy(2); // name & buffer
-	}
+    {
+    HBufC* name=NULL;
+    RChunk localChunk;
+    
+    TPtrC8 bufPtr=DoRecognizeUnpackLC(name, localChunk, aMessage);
+    TDataType dataType;
+    {TPckg<TDataType> dataType_asDescriptor(dataType);
+    aMessage.ReadL(0, dataType_asDescriptor);}
+    aMessage.Complete(iServ.RecognizeDataL(*name,bufPtr,dataType));
+    CleanupStack::PopAndDestroy(2); // name & buffer or localChunk
+    }
 
 void CApaAppArcServSession::RecognizeSpecificDataPassedByFileHandleL(const RMessage2& aMessage)
 	{
--- a/appfw/apparchitecture/apserv/APSSES.H	Fri Jun 11 13:48:03 2010 +0300
+++ b/appfw/apparchitecture/apserv/APSSES.H	Tue Jun 29 10:40:11 2010 +0300
@@ -178,7 +178,7 @@
 	void RecognizeDataPassedByFileHandleL(const RMessage2& aMessage);
 	void RecognizeSpecificDataL(const RMessage2& aMessage);
 	void RecognizeSpecificDataPassedByFileHandleL(const RMessage2& aMessage);
-	static void DoRecognizeUnpackLC(HBufC*& aName, HBufC8*& aBuffer, const RMessage2& aMessage);
+    static TPtrC8 DoRecognizeUnpackLC(HBufC*& aName, RChunk& aLocalChunk, const RMessage2& aMessage);
 
 	void AppForDataTypeL(const RMessage2& aMessage);
 	TUid AppForDataTypeL(const TDataType& aDataType, const TUid* aServiceUid);
--- a/appfw/apparchitecture/bwins/APGRFXU.DEF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,345 +0,0 @@
-EXPORTS
-	??0RApaLsSession@@QAE@XZ @ 1 NONAME ; public: __thiscall RApaLsSession::RApaLsSession(void)
-	??0TApaPictureFactory@@QAE@PAVCApaProcess@@@Z @ 2 NONAME ; public: __thiscall TApaPictureFactory::TApaPictureFactory(class CApaProcess *)
-	??0TApaTask@@QAE@AAVRWsSession@@@Z @ 3 NONAME ; public: __thiscall TApaTask::TApaTask(class RWsSession &)
-	??0TApaTaskList@@QAE@AAVRWsSession@@@Z @ 4 NONAME ; public: __thiscall TApaTaskList::TApaTaskList(class RWsSession &)
-	??1CApaAppInfoFileReader@@UAE@XZ @ 5 NONAME ABSENT ; public: virtual __thiscall CApaAppInfoFileReader::~CApaAppInfoFileReader(void)
-	??1CApaAppInfoFileWriter@@UAE@XZ @ 6 NONAME ABSENT ; public: virtual __thiscall CApaAppInfoFileWriter::~CApaAppInfoFileWriter(void)
-	??1CApaAppList@@UAE@XZ @ 7 NONAME ABSENT ; public: virtual __thiscall CApaAppList::~CApaAppList(void)
-	??1CApaDoor@@UAE@XZ @ 8 NONAME ; public: virtual __thiscall CApaDoor::~CApaDoor(void)
-	??1CApaMaskedBitmap@@UAE@XZ @ 9 NONAME ; public: virtual __thiscall CApaMaskedBitmap::~CApaMaskedBitmap(void)
-	??1CApaWindowGroupName@@UAE@XZ @ 10 NONAME ; public: virtual __thiscall CApaWindowGroupName::~CApaWindowGroupName(void)
-	?AddCaptionL@CApaAppInfoFileWriter@@QAEXW4TLanguage@@ABVTDesC16@@@Z @ 11 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddCaptionL(enum TLanguage,class TDesC16 const &)
-	?AddIconL@CApaAppInfoFileWriter@@QAEXAAVCApaMaskedBitmap@@@Z @ 12 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddIconL(class CApaMaskedBitmap &)
-	?AddIconL@CApaAppInfoFileWriter@@QAEXABVTDesC16@@@Z @ 13 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddIconL(class TDesC16 const &)
-	?AppCount@RApaLsSession@@QBEHAAH@Z @ 14 NONAME ; public: int __thiscall RApaLsSession::AppCount(int &)const 
-	?AppDataByUid@CApaAppList@@QBEPAVCApaAppData@@VTUid@@@Z @ 15 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::AppDataByUid(class TUid)const 
-	?AppEntry@CApaAppData@@QBE?AVTApaAppEntry@@XZ @ 16 NONAME ABSENT ; public: class TApaAppEntry  __thiscall CApaAppData::AppEntry(void)const 
-	?AppUid@CApaWindowGroupName@@QBE?AVTUid@@XZ @ 17 NONAME ; public: class TUid  __thiscall CApaWindowGroupName::AppUid(void)const 
-	?AppUidL@CApaDoor@@QBE?AVTUid@@XZ @ 18 NONAME ; public: class TUid  __thiscall CApaDoor::AppUidL(void)const 
-	?BringToForeground@TApaTask@@QAEXXZ @ 19 NONAME ; public: void __thiscall TApaTask::BringToForeground(void)
-	?Capability@CApaAppData@@QBEXAAVTDes8@@@Z @ 20 NONAME ABSENT ; public: void __thiscall CApaAppData::Capability(class TDes8 &)const 
-	?Capability@CApaAppInfoFileReader@@QBEXAAVTDes8@@@Z @ 21 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileReader::Capability(class TDes8 &)const 
-	?Caption@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 22 NONAME ; public: class TPtrC16  __thiscall CApaWindowGroupName::Caption(void)const 
-	?CaptionL@CApaAppInfoFileReader@@QAE?AV?$TBuf@$0BAA@@@W4TLanguage@@@Z @ 23 NONAME ABSENT ; public: class TBuf<256>  __thiscall CApaAppInfoFileReader::CaptionL(enum TLanguage)
-	?Connect@RApaLsSession@@QAEHXZ @ 24 NONAME ; public: int __thiscall RApaLsSession::Connect(void)
-	?ConstructFromWgIdL@CApaWindowGroupName@@QAEXH@Z @ 25 NONAME ; public: void __thiscall CApaWindowGroupName::ConstructFromWgIdL(int)
-	?Count@CApaAppList@@QBEHXZ @ 26 NONAME ABSENT ; public: int __thiscall CApaAppList::Count(void)const 
-	?CreateMaskedBitmapL@CApaAppInfoFileReader@@QAEPAVCApaMaskedBitmap@@H@Z @ 27 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAppInfoFileReader::CreateMaskedBitmapL(int)
-	?CycleTasks@TApaTaskList@@QAEHVTUid@@W4TCycleDirection@1@@Z @ 28 NONAME ; public: int __thiscall TApaTaskList::CycleTasks(class TUid,enum TApaTaskList::TCycleDirection)
-	?DocName@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 29 NONAME ; public: class TPtrC16  __thiscall CApaWindowGroupName::DocName(void)const 
-	?DocNameIsAFile@CApaWindowGroupName@@QBEHXZ @ 30 NONAME ; public: int __thiscall CApaWindowGroupName::DocNameIsAFile(void)const 
-	?DocumentL@CApaDoor@@QAEPAVCApaDocument@@H@Z @ 31 NONAME ; public: class CApaDocument * __thiscall CApaDoor::DocumentL(int)
-	?EmbeddableAppCount@RApaLsSession@@QBEHAAH@Z @ 32 NONAME ; public: int __thiscall RApaLsSession::EmbeddableAppCount(int &)const 
-	?EndTask@TApaTask@@QAEXXZ @ 33 NONAME ; public: void __thiscall TApaTask::EndTask(void)
-	?Exists@TApaTask@@QBEHXZ @ 34 NONAME ; public: int __thiscall TApaTask::Exists(void)const 
-	?ExternalizeL@CApaMaskedBitmap@@QBEXAAVRWriteStream@@@Z @ 35 NONAME ; public: void __thiscall CApaMaskedBitmap::ExternalizeL(class RWriteStream &)const 
-	?FindApp@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 36 NONAME ; public: class TApaTask  __thiscall TApaTaskList::FindApp(class TDesC16 const &)
-	?FindApp@TApaTaskList@@QAE?AVTApaTask@@VTUid@@@Z @ 37 NONAME ; public: class TApaTask  __thiscall TApaTaskList::FindApp(class TUid)
-	?FindByAppUid@CApaWindowGroupName@@SAXVTUid@@AAVRWsSession@@AAH@Z @ 38 NONAME ; public: static void __cdecl CApaWindowGroupName::FindByAppUid(class TUid,class RWsSession &,int &)
-	?FindByCaption@CApaWindowGroupName@@SAXABVTDesC16@@AAVRWsSession@@AAH@Z @ 39 NONAME ; public: static void __cdecl CApaWindowGroupName::FindByCaption(class TDesC16 const &,class RWsSession &,int &)
-	?FindByDocName@CApaWindowGroupName@@SAXABVTDesC16@@AAVRWsSession@@AAH@Z @ 40 NONAME ; public: static void __cdecl CApaWindowGroupName::FindByDocName(class TDesC16 const &,class RWsSession &,int &)
-	?FindByPos@TApaTaskList@@QAE?AVTApaTask@@H@Z @ 41 NONAME ; public: class TApaTask  __thiscall TApaTaskList::FindByPos(int)
-	?FindDoc@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 42 NONAME ; public: class TApaTask  __thiscall TApaTaskList::FindDoc(class TDesC16 const &)
-	?FirstApp@CApaAppList@@QBEPAVCApaAppData@@XZ @ 43 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::FirstApp(void)const 
-	?GetAllApps@RApaLsSession@@QBEHXZ @ 44 NONAME ; public: int __thiscall RApaLsSession::GetAllApps(void)const 
-	?GetAppCapability@RApaLsSession@@QBEHAAVTDes8@@VTUid@@@Z @ 45 NONAME ; public: int __thiscall RApaLsSession::GetAppCapability(class TDes8 &,class TUid)const 
-	?GetAppInfo@RApaLsSession@@QBEHAAVTApaAppInfo@@VTUid@@@Z @ 46 NONAME ; public: int __thiscall RApaLsSession::GetAppInfo(class TApaAppInfo &,class TUid)const 
-	?GetEmbeddableApps@RApaLsSession@@QBEHXZ @ 47 NONAME ; public: int __thiscall RApaLsSession::GetEmbeddableApps(void)const 
-	?GetNextApp@RApaLsSession@@QBEHAAVTApaAppInfo@@@Z @ 48 NONAME ; public: int __thiscall RApaLsSession::GetNextApp(class TApaAppInfo &)const 
-	?InternalizeL@CApaMaskedBitmap@@QAEXAAVRReadStream@@@Z @ 49 NONAME ; public: void __thiscall CApaMaskedBitmap::InternalizeL(class RReadStream &)
-	?IsBusy@CApaWindowGroupName@@QBEHXZ @ 50 NONAME ; public: int __thiscall CApaWindowGroupName::IsBusy(void)const 
-	?IsSystem@CApaWindowGroupName@@QBEHXZ @ 51 NONAME ; public: int __thiscall CApaWindowGroupName::IsSystem(void)const 
-	?KillTask@TApaTask@@QAEXXZ @ 52 NONAME ; public: void __thiscall TApaTask::KillTask(void)
-	?Mask@CApaMaskedBitmap@@QBEPAVCFbsBitmap@@XZ @ 53 NONAME ; public: class CFbsBitmap * __thiscall CApaMaskedBitmap::Mask(void)const 
-	?New@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@PAVHBufC16@@@Z @ 54 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::New(class RWsSession const &,class HBufC16 *)
-	?NewL@CApaAppInfoFileReader@@SAPAV1@AAVRFs@@ABVTDesC16@@VTUid@@@Z @ 55 NONAME ABSENT ; public: static class CApaAppInfoFileReader * __cdecl CApaAppInfoFileReader::NewL(class RFs &,class TDesC16 const &,class TUid)
-	?NewL@CApaAppList@@SAPAV1@AAVRFs@@PAVCApaAppRegFinder@@HH@Z @ 56 NONAME ABSENT ; class CApaAppList * CApaAppList::NewL(class RFs &, class CApaAppRegFinder *, int, int)
-	?NewL@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 57 NONAME ; public: static class CApaDoor * __cdecl CApaDoor::NewL(class RFs &,class CApaDocument &,class TSize const &)
-	?NewL@CApaDoor@@SAPAV1@AAVRFs@@ABVCStreamStore@@VTStreamId@@AAVCApaProcess@@@Z @ 58 NONAME ; public: static class CApaDoor * __cdecl CApaDoor::NewL(class RFs &,class CStreamStore const &,class TStreamId,class CApaProcess &)
-	?NewL@CApaMaskedBitmap@@SAPAV1@PBV1@@Z @ 59 NONAME ; class CApaMaskedBitmap * CApaMaskedBitmap::NewL(class CApaMaskedBitmap const *)
-	?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@@Z @ 60 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewL(class RWsSession const &)
-	?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@ABVTDesC16@@@Z @ 61 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewL(class RWsSession const &,class TDesC16 const &)
-	?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@H@Z @ 62 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewL(class RWsSession const &,int)
-	?NewLC@CApaAppInfoFileReader@@SAPAV1@AAVRFs@@ABVTDesC16@@VTUid@@@Z @ 63 NONAME ABSENT ; public: static class CApaAppInfoFileReader * __cdecl CApaAppInfoFileReader::NewLC(class RFs &,class TDesC16 const &,class TUid)
-	?NewLC@CApaAppInfoFileWriter@@SAPAV1@AAVRFs@@ABVTDesC16@@VTUid@@@Z @ 64 NONAME ABSENT ; public: static class CApaAppInfoFileWriter * __cdecl CApaAppInfoFileWriter::NewLC(class RFs &,class TDesC16 const &,class TUid)
-	?NewLC@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 65 NONAME ; public: static class CApaDoor * __cdecl CApaDoor::NewLC(class RFs &,class CApaDocument &,class TSize const &)
-	?NewLC@CApaMaskedBitmap@@SAPAV1@XZ @ 66 NONAME ; public: static class CApaMaskedBitmap * __cdecl CApaMaskedBitmap::NewLC(void)
-	?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@@Z @ 67 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewLC(class RWsSession const &)
-	?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@ABVTDesC16@@@Z @ 68 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewLC(class RWsSession const &,class TDesC16 const &)
-	?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@H@Z @ 69 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewLC(class RWsSession const &,int)
-	?NewPictureL@TApaPictureFactory@@UBEXAAVTPictureHeader@@ABVCStreamStore@@@Z @ 70 NONAME ; public: virtual void __thiscall TApaPictureFactory::NewPictureL(class TPictureHeader &,class CStreamStore const &)const 
-	?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@@Z @ 71 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::NextApp(class CApaAppData const *)const 
-	?PurgeL@CApaAppList@@QAEXXZ @ 72 NONAME ABSENT ; public: void __thiscall CApaAppList::PurgeL(void)
-	?RespondsToShutdownEvent@CApaWindowGroupName@@QBEHXZ @ 73 NONAME ; public: int __thiscall CApaWindowGroupName::RespondsToShutdownEvent(void)const 
-	?RespondsToSwitchFilesEvent@CApaWindowGroupName@@QBEHXZ @ 74 NONAME ; public: int __thiscall CApaWindowGroupName::RespondsToSwitchFilesEvent(void)const 
-	?RestoreL@CApaDoor@@QAEXABVCStreamStore@@VTStreamId@@@Z @ 75 NONAME ; public: void __thiscall CApaDoor::RestoreL(class CStreamStore const &,class TStreamId)
-	?SendKey@TApaTask@@QAEXABUTKeyEvent@@@Z @ 76 NONAME ; public: void __thiscall TApaTask::SendKey(struct TKeyEvent const &)
-	?SendKey@TApaTask@@QAEXHH@Z @ 77 NONAME ; public: void __thiscall TApaTask::SendKey(int,int)
-	?SendMessage@TApaTask@@QAEHVTUid@@ABVTDesC8@@@Z @ 78 NONAME ; public: int __thiscall TApaTask::SendMessage(class TUid,class TDesC8 const &)
-	?SendSystemEvent@TApaTask@@QAEXW4TApaSystemEvent@@@Z @ 79 NONAME ; public: void __thiscall TApaTask::SendSystemEvent(enum TApaSystemEvent)
-	?SendToBackground@TApaTask@@QAEXXZ @ 80 NONAME ; public: void __thiscall TApaTask::SendToBackground(void)
-	?SetAppUid@CApaWindowGroupName@@QAEXVTUid@@@Z @ 81 NONAME ; public: void __thiscall CApaWindowGroupName::SetAppUid(class TUid)
-	?SetBusy@CApaWindowGroupName@@QAEXH@Z @ 82 NONAME ; public: void __thiscall CApaWindowGroupName::SetBusy(int)
-	?SetCapability@CApaAppInfoFileWriter@@QAEHABVTDesC8@@@Z @ 83 NONAME ABSENT ; public: int __thiscall CApaAppInfoFileWriter::SetCapability(class TDesC8 const &)
-	?SetCaptionL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 84 NONAME ; public: void __thiscall CApaWindowGroupName::SetCaptionL(class TDesC16 const &)
-	?SetDocNameIsAFile@CApaWindowGroupName@@QAEXH@Z @ 85 NONAME ; public: void __thiscall CApaWindowGroupName::SetDocNameIsAFile(int)
-	?SetDocNameL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 86 NONAME ; public: void __thiscall CApaWindowGroupName::SetDocNameL(class TDesC16 const &)
-	?SetFormatToGlassL@CApaDoor@@QAEXXZ @ 87 NONAME ; public: void __thiscall CApaDoor::SetFormatToGlassL(void)
-	?SetFormatToIconL@CApaDoor@@QAEXXZ @ 88 NONAME ; public: void __thiscall CApaDoor::SetFormatToIconL(void)
-	?SetFormatToTemporaryIconL@CApaDoor@@QAEXH@Z @ 89 NONAME ; public: void __thiscall CApaDoor::SetFormatToTemporaryIconL(int)
-	?SetRespondsToShutdownEvent@CApaWindowGroupName@@QAEXH@Z @ 90 NONAME ; public: void __thiscall CApaWindowGroupName::SetRespondsToShutdownEvent(int)
-	?SetRespondsToSwitchFilesEvent@CApaWindowGroupName@@QAEXH@Z @ 91 NONAME ; public: void __thiscall CApaWindowGroupName::SetRespondsToSwitchFilesEvent(int)
-	?SetSystem@CApaWindowGroupName@@QAEXH@Z @ 92 NONAME ; public: void __thiscall CApaWindowGroupName::SetSystem(int)
-	?SetWgId@TApaTask@@QAEXH@Z @ 93 NONAME ; public: void __thiscall TApaTask::SetWgId(int)
-	?SetWindowGroupName@CApaWindowGroupName@@QAEXPAVHBufC16@@@Z @ 94 NONAME ; public: void __thiscall CApaWindowGroupName::SetWindowGroupName(class HBufC16 *)
-	?SetWindowGroupName@CApaWindowGroupName@@QBEHAAVRWindowGroup@@@Z @ 95 NONAME ; public: int __thiscall CApaWindowGroupName::SetWindowGroupName(class RWindowGroup &)const 
-	?SetWindowGroupNameL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 96 NONAME ; public: void __thiscall CApaWindowGroupName::SetWindowGroupNameL(class TDesC16 const &)
-	?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@@Z @ 97 NONAME ; public: int __thiscall RApaLsSession::StartApp(class CApaCommandLine const &)
-	?StoreL@CApaAppInfoFileWriter@@QAEXXZ @ 98 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::StoreL(void)
-	?StretchDrawL@CApaAppInfoFileReader@@SAXPAVCFbsBitmap@@0VTSize@@@Z @ 99 NONAME ABSENT ; public: static void __cdecl CApaAppInfoFileReader::StretchDrawL(class CFbsBitmap *,class CFbsBitmap *,class TSize)
-	?SwitchCreateFile@TApaTask@@QAEHABVTDesC16@@@Z @ 100 NONAME ; public: int __thiscall TApaTask::SwitchCreateFile(class TDesC16 const &)
-	?SwitchOpenFile@TApaTask@@QAEHABVTDesC16@@@Z @ 101 NONAME ; public: int __thiscall TApaTask::SwitchOpenFile(class TDesC16 const &)
-	?ThreadId@TApaTask@@QBE?AVTThreadId@@XZ @ 102 NONAME ; public: class TThreadId  __thiscall TApaTask::ThreadId(void)const 
-	?UpdateCounter@CApaAppList@@QBEHXZ @ 103 NONAME ABSENT ; public: int __thiscall CApaAppList::UpdateCounter(void)const 
-	?UpdateL@CApaAppList@@QAEXXZ @ 104 NONAME ABSENT ; public: void __thiscall CApaAppList::UpdateL(void)
-	?Version@RApaLsSession@@QBE?AVTVersion@@XZ @ 105 NONAME ; public: class TVersion  __thiscall RApaLsSession::Version(void)const 
-	?WgId@TApaTask@@QBEHXZ @ 106 NONAME ; public: int __thiscall TApaTask::WgId(void)const 
-	?WindowGroupName@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 107 NONAME ; public: class TPtrC16  __thiscall CApaWindowGroupName::WindowGroupName(void)const 
-	??1CApaSystemControlList@@UAE@XZ @ 108 NONAME ; public: virtual __thiscall CApaSystemControlList::~CApaSystemControlList(void)
-	?Caption@CApaSystemControl@@QBE?AVTPtrC16@@XZ @ 109 NONAME ; public: class TPtrC16  __thiscall CApaSystemControl::Caption(void)const 
-	?Control@CApaSystemControlList@@QBEPAVCApaSystemControl@@H@Z @ 110 NONAME ; public: class CApaSystemControl * __thiscall CApaSystemControlList::Control(int)const 
-	?Control@CApaSystemControlList@@QBEPAVCApaSystemControl@@VTUid@@@Z @ 111 NONAME ; public: class CApaSystemControl * __thiscall CApaSystemControlList::Control(class TUid)const 
-	?Count@CApaSystemControlList@@QBEHXZ @ 112 NONAME ; public: int __thiscall CApaSystemControlList::Count(void)const 
-	?CreateL@CApaSystemControl@@QAEXXZ @ 113 NONAME ; public: void __thiscall CApaSystemControl::CreateL(void)
-	?FileName@CApaSystemControl@@QBE?AV?$TBuf@$0BAA@@@XZ @ 114 NONAME ; public: class TBuf<256>  __thiscall CApaSystemControl::FileName(void)const 
-	?Icon@CApaSystemControl@@QBEPAVCApaMaskedBitmap@@XZ @ 115 NONAME ; public: class CApaMaskedBitmap * __thiscall CApaSystemControl::Icon(void)const 
-	?Index@CApaSystemControlList@@QBEHVTUid@@@Z @ 116 NONAME ; public: int __thiscall CApaSystemControlList::Index(class TUid)const 
-	?NewL@CApaSystemControlList@@SAPAV1@AAVRFs@@AAVCApaAppFinder@@ABVTDesC16@@@Z @ 117 NONAME ABSENT ; public: static class CApaSystemControlList * __cdecl CApaSystemControlList::NewL(class RFs &,class CApaAppFinder &,class TDesC16 const &)
-	?Type@CApaSystemControl@@QBE?AVTUid@@XZ @ 118 NONAME ; public: class TUid  __thiscall CApaSystemControl::Type(void)const 
-	?UpdateL@CApaSystemControlList@@QAEXXZ @ 119 NONAME ; public: void __thiscall CApaSystemControlList::UpdateL(void)
-	?AddDataTypeL@CApaAppInfoFileWriter@@QAEXABVTDataTypeWithPriority@@@Z @ 120 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddDataTypeL(class TDataTypeWithPriority const &)
-	?AppForDataType@RApaLsSession@@QBEHABVTDataType@@AAVTUid@@@Z @ 121 NONAME ; public: int __thiscall RApaLsSession::AppForDataType(class TDataType const &,class TUid &)const 
-	?AppForDocument@RApaLsSession@@QBEHABVTDesC16@@AAVTUid@@AAVTDataType@@@Z @ 122 NONAME ; public: int __thiscall RApaLsSession::AppForDocument(class TDesC16 const &,class TUid &,class TDataType &)const 
-	?CreateDocument@RApaLsSession@@QAEHABVTDesC16@@VTUid@@AAVTThreadId@@W4TLaunchType@1@@Z @ 123 NONAME ; public: int __thiscall RApaLsSession::CreateDocument(class TDesC16 const &,class TUid,class TThreadId &,enum RApaLsSession::TLaunchType)
-	?DataType@CApaAppData@@QBEJABVTDataType@@@Z @ 124 NONAME ABSENT ; long CApaAppData::DataType(class TDataType const &) const
-	?DataTypesSupportedL@CApaAppInfoFileReader@@QBEXAAV?$CArrayFix@VTDataTypeWithPriority@@@@@Z @ 125 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileReader::DataTypesSupportedL(class CArrayFix<class TDataTypeWithPriority> &)const 
-	?GetAcceptedConfidence@RApaLsSession@@QBEHAAH@Z @ 126 NONAME ; public: int __thiscall RApaLsSession::GetAcceptedConfidence(int &)const 
-	?GetAppIcon@RApaLsSession@@QBEHVTUid@@HAAVCApaMaskedBitmap@@@Z @ 127 NONAME ; public: int __thiscall RApaLsSession::GetAppIcon(class TUid,int,class CApaMaskedBitmap &)const 
-	?GetMaxDataBufSize@RApaLsSession@@QBEHAAH@Z @ 128 NONAME ; public: int __thiscall RApaLsSession::GetMaxDataBufSize(int &)const 
-	?GetSupportedDataTypesL@RApaLsSession@@QBEHAAV?$CArrayFixFlat@VTDataType@@@@@Z @ 129 NONAME ; public: int __thiscall RApaLsSession::GetSupportedDataTypesL(class CArrayFixFlat<class TDataType> &)const 
-	?IsProgram@RApaLsSession@@QBEHABVTDesC16@@AAH@Z @ 130 NONAME ; public: int __thiscall RApaLsSession::IsProgram(class TDesC16 const &,int &)const 
-	?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@@Z @ 131 NONAME ABSENT ; public: class TUid  __thiscall CApaAppList::PreferredDataHandlerL(class TDataType const &)const 
-	?RecognizeData@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@AAVTDataRecognitionResult@@@Z @ 132 NONAME ; public: int __thiscall RApaLsSession::RecognizeData(class TDesC16 const &,class TDesC8 const &,class TDataRecognitionResult &)const 
-	?RecognizeSpecificData@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@ABVTDataType@@AAH@Z @ 133 NONAME ; public: int __thiscall RApaLsSession::RecognizeSpecificData(class TDesC16 const &,class TDesC8 const &,class TDataType const &,int &)const 
-	?SetAcceptedConfidence@RApaLsSession@@QAEHH@Z @ 134 NONAME ; public: int __thiscall RApaLsSession::SetAcceptedConfidence(int)
-	?SetMaxDataBufSize@RApaLsSession@@QAEHH@Z @ 135 NONAME ; public: int __thiscall RApaLsSession::SetMaxDataBufSize(int)
-	?StartDocument@RApaLsSession@@QAEHABVTDesC16@@AAVTThreadId@@W4TLaunchType@1@@Z @ 136 NONAME ; public: int __thiscall RApaLsSession::StartDocument(class TDesC16 const &,class TThreadId &,enum RApaLsSession::TLaunchType)
-	?StartDocument@RApaLsSession@@QAEHABVTDesC16@@ABVTDataType@@AAVTThreadId@@W4TLaunchType@1@@Z @ 137 NONAME ; public: int __thiscall RApaLsSession::StartDocument(class TDesC16 const &,class TDataType const &,class TThreadId &,enum RApaLsSession::TLaunchType)
-	?StartDocument@RApaLsSession@@QAEHABVTDesC16@@VTUid@@AAVTThreadId@@W4TLaunchType@1@@Z @ 138 NONAME ; public: int __thiscall RApaLsSession::StartDocument(class TDesC16 const &,class TUid,class TThreadId &,enum RApaLsSession::TLaunchType)
-	?StartIdleUpdateL@CApaAppList@@QAEXXZ @ 139 NONAME ABSENT ; public: void __thiscall CApaAppList::StartIdleUpdateL(void)
-	??1CApaAppListNotifier@@UAE@XZ @ 140 NONAME ; public: virtual __thiscall CApaAppListNotifier::~CApaAppListNotifier(void)
-	?NewL@CApaAppListNotifier@@SAPAV1@PAVMApaAppListServObserver@@W4TPriority@CActive@@@Z @ 141 NONAME ; public: static class CApaAppListNotifier * __cdecl CApaAppListNotifier::NewL(class MApaAppListServObserver *,enum CActive::TPriority)
-	?StartIdleUpdateL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 142 NONAME ABSENT ; public: void __thiscall CApaAppList::StartIdleUpdateL(class MApaAppListObserver *)
-	?GetAppIcon@RApaLsSession@@QBEHVTUid@@VTSize@@AAVCApaMaskedBitmap@@@Z @ 143 NONAME ; public: int __thiscall RApaLsSession::GetAppIcon(class TUid,class TSize,class CApaMaskedBitmap &)const 
-	?GetAppIconSizes@RApaLsSession@@QBEHVTUid@@AAV?$CArrayFixFlat@VTSize@@@@@Z @ 144 NONAME ; public: int __thiscall RApaLsSession::GetAppIconSizes(class TUid,class CArrayFixFlat<class TSize> &)const 
-	?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@VTSize@@@Z @ 145 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAppData::Icon(class TSize)const 
-	?IconSizesL@CApaAppData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 146 NONAME ABSENT ; public: class CArrayFixFlat<class TSize> * __thiscall CApaAppData::IconSizesL(void)const 
-	?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@H@Z @ 147 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAppData::Icon(int)const 
-	?Hidden@CApaWindowGroupName@@QBEHXZ @ 148 NONAME ; int CApaWindowGroupName::Hidden(void) const
-	?SetHidden@CApaWindowGroupName@@QAEXH@Z @ 149 NONAME ; public: void __thiscall CApaWindowGroupName::SetHidden(int)
-	?AddViewCaptionL@CApaAppInfoFileWriter@@QAEXW4TLanguage@@ABVTDesC16@@VTUid@@@Z @ 150 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddViewCaptionL(enum TLanguage,class TDesC16 const &,class TUid)
-	?AddViewIconL@CApaAppInfoFileWriter@@QAEXAAVCApaMaskedBitmap@@VTUid@@@Z @ 151 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddViewIconL(class CApaMaskedBitmap &,class TUid)
-	?AddViewL@CApaAppInfoFileWriter@@QAEXVTUid@@@Z @ 152 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddViewL(class TUid)
-	?CaptionL@CApaAIFViewData@@QBE?AV?$TBuf@$0BAA@@@W4TLanguage@@@Z @ 153 NONAME ABSENT ; public: class TBuf<256>  __thiscall CApaAIFViewData::CaptionL(enum TLanguage)const 
-	?GetAppViewIcon@RApaLsSession@@QBEHVTUid@@0ABVTSize@@AAVCApaMaskedBitmap@@@Z @ 154 NONAME ; public: int __thiscall RApaLsSession::GetAppViewIcon(class TUid,class TUid,class TSize const &,class CApaMaskedBitmap &)const 
-	?GetAppViews@RApaLsSession@@QBEHAAV?$CArrayFixFlat@VTApaAppViewInfo@@@@VTUid@@@Z @ 155 NONAME ; public: int __thiscall RApaLsSession::GetAppViews(class CArrayFixFlat<class TApaAppViewInfo> &,class TUid)const 
-	?GetViewsL@CApaAppInfoFileReader@@QBEXAAV?$CArrayPtr@VCApaAIFViewData@@@@@Z @ 156 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileReader::GetViewsL(class CArrayPtr<class CApaAIFViewData> &)const 
-	?Icon@CApaAppViewData@@QBEPAVCApaMaskedBitmap@@ABVTSize@@@Z @ 157 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAppViewData::Icon(class TSize const &)const 
-	?IconByIndexL@CApaAIFViewData@@QBEPAVCApaMaskedBitmap@@H@Z @ 158 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAIFViewData::IconByIndexL(int)const 
-	?IconSizesL@CApaAppViewData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 159 NONAME ABSENT ; public: class CArrayFixFlat<class TSize> * __thiscall CApaAppViewData::IconSizesL(void)const 
-	?NumberOfIcons@CApaAIFViewData@@QBEHXZ @ 160 NONAME ABSENT ; public: int __thiscall CApaAIFViewData::NumberOfIcons(void)const 
-	?StoreViewL@CApaAppInfoFileWriter@@QAEXVTUid@@@Z @ 161 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::StoreViewL(class TUid)
-	?Uid@CApaAppViewData@@QBE?AVTUid@@XZ @ 162 NONAME ABSENT ; public: class TUid  __thiscall CApaAppViewData::Uid(void)const 
-	?ViewUid@CApaAIFViewData@@QBE?AVTUid@@XZ @ 163 NONAME ABSENT ; public: class TUid  __thiscall CApaAIFViewData::ViewUid(void)const 
-	?Views@CApaAppData@@QBEPAV?$CArrayPtrFlat@VCApaAppViewData@@@@XZ @ 164 NONAME ABSENT ; public: class CArrayPtrFlat<class CApaAppViewData> * __thiscall CApaAppData::Views(void)const 
-	?AddOwnedFileL@CApaAppInfoFileWriter@@QAEXABVTDesC16@@@Z @ 165 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddOwnedFileL(class TDesC16 const &)
-	?GetOwnedFilesL@CApaAppInfoFileReader@@QBEXAAVCDesC16Array@@@Z @ 166 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileReader::GetOwnedFilesL(class CDesC16Array &)const 
-	?OwnedFiles@CApaAppData@@QBEPAVCDesC16Array@@XZ @ 167 NONAME ABSENT ; public: class CDesC16Array * __thiscall CApaAppData::OwnedFiles(void)const 
-	?GetAppOwnedFiles@RApaLsSession@@QBEHAAVCDesC16Array@@VTUid@@@Z @ 168 NONAME ; public: int __thiscall RApaLsSession::GetAppOwnedFiles(class CDesC16Array &,class TUid)const 
-	?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@AAVTThreadId@@@Z @ 169 NONAME ; public: int __thiscall RApaLsSession::StartApp(class CApaCommandLine const &,class TThreadId &)
-	?GetAifFileName@AppInfoFileUtils@@SAXABVRFs@@AAVTDes16@@@Z @ 170 NONAME ABSENT ; public: static void __cdecl AppInfoFileUtils::GetAifFileName(class RFs const &,class TDes16 &)
-	?AddViewL@CApaAppInfoFileWriter@@QAEXVTUid@@H@Z @ 171 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddViewL(class TUid,int)
-	?CanUseScreenMode@CApaAppData@@QAEHH@Z @ 172 NONAME ABSENT ; public: int __thiscall CApaAppData::CanUseScreenMode(int)
-	?FirstApp@CApaAppList@@QBEPAVCApaAppData@@H@Z @ 173 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::FirstApp(int)const 
-	?GetAllApps@RApaLsSession@@QBEHH@Z @ 174 NONAME ; public: int __thiscall RApaLsSession::GetAllApps(int)const 
-	?GetEmbeddableApps@RApaLsSession@@QBEHH@Z @ 175 NONAME ; public: int __thiscall RApaLsSession::GetEmbeddableApps(int)const 
-	?GetNextApp@RApaLsSession@@QBEHAAVTApaAppInfo@@H@Z @ 176 NONAME ; public: int __thiscall RApaLsSession::GetNextApp(class TApaAppInfo &,int)const 
-	?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@H@Z @ 177 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::NextApp(class CApaAppData const *,int)const 
-	?ScreenMode@CApaAIFViewData@@QBEHXZ @ 178 NONAME ABSENT ; public: int __thiscall CApaAIFViewData::ScreenMode(void)const 
-	?ScreenMode@CApaAppViewData@@QBEHXZ @ 179 NONAME ABSENT ; public: int __thiscall CApaAppViewData::ScreenMode(void)const 
-	?ShortCaption@CApaSystemControl@@QBE?AVTPtrC16@@XZ @ 180 NONAME ; public: class TPtrC16  __thiscall CApaSystemControl::ShortCaption(void)const 
-	?IsIdleUpdateComplete@CApaAppList@@QBEHXZ @ 181 NONAME ABSENT ; public: int __thiscall CApaAppList::IsIdleUpdateComplete(void)const 
-	?IsAppReady@CApaWindowGroupName@@QBEHXZ @ 182 NONAME ; public: int __thiscall CApaWindowGroupName::IsAppReady(void)const 
-	?SetAppReady@CApaWindowGroupName@@QAEXH@Z @ 183 NONAME ; public: void __thiscall CApaWindowGroupName::SetAppReady(int)
-	?InitListL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 184 NONAME ABSENT ; public: void __thiscall CApaAppList::InitListL(class MApaAppListObserver *)
-	?NumberOfBitmaps@CApaAppInfoFileReader@@QBEHXZ @ 185 NONAME ABSENT ; public: int __thiscall CApaAppInfoFileReader::NumberOfBitmaps(void)const 
-	?IsFirstScanComplete@CApaAppList@@QBEHXZ @ 186 NONAME ABSENT ; public: int __thiscall CApaAppList::IsFirstScanComplete(void)const 
-	?SetMaskBitmap@CApaMaskedBitmap@@QAEXPAVCFbsBitmap@@@Z @ 187 NONAME ; public: void __thiscall CApaMaskedBitmap::SetMaskBitmap(class CFbsBitmap *)
-	?GetAppInfo_7_0@RApaLsSession@@ABEHAAVTApaAppInfo_7_0@@VTUid@@@Z @ 188 NONAME ABSENT ; int RApaLsSession::GetAppInfo_7_0(class TApaAppInfo_7_0 &, class TUid) const
-	?GetNextApp_7_0@RApaLsSession@@ABEHAAVTApaAppInfo_7_0@@@Z @ 189 NONAME ABSENT ; int RApaLsSession::GetNextApp_7_0(class TApaAppInfo_7_0 &) const
-	?GetNextApp_7_0@RApaLsSession@@ABEHAAVTApaAppInfo_7_0@@H@Z @ 190 NONAME ABSENT ; int RApaLsSession::GetNextApp_7_0(class TApaAppInfo_7_0 &, int) const
-	?GetIconInfo@CApaAppData@@QBEXAAH0@Z @ 191 NONAME ABSENT ; void CApaAppData::GetIconInfo(int &, int &) const
-	?NumberOfOwnDefinedIcons@RApaLsSession@@QBEHVTUid@@AAH@Z @ 192 NONAME ; public: int __thiscall RApaLsSession::NumberOfOwnDefinedIcons(class TUid,int &)const 
-	?GetFilteredApps@RApaLsSession@@QBEHABVTApaEmbeddabilityFilter@@@Z @ 193 NONAME ; public: int __thiscall RApaLsSession::GetFilteredApps(class TApaEmbeddabilityFilter const &)const 
-	?GetFilteredApps@RApaLsSession@@QBEHABVTApaEmbeddabilityFilter@@H@Z @ 194 NONAME ; public: int __thiscall RApaLsSession::GetFilteredApps(class TApaEmbeddabilityFilter const &,int)const 
-	?NewL@CApaAppList@@SAPAV1@AAVRFs@@PAVCApaAppFinder@@PAVCApaAppRegFinder@@H@Z @ 195 NONAME ABSENT ; class CApaAppList * CApaAppList::NewL(class RFs &, class CApaAppFinder *, class CApaAppRegFinder *, int)	
-	?DefaultScreenNumber@CApaAppData@@QBEIXZ @ 196 NONAME ABSENT ; unsigned int CApaAppData::DefaultScreenNumber(void) const
-	?GetFilteredApps@RApaLsSession@@QBEHII@Z @ 197 NONAME ; int RApaLsSession::GetFilteredApps(unsigned int, unsigned int) const
-	?GetFilteredApps@RApaLsSession@@QBEHIIH@Z @ 198 NONAME ; int RApaLsSession::GetFilteredApps(unsigned int, unsigned int, int) const
-	?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 199 NONAME ABSENT ; int CApaAppData::RegistrationFileUsed(void) const
-	?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAPAVHBufC16@@@Z @ 200 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class HBufC16 * &) const
-	?IconFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 201 NONAME ABSENT ; class TPtrC16 CApaAppData::IconFileName(void) const
-	?GetAppViewIcon@RApaLsSession@@QBEHVTUid@@0AAPAVHBufC16@@@Z @ 202 NONAME ; int RApaLsSession::GetAppViewIcon(class TUid, class TUid, class HBufC16 * &) const
-	?IconFileName@CApaAppViewData@@QBE?AVTPtrC16@@XZ @ 203 NONAME ABSENT ; class TPtrC16 CApaAppViewData::IconFileName(void) const
-	?NonMbmIconFile@CApaAppData@@QBEHXZ @ 204 NONAME ABSENT ; int CApaAppData::NonMbmIconFile(void) const
-	?NonMbmIconFile@CApaAppViewData@@QBEHXZ @ 205 NONAME ABSENT ; int CApaAppViewData::NonMbmIconFile(void) const
-	?StartupApaServer@@YAHAAVMApaAppStarter@@@Z @ 206 NONAME ABSENT ; int StartupApaServer(class MApaAppStarter &)
-	?StartupApaServerProcess@@YAHXZ @ 207 NONAME ; int StartupApaServerProcess(void)
-	?DeleteDataMapping@RApaLsSession@@QAEHABVTDataType@@@Z @ 208 NONAME ; int RApaLsSession::DeleteDataMapping(class TDataType const &)
-	?InsertDataMapping@RApaLsSession@@QAEHABVTDataType@@JVTUid@@@Z @ 209 NONAME ; int RApaLsSession::InsertDataMapping(class TDataType const &, long, class TUid)
-	?InsertDataMappingIfHigher@RApaLsSession@@QAEHABVTDataType@@JVTUid@@AAH@Z @ 210 NONAME ; int RApaLsSession::InsertDataMappingIfHigher(class TDataType const &, long, class TUid, int &)
-	?ApplicationLanguage@CApaAppData@@QBE?AW4TLanguage@@XZ @ 211 NONAME ABSENT ; enum TLanguage CApaAppData::ApplicationLanguage(void) const
-	?ApplicationLanguage@RApaLsSession@@QBEHVTUid@@AAW4TLanguage@@@Z @ 212 NONAME ; int RApaLsSession::ApplicationLanguage(class TUid, enum TLanguage &) const
-	?NewL@CApaSystemControlList@@SAPAV1@AAVRFs@@@Z @ 213 NONAME ; class CApaSystemControlList * CApaSystemControlList::NewL(class RFs &)
-	?AppForDataTypeAndService@RApaLsSession@@QBEHABVTDataType@@VTUid@@AAV3@@Z @ 214 NONAME ; int RApaLsSession::AppForDataTypeAndService(class TDataType const &, class TUid, class TUid &) const
-	?AppForDocumentAndService@RApaLsSession@@QBEHABVRFile@@VTUid@@AAV3@AAVTDataType@@@Z @ 215 NONAME ; int RApaLsSession::AppForDocumentAndService(class RFile const &, class TUid, class TUid &, class TDataType &) const
-	?AppForDocumentAndService@RApaLsSession@@QBEHABVTDesC16@@VTUid@@AAV3@AAVTDataType@@@Z @ 216 NONAME ; int RApaLsSession::AppForDocumentAndService(class TDesC16 const &, class TUid, class TUid &, class TDataType &) const
-	?GetAppServiceOpaqueDataLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@0@Z @ 217 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetAppServiceOpaqueDataLC(class TUid, class TUid) const
-	?GetAppServicesL@RApaLsSession@@QBEXVTUid@@AAV?$CArrayFixFlat@VTUid@@@@@Z @ 218 NONAME ; void RApaLsSession::GetAppServicesL(class TUid, class CArrayFixFlat<class TUid> &) const
-	?GetAppServicesLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@@Z @ 219 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetAppServicesLC(class TUid) const
-	?GetServerApps@RApaLsSession@@QBEHVTUid@@@Z @ 220 NONAME ; int RApaLsSession::GetServerApps(class TUid) const
-	?GetServerApps@RApaLsSession@@QBEHVTUid@@H@Z @ 221 NONAME ; int RApaLsSession::GetServerApps(class TUid, int) const
-	?GetServiceImplementationsLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@@Z @ 222 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetServiceImplementationsLC(class TUid) const
-	?ImplementsService@CApaAppData@@QBEHVTUid@@@Z @ 223 NONAME ABSENT ; int CApaAppData::ImplementsService(class TUid) const
-	?OpaqueData@TApaAppServiceInfo@@QBEABVTDesC8@@XZ @ 224 NONAME ABSENT ; class TDesC8 const & TApaAppServiceInfo::OpaqueData(void) const
-	?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@PBV2@AAH@Z @ 225 NONAME ABSENT ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &, class TUid const *, int &) const
-	?ServiceArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 226 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceArrayBufferL(class TUid) const
-	?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 227 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid) const
-	?ServiceOpaqueDataBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@0@Z @ 228 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceOpaqueDataBufferL(class TUid, class TUid) const
-	?ServiceUidBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 229 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceUidBufferL(class TUid) const
-	?Uid@TApaAppServiceInfo@@QBE?AVTUid@@XZ @ 230 NONAME ABSENT ; class TUid TApaAppServiceInfo::Uid(void) const
-	?StartDocument@RApaLsSession@@QAEHAAVRFile@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 231 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TThreadId &, class TRequestStatus *)
-	?CreateMaskedBitmapByIndexLC@CApaAppInfoFileReader@@QAEPAVCApaMaskedBitmap@@H@Z @ 232 NONAME ABSENT ; class CApaMaskedBitmap * CApaAppInfoFileReader::CreateMaskedBitmapByIndexLC(int)
-	?CancelListPopulationCompleteObserver@RApaLsSession@@QBEHXZ @ 233 NONAME ; int RApaLsSession::CancelListPopulationCompleteObserver(void) const
-	?RegisterListPopulationCompleteObserver@RApaLsSession@@QBEXAAVTRequestStatus@@@Z @ 234 NONAME ; void RApaLsSession::RegisterListPopulationCompleteObserver(class TRequestStatus &) const
-	?NewInterimFormatFileWriterLC@ForJavaMIDletInstaller@@SAPAVCApaAppInfoFileWriter@@AAVRFs@@ABVTDesC16@@VTUid@@KH@Z @ 235 NONAME ABSENT ; class CApaAppInfoFileWriter * ForJavaMIDletInstaller::NewInterimFormatFileWriterLC(class RFs &, class TDesC16 const &, class TUid, unsigned long, int)
-	?CheckInterimFormatFileNotCorruptL@ForJavaMIDletInstaller@@SAXAAVRFile@@@Z @ 236 NONAME ABSENT ; void ForJavaMIDletInstaller::CheckInterimFormatFileNotCorruptL(class RFile &)
-	?RegisterJavaMIDletViaIterimFormat@RApaLsSession@@QAEHABVTDesC16@@AAVRFile@@@Z @ 237 NONAME ABSENT ; int RApaLsSession::RegisterJavaMIDletViaIterimFormat(class TDesC16 const &, class RFile &)
-	?DeregisterJavaMIDlet@RApaLsSession@@QAEHABVTDesC16@@@Z @ 238 NONAME ABSENT ; int RApaLsSession::DeregisterJavaMIDlet(class TDesC16 const &)
-	?AppForDocument@RApaLsSession@@QBEHABVRFile@@AAVTUid@@AAVTDataType@@@Z @ 239 NONAME ; int RApaLsSession::AppForDocument(class RFile const &, class TUid &, class TDataType &) const
-	?ClearFsSession@RApaLsSession@@SAXXZ @ 240 NONAME ; void RApaLsSession::ClearFsSession(void)
-	?FsSession@RApaLsSession@@SAPAVRFs@@XZ @ 241 NONAME ; class RFs * RApaLsSession::FsSession(void)
-	?RecognizeData@RApaLsSession@@QBEHABVRFile@@AAVTDataRecognitionResult@@@Z @ 242 NONAME ; int RApaLsSession::RecognizeData(class RFile const &, class TDataRecognitionResult &) const	
-	?RecognizeSpecificData@RApaLsSession@@QBEHABVRFile@@ABVTDataType@@AAH@Z @ 243 NONAME ; int RApaLsSession::RecognizeSpecificData(class RFile const &, class TDataType const &, int &) const
-	?SetFsSessionL@RApaLsSession@@SAXAAVRFs@@@Z @ 244 NONAME ; void RApaLsSession::SetFsSessionL(class RFs &)
-	?StartDocument@RApaLsSession@@QAEHAAVRFile@@ABVTDataType@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 245 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TDataType const &, class TThreadId &, class TRequestStatus *)
-	?StartDocument@RApaLsSession@@QAEHAAVRFile@@VTUid@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 246 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TUid, class TThreadId &, class TRequestStatus *)
-	?GetPreferredBufSize@RApaLsSession@@QBEHAAH@Z @ 247 NONAME ; public: int __thiscall RApaLsSession::GetPreferredBufSize(int &)const 
-	?GetJavaMIDletInfoL@ForJavaMIDletInstaller@@SAXAAVRFs@@ABVTDesC16@@AAK2@Z @ 248 NONAME ABSENT ; void ForJavaMIDletInstaller::GetJavaMIDletInfoL(class RFs &, class TDesC16 const &, unsigned long &, unsigned long &)
-	?HandleAsRegistrationFile@ApaUtils@@SAHABVTUidType@@@Z @ 249 NONAME ABSENT ; int ApaUtils::HandleAsRegistrationFile(class TUidType const &)
-	?DataTypes@TApaAppServiceInfo@@QBEABV?$CArrayFixFlat@VTDataTypeWithPriority@@@@XZ @ 250 NONAME ABSENT ; class CArrayFixFlat<class TDataTypeWithPriority> const & TApaAppServiceInfo::DataTypes(void) const
-	?GetServiceImplementationsLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@ABVTDataType@@@Z @ 251 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetServiceImplementationsLC(class TUid, class TDataType const &) const
-	?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@ABVTDataType@@@Z @ 252 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid, class TDataType const &) const
-	?Close@RApaLsSession@@QAEXXZ @ 253 NONAME ; void RApaLsSession::Close(void)
-	??0MApaAppListServObserver@@IAE@XZ @ 254 NONAME ; MApaAppListServObserver::MApaAppListServObserver(void)
-	??0TApaPictureFactory@@IAE@XZ @ 255 NONAME ; TApaPictureFactory::TApaPictureFactory(void)
-	?MApaAppListServObserver_Reserved1@MApaAppListServObserver@@EAEXXZ @ 256 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved1(void)
-	?MApaAppListServObserver_Reserved2@MApaAppListServObserver@@EAEXXZ @ 257 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved2(void)
-	?RApaLsSession_Reserved1@RApaLsSession@@EAEXXZ @ 258 NONAME ; void RApaLsSession::RApaLsSession_Reserved1(void)
-	?RApaLsSession_Reserved2@RApaLsSession@@EAEXXZ @ 259 NONAME ; void RApaLsSession::RApaLsSession_Reserved2(void)
-	??0CDataRecognitionResultArray@@QAE@XZ @ 260 NONAME ; CDataRecognitionResultArray::CDataRecognitionResultArray(void)
-	??1CDataRecognitionResultArray@@UAE@XZ @ 261 NONAME ; CDataRecognitionResultArray::~CDataRecognitionResultArray(void)
-	?CancelRecognizeFiles@RApaLsSession@@QAEXXZ @ 262 NONAME ; void RApaLsSession::CancelRecognizeFiles(void)
-	?Count@CDataRecognitionResultArray@@QBEIXZ @ 263 NONAME ; unsigned int CDataRecognitionResultArray::Count(void) const
-	?GetDataRecognitionResultL@CDataRecognitionResultArray@@QBEXAAVTDataRecognitionResult@@I@Z @ 264 NONAME ; void CDataRecognitionResultArray::GetDataRecognitionResultL(class TDataRecognitionResult &, unsigned int) const
-	?GetFileNameL@CDataRecognitionResultArray@@QBEXAAV?$TBuf@$0BAA@@@I@Z @ 265 NONAME ; void CDataRecognitionResultArray::GetFileNameL(class TBuf<256> &, unsigned int) const
-	?Path@CDataRecognitionResultArray@@QBEABV?$TBuf@$0BAA@@@XZ @ 266 NONAME ; class TBuf<256> const & CDataRecognitionResultArray::Path(void) const
-	?RecognizeFilesL@RApaLsSession@@QBEHABVTDesC16@@AAVCDataRecognitionResultArray@@@Z @ 267 NONAME ; int RApaLsSession::RecognizeFilesL(class TDesC16 const &, class CDataRecognitionResultArray &) const
-	?RecognizeFilesL@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@AAVCDataRecognitionResultArray@@@Z @ 268 NONAME ; int RApaLsSession::RecognizeFilesL(class TDesC16 const &, class TDesC8 const &, class CDataRecognitionResultArray &) const
-	?RecognizeFilesL@RApaLsSession@@QAEXABVTDesC16@@AAVCDataRecognitionResultArray@@AAVTRequestStatus@@@Z @ 269 NONAME ; void RApaLsSession::RecognizeFilesL(class TDesC16 const &, class CDataRecognitionResultArray &, class TRequestStatus &)
-	?RecognizeFilesL@RApaLsSession@@QAEXABVTDesC16@@ABVTDesC8@@AAVCDataRecognitionResultArray@@AAVTRequestStatus@@@Z @ 270 NONAME ; void RApaLsSession::RecognizeFilesL(class TDesC16 const &, class TDesC8 const &, class CDataRecognitionResultArray &, class TRequestStatus &)
-	?InsertDataMapping@RApaLsSession@@QAEHABVTDataType@@JVTUid@@1@Z @ 271 NONAME ; int RApaLsSession::InsertDataMapping(class TDataType const &, long, class TUid, class TUid)
-	?DeleteDataMapping@RApaLsSession@@QAEHABVTDataType@@VTUid@@@Z @ 272 NONAME ; int RApaLsSession::DeleteDataMapping(class TDataType const &, class TUid)
-	?GetAppByDataType@RApaLsSession@@QBEHABVTDataType@@VTUid@@AAV3@@Z @ 273 NONAME ; int RApaLsSession::GetAppByDataType(class TDataType const &, class TUid, class TUid &) const
-	?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 274 NONAME ; int RApaLsSession::StartApp(class CApaCommandLine const &, class TThreadId &, class TRequestStatus *)
-	?RegisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@ABVTDesC16@@@Z @ 275 NONAME ; void RApaLsSession::RegisterNonNativeApplicationTypeL(class TUid, class TDesC16 const &)
-	?DeregisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@@Z @ 276 NONAME ; void RApaLsSession::DeregisterNonNativeApplicationTypeL(class TUid)
-	?RegisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@ABVTDriveUnit@@AAVCApaRegistrationResourceFileWriter@@PAVCApaLocalisableResourceFileWriter@@PBVRFile@@@Z @ 277 NONAME ; void RApaLsSession::RegisterNonNativeApplicationL(class TUid, class TDriveUnit const &, class CApaRegistrationResourceFileWriter &, class CApaLocalisableResourceFileWriter *, class RFile const *)
-	?DeregisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@@Z @ 278 NONAME ; void RApaLsSession::DeregisterNonNativeApplicationL(class TUid)
-	?AppDataByFileName@CApaAppList@@QBEPAVCApaAppData@@ABVTDesC16@@@Z @ 279 NONAME ABSENT ; class CApaAppData* CApaAppList::AppDataByFileName(class TDesC16 const &) const
-	?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 280 NONAME ABSENT ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const
-	?OpaqueData@CApaAppData@@QBE?AVTPtrC8@@XZ @ 281 NONAME ABSENT ; class TPtrC8 CApaAppData::OpaqueData(void) const
-	?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 282 NONAME ABSENT ; class TPtrC16 CApaAppData::RegistrationFileName(void) const
-	?GetDefaultScreenNumber@RApaLsSession@@QBEHAAHVTUid@@@Z @ 283 NONAME ; int RApaLsSession::GetDefaultScreenNumber(int &, class TUid) const
-	?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 284 NONAME ABSENT ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid)
-	?MatchesSecurityPolicy@RApaLsSession@@QBEHAAHVTUid@@ABVTSecurityPolicy@@@Z @ 285 NONAME ; int RApaLsSession::MatchesSecurityPolicy(int &, class TUid, class TSecurityPolicy const &) const
-	?AddDataTypeL@CApaRegistrationResourceFileWriter@@QAEXHABVTDesC8@@@Z @ 286 NONAME ; void CApaRegistrationResourceFileWriter::AddDataTypeL(int, class TDesC8 const &)
-	?AddFileOwnershipInfoL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC16@@@Z @ 287 NONAME ; void CApaRegistrationResourceFileWriter::AddFileOwnershipInfoL(class TDesC16 const &)
-	?NewL@CApaLocalisableResourceFileWriter@@SAPAV1@ABVTDesC16@@0H0@Z @ 288 NONAME ; class CApaLocalisableResourceFileWriter * CApaLocalisableResourceFileWriter::NewL(class TDesC16 const &, class TDesC16 const &, int, class TDesC16 const &)
-	?NewL@CApaRegistrationResourceFileWriter@@SAPAV1@VTUid@@ABVTDesC16@@I@Z @ 289 NONAME ; class CApaRegistrationResourceFileWriter * CApaRegistrationResourceFileWriter::NewL(class TUid, class TDesC16 const &, unsigned int)
-	?NonNativeApplicationType@CApaAppData@@QBE?AVTUid@@XZ @ 290 NONAME ABSENT ; class TUid CApaAppData::NonNativeApplicationType(void) const
-	?SetAppIsHiddenL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 291 NONAME ; void CApaRegistrationResourceFileWriter::SetAppIsHiddenL(int)
-	?SetDefaultScreenNumberL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 292 NONAME ; void CApaRegistrationResourceFileWriter::SetDefaultScreenNumberL(int)
-	?SetEmbeddabilityL@CApaRegistrationResourceFileWriter@@QAEXW4TEmbeddability@TApaAppCapability@@@Z @ 293 NONAME ; void CApaRegistrationResourceFileWriter::SetEmbeddabilityL(enum TApaAppCapability::TEmbeddability)
-	?SetGroupNameL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC16@@@Z @ 294 NONAME ; void CApaRegistrationResourceFileWriter::SetGroupNameL(class TDesC16 const &)
-	?SetLaunchInBackgroundL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 295 NONAME ; void CApaRegistrationResourceFileWriter::SetLaunchInBackgroundL(int)
-	?SetOpaqueDataL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC8@@@Z @ 296 NONAME ; void CApaRegistrationResourceFileWriter::SetOpaqueDataL(class TDesC8 const &)
-	?SetSupportsNewFileL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 297 NONAME ; void CApaRegistrationResourceFileWriter::SetSupportsNewFileL(int)
-	??1CApaLocalisableResourceFileWriter@@UAE@XZ @ 298 NONAME ; CApaLocalisableResourceFileWriter::~CApaLocalisableResourceFileWriter(void)
-	??1CApaRegistrationResourceFileWriter@@UAE@XZ @ 299 NONAME ; CApaRegistrationResourceFileWriter::~CApaRegistrationResourceFileWriter(void)
-	?AppScanInProgress@CApaAppList@@QBEHXZ @ 300 NONAME ABSENT ; int CApaAppList::AppScanInProgress(void) const
-	?CancelNotify@RApaLsSession@@QAEXXZ @ 301 NONAME ; void RApaLsSession::CancelNotify(void)
-	?SetNotify@RApaLsSession@@QAEXHAAVTRequestStatus@@@Z @ 302 NONAME ; void RApaLsSession::SetNotify(int, class TRequestStatus &)
-	?CancelNotifyOnDataMappingChange@RApaLsSession@@QAEXXZ @ 303 NONAME ; void RApaLsSession::CancelNotifyOnDataMappingChange(void)
-	?NotifyOnDataMappingChange@RApaLsSession@@QAEXAAVTRequestStatus@@@Z @ 304 NONAME ; void RApaLsSession::NotifyOnDataMappingChange(class TRequestStatus &)
-	?GetAppType@RApaLsSession@@QBEHAAVTUid@@V2@@Z @ 305 NONAME ; int RApaLsSession::GetAppType(class TUid &, class TUid) const
-	?CommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 306 NONAME ; void RApaLsSession::CommitNonNativeApplicationsUpdatesL(void)
-	?PrepareNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 307 NONAME ; void RApaLsSession::PrepareNonNativeApplicationsUpdatesL(void)
-	?RollbackNonNativeApplicationsUpdates@RApaLsSession@@QAEHXZ @ 308 NONAME ; int RApaLsSession::RollbackNonNativeApplicationsUpdates(void)
-	?SetUpdatedAppsList@CApaAppList@@QAEXPAVCUpdatedAppsList@@@Z @ 309 NONAME ABSENT ; void CApaAppList::SetUpdatedAppsList(class CUpdatedAppsList *)
-	?UpdatedAppsList@CApaAppList@@QAEPAVCUpdatedAppsList@@XZ @ 310 NONAME ABSENT ; class CUpdatedAppsList * CApaAppList::UpdatedAppsList(void)
-	??1CApaAppData@@UAE@XZ @ 311 NONAME ABSENT ; CApaAppData::~CApaAppData(void)
-	?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 312 NONAME ABSENT ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &)
-	?Self@CApaAppList@@SAPAV1@XZ @ 313 NONAME ABSENT ; class CApaAppList * CApaAppList::Self(void)
-	?ShareProtectedFileServer@CApaAppList@@QAEAAVRFs@@XZ @ 314 NONAME ABSENT ; class RFs & CApaAppList::ShareProtectedFileServer(void)
-	X @ 315 NONAME ABSENT ; Old @internalComponent function that never needed to be exported
-	X @ 316 NONAME ABSENT ; Old @internalComponent function that never needed to be exported
-	X @ 317 NONAME ABSENT ; Old @internalComponent function that never needed to be exported
-	X @ 318 NONAME ABSENT ; Old @internalComponent function that never needed to be exported
-	?SetAppShortCaption@RApaLsSession@@QAEHABVTDesC16@@W4TLanguage@@VTUid@@@Z @ 319 NONAME ; int RApaLsSession::SetAppShortCaption(class TDesC16 const &, enum TLanguage, class TUid)
-	?SetShortCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 320 NONAME ABSENT ; void CApaAppData::SetShortCaptionL(class TDesC16 const &)
-	?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VTDesC16@@@@@Z @ 321 NONAME ; int RApaLsSession::ForceRegistration(class RPointerArray<class TDesC16> const &)
-	?AddForcedRegistrationL@CApaAppList@@QAEXPAVHBufC16@@@Z @ 322 NONAME ABSENT ; void CApaAppList::AddForcedRegistrationL(class HBufC16 *)
-	?CompareStrings@CApaAppList@@SAHABVHBufC16@@0@Z @ 323 NONAME ABSENT ; int CApaAppList::CompareStrings(class HBufC16 const &, class HBufC16 const &)
-	?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 324 NONAME ABSENT ; void CApaAppList::ResetForcedRegistrations(void)
-	?RestartScanL@CApaAppList@@QAEXXZ @ 325 NONAME ABSENT ; void CApaAppList::RestartScanL(void)
-	?StopScan@CApaAppList@@QAEXXZ @ 326 NONAME ABSENT ; void CApaAppList::StopScan(void)
-	?MinApplicationStackSize@@YAIXZ @ 327 NONAME ; unsigned int MinApplicationStackSize(void)
-	?KMinApplicationStackSize@@3HB @ 328 NONAME ; int const KMinApplicationStackSize
-	?IsLanguageChangePending@CApaAppList@@QBEHXZ @ 329 NONAME ABSENT ; int CApaAppList::IsLanguageChangePending(void) const
-	?IsPending@CApaAppData@@QBEHXZ @ 330 NONAME ABSENT ; int CApaAppData::IsPending(void) const
-	?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAVRFile@@@Z @ 331 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class RFile &) const
-	?CheckAppSecurity@CApaSecurityUtils@@SAHABVTPtrC16@@AAH1@Z @ 332 NONAME ; int CApaSecurityUtils::CheckAppSecurity(class TPtrC16 const &, int &, int &)
-	X @ 333 NONAME ABSENT
-	X @ 334 NONAME ABSENT
-	?ForceCommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 335 NONAME ; void RApaLsSession::ForceCommitNonNativeApplicationsUpdatesL(void)
-	?RecognizeData@RApaLsSession@@QBEHABVTDesC8@@AAVTDataRecognitionResult@@@Z @ 336 NONAME ; TInt RecognizeData(const TDesC8& aBuffer, TDataRecognitionResult& aDataType) const
-	??0TApaAppUpdateInfo@@QAE@XZ @ 337 NONAME ; TApaAppUpdateInfo::TApaAppUpdateInfo(void)
-	?InternalizeL@TApaAppUpdateInfo@@QAEXAAVRReadStream@@@Z @ 338 NONAME ; void TApaAppUpdateInfo::InternalizeL(class RReadStream &)
-	?UpdateAppListL@RApaLsSession@@QAEHAAV?$RArray@VTApaAppUpdateInfo@@@@@Z @ 339 NONAME ; int RApaLsSession::UpdateAppListL(class RArray<class TApaAppUpdateInfo> &)
-	?ExternalizeL@TApaAppUpdateInfo@@QBEXAAVRWriteStream@@@Z @ 340 NONAME ; void TApaAppUpdateInfo::ExternalizeL(class RWriteStream &) const
-	??0TApaAppUpdateInfo@@QAE@VTUid@@W4TApaAppAction@0@@Z @ 341 NONAME ; TApaAppUpdateInfo::TApaAppUpdateInfo(class TUid, enum TApaAppUpdateInfo::TApaAppAction)
-	?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VCApplicationRegistrationData@Usif@@@@@Z @ 342 NONAME ; int RApaLsSession::ForceRegistration(class RPointerArray<class Usif::CApplicationRegistrationData> const &)
-	?UpdatedAppsInfoL@RApaLsSession@@QAEHAAV?$RArray@VTApaAppUpdateInfo@@@@@Z @ 343 NONAME ; int RApaLsSession::UpdatedAppsInfoL(class RArray<class TApaAppUpdateInfo> &)
-
--- a/appfw/apparchitecture/bwins/TICONFORLEAKSu.DEF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,350 +0,0 @@
-EXPORTS
-	??0CDataRecognitionResultArray@@QAE@XZ @ 1 NONAME ; CDataRecognitionResultArray::CDataRecognitionResultArray(void)
-	??0MApaAppListServObserver@@IAE@XZ @ 2 NONAME ; MApaAppListServObserver::MApaAppListServObserver(void)
-	??0RApaLsSession@@QAE@XZ @ 3 NONAME ; RApaLsSession::RApaLsSession(void)
-	??0TApaPictureFactory@@IAE@XZ @ 4 NONAME ; TApaPictureFactory::TApaPictureFactory(void)
-	??0TApaPictureFactory@@QAE@PAVCApaProcess@@@Z @ 5 NONAME ; TApaPictureFactory::TApaPictureFactory(class CApaProcess *)
-	??0TApaTask@@QAE@AAVRWsSession@@@Z @ 6 NONAME ; TApaTask::TApaTask(class RWsSession &)
-	??0TApaTaskList@@QAE@AAVRWsSession@@@Z @ 7 NONAME ; TApaTaskList::TApaTaskList(class RWsSession &)
-	??1CApaAppData@@UAE@XZ @ 8 NONAME ; CApaAppData::~CApaAppData(void)
-	??1CApaAppInfoFileWriter@@UAE@XZ @ 9 NONAME ABSENT ; CApaAppInfoFileWriter::~CApaAppInfoFileWriter(void)
-	??1CApaAppList@@UAE@XZ @ 10 NONAME ; CApaAppList::~CApaAppList(void)
-	??1CApaAppListNotifier@@UAE@XZ @ 11 NONAME ; CApaAppListNotifier::~CApaAppListNotifier(void)
-	??1CApaDoor@@UAE@XZ @ 12 NONAME ; CApaDoor::~CApaDoor(void)
-	??1CApaLocalisableResourceFileWriter@@UAE@XZ @ 13 NONAME ; CApaLocalisableResourceFileWriter::~CApaLocalisableResourceFileWriter(void)
-	??1CApaMaskedBitmap@@UAE@XZ @ 14 NONAME ; CApaMaskedBitmap::~CApaMaskedBitmap(void)
-	??1CApaRegistrationResourceFileWriter@@UAE@XZ @ 15 NONAME ; CApaRegistrationResourceFileWriter::~CApaRegistrationResourceFileWriter(void)
-	??1CApaSystemControlList@@UAE@XZ @ 16 NONAME ; CApaSystemControlList::~CApaSystemControlList(void)
-	??1CApaWindowGroupName@@UAE@XZ @ 17 NONAME ; CApaWindowGroupName::~CApaWindowGroupName(void)
-	??1CDataRecognitionResultArray@@UAE@XZ @ 18 NONAME ; CDataRecognitionResultArray::~CDataRecognitionResultArray(void)
-	?AddCaptionL@CApaAppInfoFileWriter@@QAEXW4TLanguage@@ABVTDesC16@@@Z @ 19 NONAME ABSENT ; void CApaAppInfoFileWriter::AddCaptionL(enum TLanguage, class TDesC16 const &)
-	?AddDataTypeL@CApaAppInfoFileWriter@@QAEXABVTDataTypeWithPriority@@@Z @ 20 NONAME ABSENT ; void CApaAppInfoFileWriter::AddDataTypeL(class TDataTypeWithPriority const &)
-	?AddDataTypeL@CApaRegistrationResourceFileWriter@@QAEXHABVTDesC8@@@Z @ 21 NONAME ; void CApaRegistrationResourceFileWriter::AddDataTypeL(int, class TDesC8 const &)
-	?AddFileOwnershipInfoL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC16@@@Z @ 22 NONAME ; void CApaRegistrationResourceFileWriter::AddFileOwnershipInfoL(class TDesC16 const &)
-	?AddForcedRegistrationL@CApaAppList@@QAEXPAVHBufC16@@@Z @ 23 NONAME ABSENT ; void CApaAppList::AddForcedRegistrationL(class HBufC16 *)
-	?AddIconL@CApaAppInfoFileWriter@@QAEXAAVCApaMaskedBitmap@@@Z @ 24 NONAME ABSENT ; void CApaAppInfoFileWriter::AddIconL(class CApaMaskedBitmap &)
-	?AppCount@RApaLsSession@@QBEHAAH@Z @ 25 NONAME ; int RApaLsSession::AppCount(int &) const
-	?AppDataByFileName@CApaAppList@@QBEPAVCApaAppData@@ABVTDesC16@@@Z @ 26 NONAME ; class CApaAppData * CApaAppList::AppDataByFileName(class TDesC16 const &) const
-	?AppDataByUid@CApaAppList@@QBEPAVCApaAppData@@VTUid@@@Z @ 27 NONAME ; class CApaAppData * CApaAppList::AppDataByUid(class TUid) const
-	?AppEntry@CApaAppData@@QBE?AVTApaAppEntry@@XZ @ 28 NONAME ; class TApaAppEntry CApaAppData::AppEntry(void) const
-	?AppForDataType@RApaLsSession@@QBEHABVTDataType@@AAVTUid@@@Z @ 29 NONAME ; int RApaLsSession::AppForDataType(class TDataType const &, class TUid &) const
-	?AppForDataTypeAndService@RApaLsSession@@QBEHABVTDataType@@VTUid@@AAV3@@Z @ 30 NONAME ; int RApaLsSession::AppForDataTypeAndService(class TDataType const &, class TUid, class TUid &) const
-	?AppForDocument@RApaLsSession@@QBEHABVRFile@@AAVTUid@@AAVTDataType@@@Z @ 31 NONAME ; int RApaLsSession::AppForDocument(class RFile const &, class TUid &, class TDataType &) const
-	?AppForDocument@RApaLsSession@@QBEHABVTDesC16@@AAVTUid@@AAVTDataType@@@Z @ 32 NONAME ; int RApaLsSession::AppForDocument(class TDesC16 const &, class TUid &, class TDataType &) const
-	?AppForDocumentAndService@RApaLsSession@@QBEHABVRFile@@VTUid@@AAV3@AAVTDataType@@@Z @ 33 NONAME ; int RApaLsSession::AppForDocumentAndService(class RFile const &, class TUid, class TUid &, class TDataType &) const
-	?AppForDocumentAndService@RApaLsSession@@QBEHABVTDesC16@@VTUid@@AAV3@AAVTDataType@@@Z @ 34 NONAME ; int RApaLsSession::AppForDocumentAndService(class TDesC16 const &, class TUid, class TUid &, class TDataType &) const
-	?AppScanInProgress@CApaAppList@@QBEHXZ @ 35 NONAME ; int CApaAppList::AppScanInProgress(void) const
-	?AppUid@CApaWindowGroupName@@QBE?AVTUid@@XZ @ 36 NONAME ; class TUid CApaWindowGroupName::AppUid(void) const
-	?AppUidL@CApaDoor@@QBE?AVTUid@@XZ @ 37 NONAME ; class TUid CApaDoor::AppUidL(void) const
-	?ApplicationLanguage@CApaAppData@@QBE?AW4TLanguage@@XZ @ 38 NONAME ; enum TLanguage CApaAppData::ApplicationLanguage(void) const
-	?ApplicationLanguage@RApaLsSession@@QBEHVTUid@@AAW4TLanguage@@@Z @ 39 NONAME ; int RApaLsSession::ApplicationLanguage(class TUid, enum TLanguage &) const
-	?BringToForeground@TApaTask@@QAEXXZ @ 40 NONAME ; void TApaTask::BringToForeground(void)
-	?CanUseScreenMode@CApaAppData@@QAEHH@Z @ 41 NONAME ; int CApaAppData::CanUseScreenMode(int)
-	?CancelListPopulationCompleteObserver@RApaLsSession@@QBEHXZ @ 42 NONAME ; int RApaLsSession::CancelListPopulationCompleteObserver(void) const
-	?CancelNotify@RApaLsSession@@QAEXXZ @ 43 NONAME ; void RApaLsSession::CancelNotify(void)
-	?CancelNotifyOnDataMappingChange@RApaLsSession@@QAEXXZ @ 44 NONAME ; void RApaLsSession::CancelNotifyOnDataMappingChange(void)
-	?CancelRecognizeFiles@RApaLsSession@@QAEXXZ @ 45 NONAME ; void RApaLsSession::CancelRecognizeFiles(void)
-	?Capability@CApaAppData@@QBEXAAVTDes8@@@Z @ 46 NONAME ; void CApaAppData::Capability(class TDes8 &) const
-	?Caption@CApaSystemControl@@QBE?AVTPtrC16@@XZ @ 47 NONAME ; class TPtrC16 CApaSystemControl::Caption(void) const
-	?Caption@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 48 NONAME ; class TPtrC16 CApaWindowGroupName::Caption(void) const
-	?CheckInterimFormatFileNotCorruptL@ForJavaMIDletInstaller@@SAXAAVRFile@@@Z @ 49 NONAME ABSENT ; void ForJavaMIDletInstaller::CheckInterimFormatFileNotCorruptL(class RFile &)
-	?ClearFsSession@RApaLsSession@@SAXXZ @ 50 NONAME ; void RApaLsSession::ClearFsSession(void)
-	?Close@RApaLsSession@@QAEXXZ @ 51 NONAME ; void RApaLsSession::Close(void)
-	?CommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 52 NONAME ; void RApaLsSession::CommitNonNativeApplicationsUpdatesL(void)
-	?CompareStrings@CApaAppList@@SAHABVHBufC16@@0@Z @ 53 NONAME ABSENT ; int CApaAppList::CompareStrings(class HBufC16 const &, class HBufC16 const &)
-	?Connect@RApaLsSession@@QAEHXZ @ 54 NONAME ; int RApaLsSession::Connect(void)
-	?ConstructFromWgIdL@CApaWindowGroupName@@QAEXH@Z @ 55 NONAME ; void CApaWindowGroupName::ConstructFromWgIdL(int)
-	?Control@CApaSystemControlList@@QBEPAVCApaSystemControl@@H@Z @ 56 NONAME ; class CApaSystemControl * CApaSystemControlList::Control(int) const
-	?Control@CApaSystemControlList@@QBEPAVCApaSystemControl@@VTUid@@@Z @ 57 NONAME ; class CApaSystemControl * CApaSystemControlList::Control(class TUid) const
-	?Count@CApaAppList@@QBEHXZ @ 58 NONAME ; int CApaAppList::Count(void) const
-	?Count@CApaSystemControlList@@QBEHXZ @ 59 NONAME ; int CApaSystemControlList::Count(void) const
-	?Count@CDataRecognitionResultArray@@QBEIXZ @ 60 NONAME ; unsigned int CDataRecognitionResultArray::Count(void) const
-	?CreateDocument@RApaLsSession@@QAEHABVTDesC16@@VTUid@@AAVTThreadId@@W4TLaunchType@1@@Z @ 61 NONAME ; int RApaLsSession::CreateDocument(class TDesC16 const &, class TUid, class TThreadId &, enum RApaLsSession::TLaunchType)
-	?CreateL@CApaSystemControl@@QAEXXZ @ 62 NONAME ; void CApaSystemControl::CreateL(void)
-	?CycleTasks@TApaTaskList@@QAEHVTUid@@W4TCycleDirection@1@@Z @ 63 NONAME ; int TApaTaskList::CycleTasks(class TUid, enum TApaTaskList::TCycleDirection)
-	?DataType@CApaAppData@@QBEJABVTDataType@@@Z @ 64 NONAME ; long CApaAppData::DataType(class TDataType const &) const
-	?DataTypes@TApaAppServiceInfo@@QBEABV?$CArrayFixFlat@VTDataTypeWithPriority@@@@XZ @ 65 NONAME ; class CArrayFixFlat<class TDataTypeWithPriority> const & TApaAppServiceInfo::DataTypes(void) const
-	?DefaultScreenNumber@CApaAppData@@QBEIXZ @ 66 NONAME ; unsigned int CApaAppData::DefaultScreenNumber(void) const
-	?DeleteDataMapping@RApaLsSession@@QAEHABVTDataType@@@Z @ 67 NONAME ; int RApaLsSession::DeleteDataMapping(class TDataType const &)
-	?DeleteDataMapping@RApaLsSession@@QAEHABVTDataType@@VTUid@@@Z @ 68 NONAME ; int RApaLsSession::DeleteDataMapping(class TDataType const &, class TUid)
-	?DeregisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@@Z @ 69 NONAME ; void RApaLsSession::DeregisterNonNativeApplicationL(class TUid)
-	?DeregisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@@Z @ 70 NONAME ; void RApaLsSession::DeregisterNonNativeApplicationTypeL(class TUid)
-	?DocName@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 71 NONAME ; class TPtrC16 CApaWindowGroupName::DocName(void) const
-	?DocNameIsAFile@CApaWindowGroupName@@QBEHXZ @ 72 NONAME ; int CApaWindowGroupName::DocNameIsAFile(void) const
-	?DocumentL@CApaDoor@@QAEPAVCApaDocument@@H@Z @ 73 NONAME ; class CApaDocument * CApaDoor::DocumentL(int)
-	?EmbeddableAppCount@RApaLsSession@@QBEHAAH@Z @ 74 NONAME ; int RApaLsSession::EmbeddableAppCount(int &) const
-	?EndTask@TApaTask@@QAEXXZ @ 75 NONAME ; void TApaTask::EndTask(void)
-	?Exists@TApaTask@@QBEHXZ @ 76 NONAME ; int TApaTask::Exists(void) const
-	?ExternalizeL@CApaMaskedBitmap@@QBEXAAVRWriteStream@@@Z @ 77 NONAME ; void CApaMaskedBitmap::ExternalizeL(class RWriteStream &) const
-	?FileName@CApaSystemControl@@QBE?AV?$TBuf@$0BAA@@@XZ @ 78 NONAME ; class TBuf<256> CApaSystemControl::FileName(void) const
-	?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 79 NONAME ABSENT ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid)
-	?FindApp@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 80 NONAME ; class TApaTask TApaTaskList::FindApp(class TDesC16 const &)
-	?FindApp@TApaTaskList@@QAE?AVTApaTask@@VTUid@@@Z @ 81 NONAME ; class TApaTask TApaTaskList::FindApp(class TUid)
-	?FindByAppUid@CApaWindowGroupName@@SAXVTUid@@AAVRWsSession@@AAH@Z @ 82 NONAME ; void CApaWindowGroupName::FindByAppUid(class TUid, class RWsSession &, int &)
-	?FindByCaption@CApaWindowGroupName@@SAXABVTDesC16@@AAVRWsSession@@AAH@Z @ 83 NONAME ; void CApaWindowGroupName::FindByCaption(class TDesC16 const &, class RWsSession &, int &)
-	?FindByDocName@CApaWindowGroupName@@SAXABVTDesC16@@AAVRWsSession@@AAH@Z @ 84 NONAME ; void CApaWindowGroupName::FindByDocName(class TDesC16 const &, class RWsSession &, int &)
-	?FindByPos@TApaTaskList@@QAE?AVTApaTask@@H@Z @ 85 NONAME ; class TApaTask TApaTaskList::FindByPos(int)
-	?FindDoc@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 86 NONAME ; class TApaTask TApaTaskList::FindDoc(class TDesC16 const &)
-	?FirstApp@CApaAppList@@QBEPAVCApaAppData@@H@Z @ 87 NONAME ; class CApaAppData * CApaAppList::FirstApp(int) const
-	?FirstApp@CApaAppList@@QBEPAVCApaAppData@@XZ @ 88 NONAME ; class CApaAppData * CApaAppList::FirstApp(void) const
-	?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VTDesC16@@@@@Z @ 89 NONAME ABSENT; int RApaLsSession::ForceRegistration(class RPointerArray<class TDesC16> const &)
-	?FsSession@RApaLsSession@@SAPAVRFs@@XZ @ 90 NONAME ; class RFs * RApaLsSession::FsSession(void)
-	?GetAcceptedConfidence@RApaLsSession@@QBEHAAH@Z @ 91 NONAME ; int RApaLsSession::GetAcceptedConfidence(int &) const
-	?GetAllApps@RApaLsSession@@QBEHH@Z @ 92 NONAME ; int RApaLsSession::GetAllApps(int) const
-	?GetAllApps@RApaLsSession@@QBEHXZ @ 93 NONAME ; int RApaLsSession::GetAllApps(void) const
-	?GetAppByDataType@RApaLsSession@@QBEHABVTDataType@@VTUid@@AAV3@@Z @ 94 NONAME ; int RApaLsSession::GetAppByDataType(class TDataType const &, class TUid, class TUid &) const
-	?GetAppCapability@RApaLsSession@@QBEHAAVTDes8@@VTUid@@@Z @ 95 NONAME ; int RApaLsSession::GetAppCapability(class TDes8 &, class TUid) const
-	?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAPAVHBufC16@@@Z @ 96 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class HBufC16 * &) const
-	?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAVRFile@@@Z @ 97 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class RFile &) const
-	?GetAppIcon@RApaLsSession@@QBEHVTUid@@HAAVCApaMaskedBitmap@@@Z @ 98 NONAME ; int RApaLsSession::GetAppIcon(class TUid, int, class CApaMaskedBitmap &) const
-	?GetAppIcon@RApaLsSession@@QBEHVTUid@@VTSize@@AAVCApaMaskedBitmap@@@Z @ 99 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class TSize, class CApaMaskedBitmap &) const
-	?GetAppIconSizes@RApaLsSession@@QBEHVTUid@@AAV?$CArrayFixFlat@VTSize@@@@@Z @ 100 NONAME ; int RApaLsSession::GetAppIconSizes(class TUid, class CArrayFixFlat<class TSize> &) const
-	?GetAppInfo@RApaLsSession@@QBEHAAVTApaAppInfo@@VTUid@@@Z @ 101 NONAME ; int RApaLsSession::GetAppInfo(class TApaAppInfo &, class TUid) const
-	?GetAppOwnedFiles@RApaLsSession@@QBEHAAVCDesC16Array@@VTUid@@@Z @ 102 NONAME ; int RApaLsSession::GetAppOwnedFiles(class CDesC16Array &, class TUid) const
-	?GetAppServiceOpaqueDataLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@0@Z @ 103 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetAppServiceOpaqueDataLC(class TUid, class TUid) const
-	?GetAppServicesL@RApaLsSession@@QBEXVTUid@@AAV?$CArrayFixFlat@VTUid@@@@@Z @ 104 NONAME ; void RApaLsSession::GetAppServicesL(class TUid, class CArrayFixFlat<class TUid> &) const
-	?GetAppServicesLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@@Z @ 105 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetAppServicesLC(class TUid) const
-	?GetAppType@RApaLsSession@@QBEHAAVTUid@@V2@@Z @ 106 NONAME ; int RApaLsSession::GetAppType(class TUid &, class TUid) const
-	?GetAppViewIcon@RApaLsSession@@QBEHVTUid@@0AAPAVHBufC16@@@Z @ 107 NONAME ; int RApaLsSession::GetAppViewIcon(class TUid, class TUid, class HBufC16 * &) const
-	?GetAppViewIcon@RApaLsSession@@QBEHVTUid@@0ABVTSize@@AAVCApaMaskedBitmap@@@Z @ 108 NONAME ; int RApaLsSession::GetAppViewIcon(class TUid, class TUid, class TSize const &, class CApaMaskedBitmap &) const
-	?GetAppViews@RApaLsSession@@QBEHAAV?$CArrayFixFlat@VTApaAppViewInfo@@@@VTUid@@@Z @ 109 NONAME ; int RApaLsSession::GetAppViews(class CArrayFixFlat<class TApaAppViewInfo> &, class TUid) const
-	?GetDataRecognitionResultL@CDataRecognitionResultArray@@QBEXAAVTDataRecognitionResult@@I@Z @ 110 NONAME ; void CDataRecognitionResultArray::GetDataRecognitionResultL(class TDataRecognitionResult &, unsigned int) const
-	?GetDefaultScreenNumber@RApaLsSession@@QBEHAAHVTUid@@@Z @ 111 NONAME ; int RApaLsSession::GetDefaultScreenNumber(int &, class TUid) const
-	?GetEmbeddableApps@RApaLsSession@@QBEHH@Z @ 112 NONAME ; int RApaLsSession::GetEmbeddableApps(int) const
-	?GetEmbeddableApps@RApaLsSession@@QBEHXZ @ 113 NONAME ; int RApaLsSession::GetEmbeddableApps(void) const
-	?GetFileNameL@CDataRecognitionResultArray@@QBEXAAV?$TBuf@$0BAA@@@I@Z @ 114 NONAME ; void CDataRecognitionResultArray::GetFileNameL(class TBuf<256> &, unsigned int) const
-	?GetFilteredApps@RApaLsSession@@QBEHABVTApaEmbeddabilityFilter@@@Z @ 115 NONAME ; int RApaLsSession::GetFilteredApps(class TApaEmbeddabilityFilter const &) const
-	?GetFilteredApps@RApaLsSession@@QBEHABVTApaEmbeddabilityFilter@@H@Z @ 116 NONAME ; int RApaLsSession::GetFilteredApps(class TApaEmbeddabilityFilter const &, int) const
-	?GetFilteredApps@RApaLsSession@@QBEHII@Z @ 117 NONAME ; int RApaLsSession::GetFilteredApps(unsigned int, unsigned int) const
-	?GetFilteredApps@RApaLsSession@@QBEHIIH@Z @ 118 NONAME ; int RApaLsSession::GetFilteredApps(unsigned int, unsigned int, int) const
-	?GetIconInfo@CApaAppData@@QBEXAAH0@Z @ 119 NONAME ; void CApaAppData::GetIconInfo(int &, int &) const
-	?GetJavaMIDletInfoL@ForJavaMIDletInstaller@@SAXAAVRFs@@ABVTDesC16@@AAK2@Z @ 120 NONAME ABSENT ; void ForJavaMIDletInstaller::GetJavaMIDletInfoL(class RFs &, class TDesC16 const &, unsigned long &, unsigned long &)
-	?GetMaxDataBufSize@RApaLsSession@@QBEHAAH@Z @ 121 NONAME ; int RApaLsSession::GetMaxDataBufSize(int &) const
-	?GetNextApp@RApaLsSession@@QBEHAAVTApaAppInfo@@@Z @ 122 NONAME ; int RApaLsSession::GetNextApp(class TApaAppInfo &) const
-	?GetNextApp@RApaLsSession@@QBEHAAVTApaAppInfo@@H@Z @ 123 NONAME ; int RApaLsSession::GetNextApp(class TApaAppInfo &, int) const
-	?GetPreferredBufSize@RApaLsSession@@QBEHAAH@Z @ 124 NONAME ; int RApaLsSession::GetPreferredBufSize(int &) const
-	?GetServerApps@RApaLsSession@@QBEHVTUid@@@Z @ 125 NONAME ; int RApaLsSession::GetServerApps(class TUid) const
-	?GetServerApps@RApaLsSession@@QBEHVTUid@@H@Z @ 126 NONAME ; int RApaLsSession::GetServerApps(class TUid, int) const
-	?GetServiceImplementationsLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@@Z @ 127 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetServiceImplementationsLC(class TUid) const
-	?GetServiceImplementationsLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@ABVTDataType@@@Z @ 128 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetServiceImplementationsLC(class TUid, class TDataType const &) const
-	?GetSupportedDataTypesL@RApaLsSession@@QBEHAAV?$CArrayFixFlat@VTDataType@@@@@Z @ 129 NONAME ; int RApaLsSession::GetSupportedDataTypesL(class CArrayFixFlat<class TDataType> &) const
-	?HandleAsRegistrationFile@ApaUtils@@SAHABVTUidType@@@Z @ 130 NONAME ABSENT ; int ApaUtils::HandleAsRegistrationFile(class TUidType const &)
-	?Hidden@CApaWindowGroupName@@QBEHXZ @ 131 NONAME ; int CApaWindowGroupName::Hidden(void) const
-	?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@H@Z @ 132 NONAME ; class CApaMaskedBitmap * CApaAppData::Icon(int) const
-	?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@VTSize@@@Z @ 133 NONAME ; class CApaMaskedBitmap * CApaAppData::Icon(class TSize) const
-	?Icon@CApaAppViewData@@QBEPAVCApaMaskedBitmap@@ABVTSize@@@Z @ 134 NONAME ; class CApaMaskedBitmap * CApaAppViewData::Icon(class TSize const &) const
-	?Icon@CApaSystemControl@@QBEPAVCApaMaskedBitmap@@XZ @ 135 NONAME ; class CApaMaskedBitmap * CApaSystemControl::Icon(void) const
-	?IconFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 136 NONAME ; class TPtrC16 CApaAppData::IconFileName(void) const
-	?IconFileName@CApaAppViewData@@QBE?AVTPtrC16@@XZ @ 137 NONAME ; class TPtrC16 CApaAppViewData::IconFileName(void) const
-	?IconSizesL@CApaAppData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 138 NONAME ; class CArrayFixFlat<class TSize> * CApaAppData::IconSizesL(void) const
-	?IconSizesL@CApaAppViewData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 139 NONAME ; class CArrayFixFlat<class TSize> * CApaAppViewData::IconSizesL(void) const
-	?ImplementsService@CApaAppData@@QBEHVTUid@@@Z @ 140 NONAME ; int CApaAppData::ImplementsService(class TUid) const
-	?Index@CApaSystemControlList@@QBEHVTUid@@@Z @ 141 NONAME ; int CApaSystemControlList::Index(class TUid) const
-	?InitListL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 142 NONAME ; void CApaAppList::InitListL(class MApaAppListObserver *)
-	?InsertDataMapping@RApaLsSession@@QAEHABVTDataType@@JVTUid@@1@Z @ 143 NONAME ; int RApaLsSession::InsertDataMapping(class TDataType const &, long, class TUid, class TUid)
-	?InsertDataMapping@RApaLsSession@@QAEHABVTDataType@@JVTUid@@@Z @ 144 NONAME ; int RApaLsSession::InsertDataMapping(class TDataType const &, long, class TUid)
-	?InsertDataMappingIfHigher@RApaLsSession@@QAEHABVTDataType@@JVTUid@@AAH@Z @ 145 NONAME ; int RApaLsSession::InsertDataMappingIfHigher(class TDataType const &, long, class TUid, int &)
-	?InternalizeL@CApaMaskedBitmap@@QAEXAAVRReadStream@@@Z @ 146 NONAME ; void CApaMaskedBitmap::InternalizeL(class RReadStream &)
-	?IsAppReady@CApaWindowGroupName@@QBEHXZ @ 147 NONAME ; int CApaWindowGroupName::IsAppReady(void) const
-	?IsBusy@CApaWindowGroupName@@QBEHXZ @ 148 NONAME ; int CApaWindowGroupName::IsBusy(void) const
-	?IsFirstScanComplete@CApaAppList@@QBEHXZ @ 149 NONAME ; int CApaAppList::IsFirstScanComplete(void) const
-	?IsIdleUpdateComplete@CApaAppList@@QBEHXZ @ 150 NONAME ; int CApaAppList::IsIdleUpdateComplete(void) const
-	?IsLanguageChangePending@CApaAppList@@QBEHXZ @ 151 NONAME ; int CApaAppList::IsLanguageChangePending(void) const
-	?IsPending@CApaAppData@@QBEHXZ @ 152 NONAME ABSENT ; int CApaAppData::IsPending(void) const
-	?IsProgram@RApaLsSession@@QBEHABVTDesC16@@AAH@Z @ 153 NONAME ; int RApaLsSession::IsProgram(class TDesC16 const &, int &) const
-	?IsSystem@CApaWindowGroupName@@QBEHXZ @ 154 NONAME ; int CApaWindowGroupName::IsSystem(void) const
-	?KillTask@TApaTask@@QAEXXZ @ 155 NONAME ; void TApaTask::KillTask(void)
-	?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 156 NONAME ABSENT ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const
-	?MApaAppListServObserver_Reserved1@MApaAppListServObserver@@EAEXXZ @ 157 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved1(void)
-	?MApaAppListServObserver_Reserved2@MApaAppListServObserver@@EAEXXZ @ 158 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved2(void)
-	?Mask@CApaMaskedBitmap@@QBEPAVCFbsBitmap@@XZ @ 159 NONAME ; class CFbsBitmap * CApaMaskedBitmap::Mask(void) const
-	?MatchesSecurityPolicy@RApaLsSession@@QBEHAAHVTUid@@ABVTSecurityPolicy@@@Z @ 160 NONAME ; int RApaLsSession::MatchesSecurityPolicy(int &, class TUid, class TSecurityPolicy const &) const
-	?MinApplicationStackSize@@YAIXZ @ 161 NONAME ; unsigned int MinApplicationStackSize(void)
-	?New@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@PAVHBufC16@@@Z @ 162 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::New(class RWsSession const &, class HBufC16 *)
-	?NewInterimFormatFileWriterLC@ForJavaMIDletInstaller@@SAPAVCApaAppInfoFileWriter@@AAVRFs@@ABVTDesC16@@VTUid@@KH@Z @ 163 NONAME ABSENT ; class CApaAppInfoFileWriter * ForJavaMIDletInstaller::NewInterimFormatFileWriterLC(class RFs &, class TDesC16 const &, class TUid, unsigned long, int)
-	?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 164 NONAME ABSENT ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &)
-	?NewL@CApaAppList@@SAPAV1@AAVRFs@@PAVCApaAppRegFinder@@HH@Z @ 165 NONAME ABSENT ; class CApaAppList * CApaAppList::NewL(class RFs &, class CApaAppRegFinder *, int, int)
-	?NewL@CApaAppListNotifier@@SAPAV1@PAVMApaAppListServObserver@@W4TPriority@CActive@@@Z @ 166 NONAME ; class CApaAppListNotifier * CApaAppListNotifier::NewL(class MApaAppListServObserver *, enum CActive::TPriority)
-	?NewL@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 167 NONAME ; class CApaDoor * CApaDoor::NewL(class RFs &, class CApaDocument &, class TSize const &)
-	?NewL@CApaDoor@@SAPAV1@AAVRFs@@ABVCStreamStore@@VTStreamId@@AAVCApaProcess@@@Z @ 168 NONAME ; class CApaDoor * CApaDoor::NewL(class RFs &, class CStreamStore const &, class TStreamId, class CApaProcess &)
-	?NewL@CApaLocalisableResourceFileWriter@@SAPAV1@ABVTDesC16@@0H0@Z @ 169 NONAME ; class CApaLocalisableResourceFileWriter * CApaLocalisableResourceFileWriter::NewL(class TDesC16 const &, class TDesC16 const &, int, class TDesC16 const &)
-	?NewL@CApaMaskedBitmap@@SAPAV1@PBV1@@Z @ 170 NONAME ; class CApaMaskedBitmap * CApaMaskedBitmap::NewL(class CApaMaskedBitmap const *)
-	?NewL@CApaRegistrationResourceFileWriter@@SAPAV1@VTUid@@ABVTDesC16@@I@Z @ 171 NONAME ; class CApaRegistrationResourceFileWriter * CApaRegistrationResourceFileWriter::NewL(class TUid, class TDesC16 const &, unsigned int)
-	?NewL@CApaSystemControlList@@SAPAV1@AAVRFs@@@Z @ 172 NONAME ; class CApaSystemControlList * CApaSystemControlList::NewL(class RFs &)
-	?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@@Z @ 173 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewL(class RWsSession const &)
-	?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@ABVTDesC16@@@Z @ 174 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewL(class RWsSession const &, class TDesC16 const &)
-	?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@H@Z @ 175 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewL(class RWsSession const &, int)
-	?NewLC@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 176 NONAME ; class CApaDoor * CApaDoor::NewLC(class RFs &, class CApaDocument &, class TSize const &)
-	?NewLC@CApaMaskedBitmap@@SAPAV1@XZ @ 177 NONAME ; class CApaMaskedBitmap * CApaMaskedBitmap::NewLC(void)
-	?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@@Z @ 178 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewLC(class RWsSession const &)
-	?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@ABVTDesC16@@@Z @ 179 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewLC(class RWsSession const &, class TDesC16 const &)
-	?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@H@Z @ 180 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewLC(class RWsSession const &, int)
-	?NewPictureL@TApaPictureFactory@@UBEXAAVTPictureHeader@@ABVCStreamStore@@@Z @ 181 NONAME ; void TApaPictureFactory::NewPictureL(class TPictureHeader &, class CStreamStore const &) const
-	?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@@Z @ 182 NONAME ; class CApaAppData * CApaAppList::NextApp(class CApaAppData const *) const
-	?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@H@Z @ 183 NONAME ; class CApaAppData * CApaAppList::NextApp(class CApaAppData const *, int) const
-	?NonMbmIconFile@CApaAppData@@QBEHXZ @ 184 NONAME ; int CApaAppData::NonMbmIconFile(void) const
-	?NonMbmIconFile@CApaAppViewData@@QBEHXZ @ 185 NONAME ; int CApaAppViewData::NonMbmIconFile(void) const
-	?NonNativeApplicationType@CApaAppData@@QBE?AVTUid@@XZ @ 186 NONAME ; class TUid CApaAppData::NonNativeApplicationType(void) const
-	?NotifyOnDataMappingChange@RApaLsSession@@QAEXAAVTRequestStatus@@@Z @ 187 NONAME ; void RApaLsSession::NotifyOnDataMappingChange(class TRequestStatus &)
-	?NumberOfOwnDefinedIcons@RApaLsSession@@QBEHVTUid@@AAH@Z @ 188 NONAME ; int RApaLsSession::NumberOfOwnDefinedIcons(class TUid, int &) const
-	?OpaqueData@CApaAppData@@QBE?AVTPtrC8@@XZ @ 189 NONAME ; class TPtrC8 CApaAppData::OpaqueData(void) const
-	?OpaqueData@TApaAppServiceInfo@@QBEABVTDesC8@@XZ @ 190 NONAME ; class TDesC8 const & TApaAppServiceInfo::OpaqueData(void) const
-	?OwnedFiles@CApaAppData@@QBEPAVCDesC16Array@@XZ @ 191 NONAME ; class CDesC16Array * CApaAppData::OwnedFiles(void) const
-	?Path@CDataRecognitionResultArray@@QBEABV?$TBuf@$0BAA@@@XZ @ 192 NONAME ; class TBuf<256> const & CDataRecognitionResultArray::Path(void) const
-	?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@@Z @ 193 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &) const
-	?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@PBV2@AAH@Z @ 194 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &, class TUid const *, int &) const
-	?PrepareNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 195 NONAME ; void RApaLsSession::PrepareNonNativeApplicationsUpdatesL(void)
-	?PurgeL@CApaAppList@@QAEXXZ @ 196 NONAME ABSENT ; void CApaAppList::PurgeL(void)
-	?RApaLsSession_Reserved1@RApaLsSession@@EAEXXZ @ 197 NONAME ; void RApaLsSession::RApaLsSession_Reserved1(void)
-	?RApaLsSession_Reserved2@RApaLsSession@@EAEXXZ @ 198 NONAME ; void RApaLsSession::RApaLsSession_Reserved2(void)
-	?RecognizeData@RApaLsSession@@QBEHABVRFile@@AAVTDataRecognitionResult@@@Z @ 199 NONAME ; int RApaLsSession::RecognizeData(class RFile const &, class TDataRecognitionResult &) const
-	?RecognizeData@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@AAVTDataRecognitionResult@@@Z @ 200 NONAME ; int RApaLsSession::RecognizeData(class TDesC16 const &, class TDesC8 const &, class TDataRecognitionResult &) const
-	?RecognizeFilesL@RApaLsSession@@QAEXABVTDesC16@@AAVCDataRecognitionResultArray@@AAVTRequestStatus@@@Z @ 201 NONAME ; void RApaLsSession::RecognizeFilesL(class TDesC16 const &, class CDataRecognitionResultArray &, class TRequestStatus &)
-	?RecognizeFilesL@RApaLsSession@@QAEXABVTDesC16@@ABVTDesC8@@AAVCDataRecognitionResultArray@@AAVTRequestStatus@@@Z @ 202 NONAME ; void RApaLsSession::RecognizeFilesL(class TDesC16 const &, class TDesC8 const &, class CDataRecognitionResultArray &, class TRequestStatus &)
-	?RecognizeFilesL@RApaLsSession@@QBEHABVTDesC16@@AAVCDataRecognitionResultArray@@@Z @ 203 NONAME ; int RApaLsSession::RecognizeFilesL(class TDesC16 const &, class CDataRecognitionResultArray &) const
-	?RecognizeFilesL@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@AAVCDataRecognitionResultArray@@@Z @ 204 NONAME ; int RApaLsSession::RecognizeFilesL(class TDesC16 const &, class TDesC8 const &, class CDataRecognitionResultArray &) const
-	?RecognizeSpecificData@RApaLsSession@@QBEHABVRFile@@ABVTDataType@@AAH@Z @ 205 NONAME ; int RApaLsSession::RecognizeSpecificData(class RFile const &, class TDataType const &, int &) const
-	?RecognizeSpecificData@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@ABVTDataType@@AAH@Z @ 206 NONAME ; int RApaLsSession::RecognizeSpecificData(class TDesC16 const &, class TDesC8 const &, class TDataType const &, int &) const
-	?RegisterListPopulationCompleteObserver@RApaLsSession@@QBEXAAVTRequestStatus@@@Z @ 207 NONAME ; void RApaLsSession::RegisterListPopulationCompleteObserver(class TRequestStatus &) const
-	?RegisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@ABVTDriveUnit@@AAVCApaRegistrationResourceFileWriter@@PAVCApaLocalisableResourceFileWriter@@PBVRFile@@@Z @ 208 NONAME ; void RApaLsSession::RegisterNonNativeApplicationL(class TUid, class TDriveUnit const &, class CApaRegistrationResourceFileWriter &, class CApaLocalisableResourceFileWriter *, class RFile const *)
-	?RegisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@ABVTDesC16@@@Z @ 209 NONAME ; void RApaLsSession::RegisterNonNativeApplicationTypeL(class TUid, class TDesC16 const &)
-	?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 210 NONAME ABSENT ; class TPtrC16 CApaAppData::RegistrationFileName(void) const
-	?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 211 NONAME ABSENT ; int CApaAppData::RegistrationFileUsed(void) const
-	?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 212 NONAME ABSENT; void CApaAppList::ResetForcedRegistrations(void)
-	?RespondsToShutdownEvent@CApaWindowGroupName@@QBEHXZ @ 213 NONAME ; int CApaWindowGroupName::RespondsToShutdownEvent(void) const
-	?RespondsToSwitchFilesEvent@CApaWindowGroupName@@QBEHXZ @ 214 NONAME ; int CApaWindowGroupName::RespondsToSwitchFilesEvent(void) const
-	?RestartScanL@CApaAppList@@QAEXXZ @ 215 NONAME ABSENT ; void CApaAppList::RestartScanL(void)
-	?RestoreL@CApaDoor@@QAEXABVCStreamStore@@VTStreamId@@@Z @ 216 NONAME ; void CApaDoor::RestoreL(class CStreamStore const &, class TStreamId)
-	?RollbackNonNativeApplicationsUpdates@RApaLsSession@@QAEHXZ @ 217 NONAME ; int RApaLsSession::RollbackNonNativeApplicationsUpdates(void)
-	?ScreenMode@CApaAppViewData@@QBEHXZ @ 218 NONAME ; int CApaAppViewData::ScreenMode(void) const
-	?Self@CApaAppList@@SAPAV1@XZ @ 219 NONAME ; class CApaAppList * CApaAppList::Self(void)
-	?SendKey@TApaTask@@QAEXABUTKeyEvent@@@Z @ 220 NONAME ; void TApaTask::SendKey(struct TKeyEvent const &)
-	?SendKey@TApaTask@@QAEXHH@Z @ 221 NONAME ; void TApaTask::SendKey(int, int)
-	?SendMessage@TApaTask@@QAEHVTUid@@ABVTDesC8@@@Z @ 222 NONAME ; int TApaTask::SendMessage(class TUid, class TDesC8 const &)
-	?SendSystemEvent@TApaTask@@QAEXW4TApaSystemEvent@@@Z @ 223 NONAME ; void TApaTask::SendSystemEvent(enum TApaSystemEvent)
-	?SendToBackground@TApaTask@@QAEXXZ @ 224 NONAME ; void TApaTask::SendToBackground(void)
-	?ServiceArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 225 NONAME ; class CBufFlat * CApaAppList::ServiceArrayBufferL(class TUid) const
-	?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 226 NONAME ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid) const
-	?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@ABVTDataType@@@Z @ 227 NONAME ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid, class TDataType const &) const
-	?ServiceOpaqueDataBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@0@Z @ 228 NONAME ; class CBufFlat * CApaAppList::ServiceOpaqueDataBufferL(class TUid, class TUid) const
-	?ServiceUidBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 229 NONAME ; class CBufFlat * CApaAppList::ServiceUidBufferL(class TUid) const
-	?SetAcceptedConfidence@RApaLsSession@@QAEHH@Z @ 230 NONAME ; int RApaLsSession::SetAcceptedConfidence(int)
-	?SetAppIsHiddenL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 231 NONAME ; void CApaRegistrationResourceFileWriter::SetAppIsHiddenL(int)
-	?SetAppReady@CApaWindowGroupName@@QAEXH@Z @ 232 NONAME ; void CApaWindowGroupName::SetAppReady(int)
-	?SetAppShortCaption@RApaLsSession@@QAEHABVTDesC16@@W4TLanguage@@VTUid@@@Z @ 233 NONAME ; int RApaLsSession::SetAppShortCaption(class TDesC16 const &, enum TLanguage, class TUid)
-	?SetAppUid@CApaWindowGroupName@@QAEXVTUid@@@Z @ 234 NONAME ; void CApaWindowGroupName::SetAppUid(class TUid)
-	?SetBusy@CApaWindowGroupName@@QAEXH@Z @ 235 NONAME ; void CApaWindowGroupName::SetBusy(int)
-	?SetCapability@CApaAppInfoFileWriter@@QAEHABVTDesC8@@@Z @ 236 NONAME ABSENT ; int CApaAppInfoFileWriter::SetCapability(class TDesC8 const &)
-	?SetCaptionL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 237 NONAME ; void CApaWindowGroupName::SetCaptionL(class TDesC16 const &)
-	?SetDefaultScreenNumberL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 238 NONAME ; void CApaRegistrationResourceFileWriter::SetDefaultScreenNumberL(int)
-	?SetDocNameIsAFile@CApaWindowGroupName@@QAEXH@Z @ 239 NONAME ; void CApaWindowGroupName::SetDocNameIsAFile(int)
-	?SetDocNameL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 240 NONAME ; void CApaWindowGroupName::SetDocNameL(class TDesC16 const &)
-	?SetEmbeddabilityL@CApaRegistrationResourceFileWriter@@QAEXW4TEmbeddability@TApaAppCapability@@@Z @ 241 NONAME ; void CApaRegistrationResourceFileWriter::SetEmbeddabilityL(enum TApaAppCapability::TEmbeddability)
-	?SetFormatToGlassL@CApaDoor@@QAEXXZ @ 242 NONAME ; void CApaDoor::SetFormatToGlassL(void)
-	?SetFormatToIconL@CApaDoor@@QAEXXZ @ 243 NONAME ; void CApaDoor::SetFormatToIconL(void)
-	?SetFormatToTemporaryIconL@CApaDoor@@QAEXH@Z @ 244 NONAME ; void CApaDoor::SetFormatToTemporaryIconL(int)
-	?SetFsSessionL@RApaLsSession@@SAXAAVRFs@@@Z @ 245 NONAME ; void RApaLsSession::SetFsSessionL(class RFs &)
-	?SetGroupNameL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC16@@@Z @ 246 NONAME ; void CApaRegistrationResourceFileWriter::SetGroupNameL(class TDesC16 const &)
-	?SetHidden@CApaWindowGroupName@@QAEXH@Z @ 247 NONAME ; void CApaWindowGroupName::SetHidden(int)
-	?SetLaunchInBackgroundL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 248 NONAME ; void CApaRegistrationResourceFileWriter::SetLaunchInBackgroundL(int)
-	?SetMaskBitmap@CApaMaskedBitmap@@QAEXPAVCFbsBitmap@@@Z @ 249 NONAME ; void CApaMaskedBitmap::SetMaskBitmap(class CFbsBitmap *)
-	?SetMaxDataBufSize@RApaLsSession@@QAEHH@Z @ 250 NONAME ; int RApaLsSession::SetMaxDataBufSize(int)
-	?SetNotify@RApaLsSession@@QAEXHAAVTRequestStatus@@@Z @ 251 NONAME ; void RApaLsSession::SetNotify(int, class TRequestStatus &)
-	?SetOpaqueDataL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC8@@@Z @ 252 NONAME ; void CApaRegistrationResourceFileWriter::SetOpaqueDataL(class TDesC8 const &)
-	?SetRespondsToShutdownEvent@CApaWindowGroupName@@QAEXH@Z @ 253 NONAME ; void CApaWindowGroupName::SetRespondsToShutdownEvent(int)
-	?SetRespondsToSwitchFilesEvent@CApaWindowGroupName@@QAEXH@Z @ 254 NONAME ; void CApaWindowGroupName::SetRespondsToSwitchFilesEvent(int)
-	?SetShortCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 255 NONAME ; void CApaAppData::SetShortCaptionL(class TDesC16 const &)
-	?SetSupportsNewFileL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 256 NONAME ; void CApaRegistrationResourceFileWriter::SetSupportsNewFileL(int)
-	?SetSystem@CApaWindowGroupName@@QAEXH@Z @ 257 NONAME ; void CApaWindowGroupName::SetSystem(int)
-	?SetUpdatedAppsList@CApaAppList@@QAEXPAVCUpdatedAppsList@@@Z @ 258 NONAME ABSENT ; void CApaAppList::SetUpdatedAppsList(class CUpdatedAppsList *)
-	?SetWgId@TApaTask@@QAEXH@Z @ 259 NONAME ; void TApaTask::SetWgId(int)
-	?SetWindowGroupName@CApaWindowGroupName@@QAEXPAVHBufC16@@@Z @ 260 NONAME ; void CApaWindowGroupName::SetWindowGroupName(class HBufC16 *)
-	?SetWindowGroupName@CApaWindowGroupName@@QBEHAAVRWindowGroup@@@Z @ 261 NONAME ; int CApaWindowGroupName::SetWindowGroupName(class RWindowGroup &) const
-	?SetWindowGroupNameL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 262 NONAME ; void CApaWindowGroupName::SetWindowGroupNameL(class TDesC16 const &)
-	?ShortCaption@CApaSystemControl@@QBE?AVTPtrC16@@XZ @ 263 NONAME ; class TPtrC16 CApaSystemControl::ShortCaption(void) const
-	?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@@Z @ 264 NONAME ; int RApaLsSession::StartApp(class CApaCommandLine const &)
-	?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@AAVTThreadId@@@Z @ 265 NONAME ; int RApaLsSession::StartApp(class CApaCommandLine const &, class TThreadId &)
-	?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 266 NONAME ; int RApaLsSession::StartApp(class CApaCommandLine const &, class TThreadId &, class TRequestStatus *)
-	?StartDocument@RApaLsSession@@QAEHAAVRFile@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 267 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TThreadId &, class TRequestStatus *)
-	?StartDocument@RApaLsSession@@QAEHAAVRFile@@ABVTDataType@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 268 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TDataType const &, class TThreadId &, class TRequestStatus *)
-	?StartDocument@RApaLsSession@@QAEHAAVRFile@@VTUid@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 269 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TUid, class TThreadId &, class TRequestStatus *)
-	?StartDocument@RApaLsSession@@QAEHABVTDesC16@@AAVTThreadId@@W4TLaunchType@1@@Z @ 270 NONAME ; int RApaLsSession::StartDocument(class TDesC16 const &, class TThreadId &, enum RApaLsSession::TLaunchType)
-	?StartDocument@RApaLsSession@@QAEHABVTDesC16@@ABVTDataType@@AAVTThreadId@@W4TLaunchType@1@@Z @ 271 NONAME ; int RApaLsSession::StartDocument(class TDesC16 const &, class TDataType const &, class TThreadId &, enum RApaLsSession::TLaunchType)
-	?StartDocument@RApaLsSession@@QAEHABVTDesC16@@VTUid@@AAVTThreadId@@W4TLaunchType@1@@Z @ 272 NONAME ; int RApaLsSession::StartDocument(class TDesC16 const &, class TUid, class TThreadId &, enum RApaLsSession::TLaunchType)
-	?StartIdleUpdateL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 273 NONAME ; void CApaAppList::StartIdleUpdateL(class MApaAppListObserver *)
-	?StartIdleUpdateL@CApaAppList@@QAEXXZ @ 274 NONAME ; void CApaAppList::StartIdleUpdateL(void)
-	?StartupApaServer@@YAHAAVMApaAppStarter@@@Z @ 275 NONAME ABSENT ; int StartupApaServer(class MApaAppStarter &)
-	?StartupApaServerProcess@@YAHXZ @ 276 NONAME ; int StartupApaServerProcess(void)
-	?StopScan@CApaAppList@@QAEXH@Z @ 277 NONAME ABSENT ; void CApaAppList::StopScan(int)
-	?StoreL@CApaAppInfoFileWriter@@QAEXXZ @ 278 NONAME ABSENT ; void CApaAppInfoFileWriter::StoreL(void)
-	?SwitchCreateFile@TApaTask@@QAEHABVTDesC16@@@Z @ 279 NONAME ; int TApaTask::SwitchCreateFile(class TDesC16 const &)
-	?SwitchOpenFile@TApaTask@@QAEHABVTDesC16@@@Z @ 280 NONAME ; int TApaTask::SwitchOpenFile(class TDesC16 const &)
-	?TestIconLoaderAndIconArrayL@TIconLoaderAndIconArrayForLeaks@@SAXXZ @ 281 NONAME ; void TIconLoaderAndIconArrayForLeaks::TestIconLoaderAndIconArrayL(void)
-	?ThreadId@TApaTask@@QBE?AVTThreadId@@XZ @ 282 NONAME ; class TThreadId TApaTask::ThreadId(void) const
-	?Type@CApaSystemControl@@QBE?AVTUid@@XZ @ 283 NONAME ; class TUid CApaSystemControl::Type(void) const
-	?Uid@CApaAppViewData@@QBE?AVTUid@@XZ @ 284 NONAME ; class TUid CApaAppViewData::Uid(void) const
-	?Uid@TApaAppServiceInfo@@QBE?AVTUid@@XZ @ 285 NONAME ; class TUid TApaAppServiceInfo::Uid(void) const
-	?UpdateL@CApaSystemControlList@@QAEXXZ @ 286 NONAME ; void CApaSystemControlList::UpdateL(void)
-	?UpdatedAppsList@CApaAppList@@QAEPAVCUpdatedAppsList@@XZ @ 287 NONAME ABSENT ; class CUpdatedAppsList * CApaAppList::UpdatedAppsList(void)
-	?Version@RApaLsSession@@QBE?AVTVersion@@XZ @ 288 NONAME ; class TVersion RApaLsSession::Version(void) const
-	?Views@CApaAppData@@QBEPAV?$CArrayPtrFlat@VCApaAppViewData@@@@XZ @ 289 NONAME ; class CArrayPtrFlat<class CApaAppViewData> * CApaAppData::Views(void) const
-	?WgId@TApaTask@@QBEHXZ @ 290 NONAME ; int TApaTask::WgId(void) const
-	?WindowGroupName@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 291 NONAME ; class TPtrC16 CApaWindowGroupName::WindowGroupName(void) const
-	?KMinApplicationStackSize@@3HB @ 292 NONAME ; int const KMinApplicationStackSize
-	?CheckAppSecurity@CApaSecurityUtils@@SAHABVTPtrC16@@AAH1@Z @ 293 NONAME ; int CApaSecurityUtils::CheckAppSecurity(class TPtrC16 const &, int &, int &)
-	?SetCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 294 NONAME ; void CApaAppData::SetCaptionL(class TDesC16 const &)
-	?SetIconsL@CApaAppData@@QAEXABVTDesC16@@H@Z @ 295 NONAME ; void CApaAppData::SetIconsL(class TDesC16 const &, int)
-	?TestIconCaptionOverridesL@TIconLoaderAndIconArrayForLeaks@@SAXXZ @ 296 NONAME ; void TIconLoaderAndIconArrayForLeaks::TestIconCaptionOverridesL(void)
-	?ForceCommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 297 NONAME ; void RApaLsSession::ForceCommitNonNativeApplicationsUpdatesL(void)
-	?DataTypes@TApaAppServiceInfo@@QAEAAV?$CArrayFixFlat@VTDataTypeWithPriority@@@@XZ @ 298 NONAME ; class CArrayFixFlat<class TDataTypeWithPriority> & TApaAppServiceInfo::DataTypes(void)
-	??0TApaAppIdentifier@@QAE@XZ @ 299 NONAME ; TApaAppIdentifier::TApaAppIdentifier(void)
-	?AddForcedRegistrationL@CApaAppList@@QAEXABVTDesC16@@@Z @ 300 NONAME ABSENT; void CApaAppList::AddForcedRegistrationL(class TDesC16 const &)
-	?ExternalizeL@TApaAppCapability@@QBEXAAVRWriteStream@@@Z @ 301 NONAME ; void TApaAppCapability::ExternalizeL(class RWriteStream &) const
-	??0TApaAppInfo@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@11@Z @ 302 NONAME ; TApaAppInfo::TApaAppInfo(class TUid, class TBuf<256> const &, class TBuf<256> const &, class TBuf<256> const &)
-	?AddEmbeddability@TApaEmbeddabilityFilter@@QAEXW4TEmbeddability@TApaAppCapability@@@Z @ 303 NONAME ; void TApaEmbeddabilityFilter::AddEmbeddability(enum TApaAppCapability::TEmbeddability)
-	?InternalizeL@TApaAppServiceInfo@@QAEXAAVRReadStream@@@Z @ 304 NONAME ; void TApaAppServiceInfo::InternalizeL(class RReadStream &)
-	?InternalizeL@TApaAppViewInfo@@QAEXAAVRReadStream@@@Z @ 305 NONAME ; void TApaAppViewInfo::InternalizeL(class RReadStream &)
-	?MatchesEmbeddability@TApaEmbeddabilityFilter@@QBEHW4TEmbeddability@TApaAppCapability@@@Z @ 306 NONAME ; int TApaEmbeddabilityFilter::MatchesEmbeddability(enum TApaAppCapability::TEmbeddability) const
-	?ExternalizeL@TApaAppServiceInfo@@QBEXAAVRWriteStream@@@Z @ 307 NONAME ; void TApaAppServiceInfo::ExternalizeL(class RWriteStream &) const
-	??0CApaAppServiceInfoArray@@IAE@XZ @ 308 NONAME ; CApaAppServiceInfoArray::CApaAppServiceInfoArray(void)
-	??0TApaAppIdentifier@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@@Z @ 309 NONAME ; TApaAppIdentifier::TApaAppIdentifier(class TUid, class TBuf<256> const &)
-	?CopyCapability@TApaAppCapability@@SAXAAVTDes8@@ABVTDesC8@@@Z @ 310 NONAME ; void TApaAppCapability::CopyCapability(class TDes8 &, class TDesC8 const &)
-	??0TApaAppServiceInfo@@QAE@XZ @ 311 NONAME ; TApaAppServiceInfo::TApaAppServiceInfo(void)
-	?Release@TApaAppServiceInfo@@QAEXXZ @ 312 NONAME ; void TApaAppServiceInfo::Release(void)
-	?UpdateAppListByShortCaptionL@CApaAppList@@QAEXXZ @ 313 NONAME ; void CApaAppList::UpdateAppListByShortCaptionL(void)
-	?ExternalizeL@TApaAppIdentifier@@QBEXAAVRWriteStream@@@Z @ 314 NONAME ; void TApaAppIdentifier::ExternalizeL(class RWriteStream &) const
-	?ExternalizeL@TApaAppViewInfo@@QBEXAAVRWriteStream@@@Z @ 315 NONAME ; void TApaAppViewInfo::ExternalizeL(class RWriteStream &) const
-	?NewL@CApaAppList@@SAPAV1@AAVRFs@@HH@Z @ 316 NONAME ; class CApaAppList * CApaAppList::NewL(class RFs &, int, int)
-	?CApaAppServiceInfoArray_Reserved1@CApaAppServiceInfoArray@@EAEXXZ @ 317 NONAME ; void CApaAppServiceInfoArray::CApaAppServiceInfoArray_Reserved1(void)
-	?ExternalizeL@TApaAppInfo@@QBEXAAVRWriteStream@@@Z @ 318 NONAME ; void TApaAppInfo::ExternalizeL(class RWriteStream &) const
-	?InternalizeL@TApaAppCapability@@QAEXAAVRReadStream@@@Z @ 319 NONAME ; void TApaAppCapability::InternalizeL(class RReadStream &)
-	??0TApaAppEntry@@QAE@XZ @ 320 NONAME ; TApaAppEntry::TApaAppEntry(void)
-	?AddCustomAppInfoInListL@CApaAppList@@QAEXVTUid@@W4TLanguage@@ABVTDesC16@@@Z @ 321 NONAME ; void CApaAppList::AddCustomAppInfoInListL(class TUid, enum TLanguage, class TDesC16 const &)
-	?CApaAppServiceInfoArray_Reserved2@CApaAppServiceInfoArray@@EAEXXZ @ 322 NONAME ; void CApaAppServiceInfoArray::CApaAppServiceInfoArray_Reserved2(void)
-	?UpdateAppListByIconCaptionOverridesL@CApaAppList@@QAEXXZ @ 323 NONAME ; void CApaAppList::UpdateAppListByIconCaptionOverridesL(void)
-	??0TApaAppInfo@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@1@Z @ 324 NONAME ; TApaAppInfo::TApaAppInfo(class TUid, class TBuf<256> const &, class TBuf<256> const &)
-	?InternalizeL@TApaAppInfo@@QAEXAAVRReadStream@@@Z @ 325 NONAME ; void TApaAppInfo::InternalizeL(class RReadStream &)
-	??0TApaEmbeddabilityFilter@@QAE@XZ @ 326 NONAME ; TApaEmbeddabilityFilter::TApaEmbeddabilityFilter(void)
-	?InternalizeL@TApaAppIdentifier@@QAEXAAVRReadStream@@@Z @ 327 NONAME ; void TApaAppIdentifier::InternalizeL(class RReadStream &)
-	??0TApaAppViewInfo@@QAE@XZ @ 328 NONAME ; TApaAppViewInfo::TApaAppViewInfo(void)
-	??0TApaAppInfo@@QAE@XZ @ 329 NONAME ; TApaAppInfo::TApaAppInfo(void)
-	??0TApaAppViewInfo@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@H@Z @ 330 NONAME ; TApaAppViewInfo::TApaAppViewInfo(class TUid, class TBuf<256> const &, int)
-	??0TApaAppServiceInfo@@QAE@VTUid@@PAV?$CArrayFixFlat@VTDataTypeWithPriority@@@@PAVHBufC8@@@Z @ 331 NONAME ; TApaAppServiceInfo::TApaAppServiceInfo(class TUid, class CArrayFixFlat<class TDataTypeWithPriority> *, class HBufC8 *)
-	?AppListUpdatePending@CApaAppList@@QAEHXZ @ 332 NONAME ABSENT ; int CApaAppList::AppListUpdatePending(void)
-	?RecognizeData@RApaLsSession@@QBEHABVTDesC8@@AAVTDataRecognitionResult@@@Z @ 333 NONAME ; TInt RecognizeData(class TDesC8 const &, class TDataRecognitionResult & ) const
-	?UninstalledAppArray@CApaAppList@@QAEPAV?$CArrayFixFlat@VTUid@@@@XZ @ 334 NONAME ; class CArrayFixFlat<class TUid> * CApaAppList::UninstalledAppArray(void)
-	?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@VTUid@@@Z @ 335 NONAME ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class TUid)
-	?NewL@CApaAppData@@SAPAV1@ABVCApplicationRegistrationData@Usif@@AAVRFs@@ABVRSoftwareComponentRegistry@3@@Z @ 336 NONAME ; class CApaAppData * CApaAppData::NewL(class Usif::CApplicationRegistrationData const &, class RFs &, class Usif::RSoftwareComponentRegistry const &)
-	?InitializeApplistL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 337 NONAME ; void CApaAppList::InitializeApplistL(class MApaAppListObserver *)
-	??0TApaAppUpdateInfo@@QAE@XZ @ 338 NONAME ; TApaAppUpdateInfo::TApaAppUpdateInfo(void)
-	?InternalizeL@TApaAppUpdateInfo@@QAEXAAVRReadStream@@@Z @ 339 NONAME ; void TApaAppUpdateInfo::InternalizeL(class RReadStream &)
-	?UpdateAppListL@RApaLsSession@@QAEHAAV?$RArray@VTApaAppUpdateInfo@@@@@Z @ 340 NONAME ; int RApaLsSession::UpdateAppListL(class RArray<class TApaAppUpdateInfo> &)
-	?ExternalizeL@TApaAppUpdateInfo@@QBEXAAVRWriteStream@@@Z @ 341 NONAME ; void TApaAppUpdateInfo::ExternalizeL(class RWriteStream &) const
-	??0TApaAppUpdateInfo@@QAE@VTUid@@W4TApaAppAction@0@@Z @ 342 NONAME ; TApaAppUpdateInfo::TApaAppUpdateInfo(class TUid, enum TApaAppUpdateInfo::TApaAppAction)
-	?UpdateApplistByForceRegAppsL@CApaAppList@@QAEXAAV?$RPointerArray@VCApplicationRegistrationData@Usif@@@@@Z @ 343 NONAME ; void CApaAppList::UpdateApplistByForceRegAppsL(class RPointerArray<class Usif::CApplicationRegistrationData> &)
-	?UpdatedAppsInfo@CApaAppList@@QAEPAV?$CArrayFixFlat@VTApaAppUpdateInfo@@@@XZ @ 344 NONAME ; class CArrayFixFlat<class TApaAppUpdateInfo> * CApaAppList::UpdatedAppsInfo(void)
-	?UpdateApplistL@CApaAppList@@QAEXPAVMApaAppListObserver@@PAV?$RArray@VTApaAppUpdateInfo@@@@VTUid@@@Z @ 345 NONAME ; void CApaAppList::UpdateApplistL(class MApaAppListObserver *, class RArray<class TApaAppUpdateInfo> *, class TUid)
-	?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VCApplicationRegistrationData@Usif@@@@@Z @ 346 NONAME ; int RApaLsSession::ForceRegistration(class RPointerArray<class Usif::CApplicationRegistrationData> const &)
-	?UpdatedAppsInfoL@RApaLsSession@@QAEHAAV?$RArray@VTApaAppUpdateInfo@@@@@Z @ 347 NONAME ; int RApaLsSession::UpdatedAppsInfoL(class RArray<class TApaAppUpdateInfo> &)
-	?IsLangChangePending@CApaAppData@@QAEHXZ @ 348 NONAME ; int CApaAppData::IsLangChangePending(void)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/bwins/apfileu.def	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,72 @@
+EXPORTS
+	??0CApaScanningFileRecognizer@@IAE@AAVRFs@@PAVMApaAppStarter@@@Z @ 1 NONAME ABSENT 
+	??1CApaAppLocatorProxy@@UAE@XZ @ 2 NONAME ABSENT
+	??1CApaScanningAppFinder@@UAE@XZ @ 3 NONAME ABSENT
+	??1CApaScanningFileRecognizer@@UAE@XZ @ 4 NONAME ABSENT 
+	?ConstructL@CApaScanningFileRecognizer@@IAEXXZ @ 5 NONAME ABSENT 
+	?DefaultAppInfoFileName@CApaScanningAppFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 6 NONAME ABSENT
+	?FindAllAppsL@CApaScanningAppFinder@@UAEXXZ @ 7 NONAME ABSENT
+	?FindAppL@CApaScanningAppFinder@@UAE?AV?$TBuf@$0BAA@@@ABVTDesC16@@VTUid@@@Z @ 8 NONAME ABSENT
+	?GetAppCapabilityByUid@CApaAppLocatorProxy@@UAEHAAVTDes8@@VTUid@@@Z @ 9 NONAME ABSENT
+	?GetAppEntryByUid@CApaAppLocatorProxy@@UAEHAAVTApaAppEntry@@VTUid@@@Z @ 10 NONAME ABSENT
+	?NewL@CApaAppLocatorProxy@@SAPAV1@AAVRFs@@@Z @ 11 NONAME ABSENT
+	?NewL@CApaScanningAppFinder@@SAPAV1@ABVRFs@@@Z @ 12 NONAME ABSENT
+	?NewL@CApaScanningFileRecognizer@@SAPAV1@AAVRFs@@PAVMApaAppStarter@@@Z @ 13 NONAME ABSENT 
+	?NewLC@CApaScanningAppFinder@@SAPAV1@ABVRFs@@@Z @ 14 NONAME ABSENT
+	?NextL@CApaScanningAppFinder@@UAEHAAVTApaAppEntry@@@Z @ 15 NONAME ABSENT
+	?RecognizerCount@CApaScanningFileRecognizer@@QAEHXZ @ 16 NONAME ABSENT 
+	?RecognizerListLC@CApaScanningFileRecognizer@@QBEPAV?$CArrayFixFlat@VRRecognizer@CApaScanningFileRecognizer@@@@XZ @ 17 NONAME ABSENT 
+	?ScanForRecognizersL@CApaScanningFileRecognizer@@QAEXXZ @ 18 NONAME ABSENT 
+	?SetRecognizersFromListL@CApaScanningFileRecognizer@@QAEXABV?$CArrayFixFlat@VTRecognizer@CApaScanningFileRecognizer@@@@@Z @ 19 NONAME ABSENT
+	?TempPath@CApaScanningAppFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 20 NONAME ABSENT
+	?TempPath@Apfile@@SA?AVTPtrC16@@XZ @ 21 NONAME ABSENT
+	??ACApaScanningFileRecognizer@@QBEABVRRecognizer@0@H@Z @ 22 NONAME ABSENT ; class CApaScanningFileRecognizer::RRecognizer const & CApaScanningFileRecognizer::operator[](int) const
+	?SetRecognizerL@CApaScanningFileRecognizer@@QAEXABVTRecognizer@1@@Z @ 23 NONAME ABSENT
+	?UpdateCounter@CApaScanningFileRecognizer@@QBEHXZ @ 24 NONAME ABSENT 
+	??1CApaScanningControlFinder@@UAE@XZ @ 25 NONAME ABSENT
+	?DefaultAppInfoFileName@CApaScanningControlFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 26 NONAME ABSENT
+	?FindAllAppsL@CApaScanningControlFinder@@UAEXXZ @ 27 NONAME ABSENT
+	?FindAppL@CApaScanningControlFinder@@UAE?AV?$TBuf@$0BAA@@@ABVTDesC16@@VTUid@@@Z @ 28 NONAME ABSENT
+	?NewL@CApaScanningControlFinder@@SAPAV1@ABVRFs@@@Z @ 29 NONAME ABSENT
+	?NewLC@CApaScanningControlFinder@@SAPAV1@ABVRFs@@@Z @ 30 NONAME ABSENT
+	?NextL@CApaScanningControlFinder@@UAEHAAVTApaAppEntry@@@Z @ 31 NONAME ABSENT
+	?TempPath@CApaScanningControlFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 32 NONAME ABSENT
+	?SetEcomRecognizerL@CApaScanningFileRecognizer@@QAEXABVRRecognizer@1@@Z @ 33 NONAME ABSENT 
+	?SetEcomRecognizersFromListL@CApaScanningFileRecognizer@@QAEXABV?$CArrayFixFlat@VRRecognizer@CApaScanningFileRecognizer@@@@@Z @ 34 NONAME ABSENT 
+	?FindAllAppsL@CApaAppRegFinder@@QAEXXZ @ 35 NONAME ABSENT ; void CApaAppRegFinder::FindAllAppsL(void)
+	?FindAppL@CApaAppRegFinder@@QAE?AV?$TBuf@$0BAA@@@ABVTDesC16@@VTUid@@@Z @ 36 NONAME ABSENT ; class TBuf<256> CApaAppRegFinder::FindAppL(class TDesC16 const &, class TUid)
+	?NewL@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 37 NONAME ABSENT ; class CApaAppRegFinder * CApaAppRegFinder::NewL(class RFs const &)
+	?NewLC@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 38 NONAME ABSENT ; class CApaAppRegFinder * CApaAppRegFinder::NewLC(class RFs const &)
+	?NextL@CApaAppRegFinder@@QAEHAAVTApaAppEntry@@ABV?$RPointerArray@VHBufC16@@@@@Z @ 39 NONAME ABSENT ; int CApaAppRegFinder::NextL(class TApaAppEntry &, class RPointerArray<class HBufC16> const &)
+	?TempPath@CApaAppRegFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 40 NONAME ABSENT ; class TBuf<256> CApaAppRegFinder::TempPath(void) const
+	??1CAppLaunchChecker@@UAE@XZ @ 41 NONAME ; CAppLaunchChecker::~CAppLaunchChecker(void)
+	??ACApaScanningRuleBasedPlugIns@@QBEPAVCAppLaunchChecker@@H@Z @ 42 NONAME ; class CAppLaunchChecker * CApaScanningRuleBasedPlugIns::operator[](int) const
+	??1CApaScanningRuleBasedPlugIns@@UAE@XZ @ 43 NONAME ; CApaScanningRuleBasedPlugIns::~CApaScanningRuleBasedPlugIns(void)
+	?NewL@CApaScanningRuleBasedPlugIns@@SAPAV1@XZ @ 44 NONAME ; class CApaScanningRuleBasedPlugIns * CApaScanningRuleBasedPlugIns::NewL(void)
+	?ScanForRuleBasedPlugInsL@CApaScanningRuleBasedPlugIns@@QAEXXZ @ 45 NONAME ; void CApaScanningRuleBasedPlugIns::ScanForRuleBasedPlugInsL(void)
+	?ImplementationCount@CApaScanningRuleBasedPlugIns@@QBEHXZ @ 46 NONAME ; int CApaScanningRuleBasedPlugIns::ImplementationCount(void) const
+	?Reserved_1@CAppLaunchChecker@@EAEXXZ @ 47 NONAME ; void CAppLaunchChecker::Reserved_1(void)
+	?Reserved_2@CAppLaunchChecker@@EAEXXZ @ 48 NONAME ; void CAppLaunchChecker::Reserved_2(void)
+	?Reserved_3@CAppLaunchChecker@@EAEXXZ @ 49 NONAME ; void CAppLaunchChecker::Reserved_3(void)
+	??1CAppSidChecker@@UAE@XZ @ 50 NONAME ABSENT ; CAppSidChecker::~CAppSidChecker(void)
+	?SetRescanCallBackL@CAppSidChecker@@UAEXABVTCallBack@@@Z @ 51 NONAME ABSENT ; void CAppSidChecker::SetRescanCallBackL(class TCallBack const &)
+	?reserved1@CAppSidChecker@@EAEXXZ @ 52 NONAME ABSENT ; void CAppSidChecker::reserved1(void)
+	?reserved2@CAppSidChecker@@EAEXXZ @ 53 NONAME ABSENT ; void CAppSidChecker::reserved2(void)
+	?reserved3@CAppSidChecker@@EAEXXZ @ 54 NONAME ABSENT ; void CAppSidChecker::reserved3(void)
+	?DriveList@CApaAppRegFinder@@QBEABV?$RArray@VTDriveUnitInfo@@@@XZ @ 55 NONAME ABSENT ; class RArray<class TDriveUnitInfo> const & CApaAppRegFinder::DriveList(void) const
+	?FindAllRemovableMediaAppsL@CApaAppRegFinder@@QAEXXZ @ 56 NONAME ABSENT ; void CApaAppRegFinder::FindAllRemovableMediaAppsL(void)
+	??1CApaAppInstallationMonitor@@UAE@XZ @ 57 NONAME ABSENT; CApaAppInstallationMonitor::~CApaAppInstallationMonitor(void)
+	?NewL@CApaAppInstallationMonitor@@SAPAV1@PAVCApaAppArcServer@@@Z @ 58  NONAME ABSENT; class CApaAppInstallationMonitor * CApaAppInstallationMonitor::NewL(class CApaAppArcServer *)
+	?Start@CApaAppInstallationMonitor@@QAEXXZ @ 59 NONAME ABSENT; void CApaAppInstallationMonitor::Start(void)
+	??1CApfMimeContentPolicy@@UAE@XZ @ 60 NONAME ; CApfMimeContentPolicy::~CApfMimeContentPolicy(void)
+	?IsClosedExtension@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 61 NONAME ; int CApfMimeContentPolicy::IsClosedExtension(class TDesC16 const &)
+	?IsClosedFileL@CApfMimeContentPolicy@@QAEHAAVRFile@@@Z @ 62 NONAME ; int CApfMimeContentPolicy::IsClosedFileL(class RFile &)
+	?IsClosedFileL@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 63 NONAME ; int CApfMimeContentPolicy::IsClosedFileL(class TDesC16 const &)
+	?IsClosedType@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 64 NONAME ; int CApfMimeContentPolicy::IsClosedType(class TDesC16 const &)
+	?IsDRMEnvelopeL@CApfMimeContentPolicy@@QAEHAAVRFile@@@Z @ 65 NONAME ; int CApfMimeContentPolicy::IsDRMEnvelopeL(class RFile &)
+	?IsDRMEnvelopeL@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 66 NONAME ; int CApfMimeContentPolicy::IsDRMEnvelopeL(class TDesC16 const &)
+	?NewL@CApfMimeContentPolicy@@SAPAV1@AAVRFs@@@Z @ 67 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewL(class RFs &)
+	?NewL@CApfMimeContentPolicy@@SAPAV1@XZ @ 68 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewL(void)
+	?NewLC@CApfMimeContentPolicy@@SAPAV1@AAVRFs@@@Z @ 69 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewLC(class RFs &)
+	?NewLC@CApfMimeContentPolicy@@SAPAV1@XZ @ 70 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewLC(void)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/bwins/apgrfxu.def	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,345 @@
+EXPORTS
+	??0RApaLsSession@@QAE@XZ @ 1 NONAME ; public: __thiscall RApaLsSession::RApaLsSession(void)
+	??0TApaPictureFactory@@QAE@PAVCApaProcess@@@Z @ 2 NONAME ; public: __thiscall TApaPictureFactory::TApaPictureFactory(class CApaProcess *)
+	??0TApaTask@@QAE@AAVRWsSession@@@Z @ 3 NONAME ; public: __thiscall TApaTask::TApaTask(class RWsSession &)
+	??0TApaTaskList@@QAE@AAVRWsSession@@@Z @ 4 NONAME ; public: __thiscall TApaTaskList::TApaTaskList(class RWsSession &)
+	??1CApaAppInfoFileReader@@UAE@XZ @ 5 NONAME ABSENT ; public: virtual __thiscall CApaAppInfoFileReader::~CApaAppInfoFileReader(void)
+	??1CApaAppInfoFileWriter@@UAE@XZ @ 6 NONAME ABSENT ; public: virtual __thiscall CApaAppInfoFileWriter::~CApaAppInfoFileWriter(void)
+	??1CApaAppList@@UAE@XZ @ 7 NONAME ABSENT ; public: virtual __thiscall CApaAppList::~CApaAppList(void)
+	??1CApaDoor@@UAE@XZ @ 8 NONAME ; public: virtual __thiscall CApaDoor::~CApaDoor(void)
+	??1CApaMaskedBitmap@@UAE@XZ @ 9 NONAME ; public: virtual __thiscall CApaMaskedBitmap::~CApaMaskedBitmap(void)
+	??1CApaWindowGroupName@@UAE@XZ @ 10 NONAME ; public: virtual __thiscall CApaWindowGroupName::~CApaWindowGroupName(void)
+	?AddCaptionL@CApaAppInfoFileWriter@@QAEXW4TLanguage@@ABVTDesC16@@@Z @ 11 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddCaptionL(enum TLanguage,class TDesC16 const &)
+	?AddIconL@CApaAppInfoFileWriter@@QAEXAAVCApaMaskedBitmap@@@Z @ 12 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddIconL(class CApaMaskedBitmap &)
+	?AddIconL@CApaAppInfoFileWriter@@QAEXABVTDesC16@@@Z @ 13 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddIconL(class TDesC16 const &)
+	?AppCount@RApaLsSession@@QBEHAAH@Z @ 14 NONAME ; public: int __thiscall RApaLsSession::AppCount(int &)const 
+	?AppDataByUid@CApaAppList@@QBEPAVCApaAppData@@VTUid@@@Z @ 15 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::AppDataByUid(class TUid)const 
+	?AppEntry@CApaAppData@@QBE?AVTApaAppEntry@@XZ @ 16 NONAME ABSENT ; public: class TApaAppEntry  __thiscall CApaAppData::AppEntry(void)const 
+	?AppUid@CApaWindowGroupName@@QBE?AVTUid@@XZ @ 17 NONAME ; public: class TUid  __thiscall CApaWindowGroupName::AppUid(void)const 
+	?AppUidL@CApaDoor@@QBE?AVTUid@@XZ @ 18 NONAME ; public: class TUid  __thiscall CApaDoor::AppUidL(void)const 
+	?BringToForeground@TApaTask@@QAEXXZ @ 19 NONAME ; public: void __thiscall TApaTask::BringToForeground(void)
+	?Capability@CApaAppData@@QBEXAAVTDes8@@@Z @ 20 NONAME ABSENT ; public: void __thiscall CApaAppData::Capability(class TDes8 &)const 
+	?Capability@CApaAppInfoFileReader@@QBEXAAVTDes8@@@Z @ 21 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileReader::Capability(class TDes8 &)const 
+	?Caption@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 22 NONAME ; public: class TPtrC16  __thiscall CApaWindowGroupName::Caption(void)const 
+	?CaptionL@CApaAppInfoFileReader@@QAE?AV?$TBuf@$0BAA@@@W4TLanguage@@@Z @ 23 NONAME ABSENT ; public: class TBuf<256>  __thiscall CApaAppInfoFileReader::CaptionL(enum TLanguage)
+	?Connect@RApaLsSession@@QAEHXZ @ 24 NONAME ; public: int __thiscall RApaLsSession::Connect(void)
+	?ConstructFromWgIdL@CApaWindowGroupName@@QAEXH@Z @ 25 NONAME ; public: void __thiscall CApaWindowGroupName::ConstructFromWgIdL(int)
+	?Count@CApaAppList@@QBEHXZ @ 26 NONAME ABSENT ; public: int __thiscall CApaAppList::Count(void)const 
+	?CreateMaskedBitmapL@CApaAppInfoFileReader@@QAEPAVCApaMaskedBitmap@@H@Z @ 27 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAppInfoFileReader::CreateMaskedBitmapL(int)
+	?CycleTasks@TApaTaskList@@QAEHVTUid@@W4TCycleDirection@1@@Z @ 28 NONAME ; public: int __thiscall TApaTaskList::CycleTasks(class TUid,enum TApaTaskList::TCycleDirection)
+	?DocName@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 29 NONAME ; public: class TPtrC16  __thiscall CApaWindowGroupName::DocName(void)const 
+	?DocNameIsAFile@CApaWindowGroupName@@QBEHXZ @ 30 NONAME ; public: int __thiscall CApaWindowGroupName::DocNameIsAFile(void)const 
+	?DocumentL@CApaDoor@@QAEPAVCApaDocument@@H@Z @ 31 NONAME ; public: class CApaDocument * __thiscall CApaDoor::DocumentL(int)
+	?EmbeddableAppCount@RApaLsSession@@QBEHAAH@Z @ 32 NONAME ; public: int __thiscall RApaLsSession::EmbeddableAppCount(int &)const 
+	?EndTask@TApaTask@@QAEXXZ @ 33 NONAME ; public: void __thiscall TApaTask::EndTask(void)
+	?Exists@TApaTask@@QBEHXZ @ 34 NONAME ; public: int __thiscall TApaTask::Exists(void)const 
+	?ExternalizeL@CApaMaskedBitmap@@QBEXAAVRWriteStream@@@Z @ 35 NONAME ; public: void __thiscall CApaMaskedBitmap::ExternalizeL(class RWriteStream &)const 
+	?FindApp@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 36 NONAME ; public: class TApaTask  __thiscall TApaTaskList::FindApp(class TDesC16 const &)
+	?FindApp@TApaTaskList@@QAE?AVTApaTask@@VTUid@@@Z @ 37 NONAME ; public: class TApaTask  __thiscall TApaTaskList::FindApp(class TUid)
+	?FindByAppUid@CApaWindowGroupName@@SAXVTUid@@AAVRWsSession@@AAH@Z @ 38 NONAME ; public: static void __cdecl CApaWindowGroupName::FindByAppUid(class TUid,class RWsSession &,int &)
+	?FindByCaption@CApaWindowGroupName@@SAXABVTDesC16@@AAVRWsSession@@AAH@Z @ 39 NONAME ; public: static void __cdecl CApaWindowGroupName::FindByCaption(class TDesC16 const &,class RWsSession &,int &)
+	?FindByDocName@CApaWindowGroupName@@SAXABVTDesC16@@AAVRWsSession@@AAH@Z @ 40 NONAME ; public: static void __cdecl CApaWindowGroupName::FindByDocName(class TDesC16 const &,class RWsSession &,int &)
+	?FindByPos@TApaTaskList@@QAE?AVTApaTask@@H@Z @ 41 NONAME ; public: class TApaTask  __thiscall TApaTaskList::FindByPos(int)
+	?FindDoc@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 42 NONAME ; public: class TApaTask  __thiscall TApaTaskList::FindDoc(class TDesC16 const &)
+	?FirstApp@CApaAppList@@QBEPAVCApaAppData@@XZ @ 43 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::FirstApp(void)const 
+	?GetAllApps@RApaLsSession@@QBEHXZ @ 44 NONAME ; public: int __thiscall RApaLsSession::GetAllApps(void)const 
+	?GetAppCapability@RApaLsSession@@QBEHAAVTDes8@@VTUid@@@Z @ 45 NONAME ; public: int __thiscall RApaLsSession::GetAppCapability(class TDes8 &,class TUid)const 
+	?GetAppInfo@RApaLsSession@@QBEHAAVTApaAppInfo@@VTUid@@@Z @ 46 NONAME ; public: int __thiscall RApaLsSession::GetAppInfo(class TApaAppInfo &,class TUid)const 
+	?GetEmbeddableApps@RApaLsSession@@QBEHXZ @ 47 NONAME ; public: int __thiscall RApaLsSession::GetEmbeddableApps(void)const 
+	?GetNextApp@RApaLsSession@@QBEHAAVTApaAppInfo@@@Z @ 48 NONAME ; public: int __thiscall RApaLsSession::GetNextApp(class TApaAppInfo &)const 
+	?InternalizeL@CApaMaskedBitmap@@QAEXAAVRReadStream@@@Z @ 49 NONAME ; public: void __thiscall CApaMaskedBitmap::InternalizeL(class RReadStream &)
+	?IsBusy@CApaWindowGroupName@@QBEHXZ @ 50 NONAME ; public: int __thiscall CApaWindowGroupName::IsBusy(void)const 
+	?IsSystem@CApaWindowGroupName@@QBEHXZ @ 51 NONAME ; public: int __thiscall CApaWindowGroupName::IsSystem(void)const 
+	?KillTask@TApaTask@@QAEXXZ @ 52 NONAME ; public: void __thiscall TApaTask::KillTask(void)
+	?Mask@CApaMaskedBitmap@@QBEPAVCFbsBitmap@@XZ @ 53 NONAME ; public: class CFbsBitmap * __thiscall CApaMaskedBitmap::Mask(void)const 
+	?New@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@PAVHBufC16@@@Z @ 54 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::New(class RWsSession const &,class HBufC16 *)
+	?NewL@CApaAppInfoFileReader@@SAPAV1@AAVRFs@@ABVTDesC16@@VTUid@@@Z @ 55 NONAME ABSENT ; public: static class CApaAppInfoFileReader * __cdecl CApaAppInfoFileReader::NewL(class RFs &,class TDesC16 const &,class TUid)
+	?NewL@CApaAppList@@SAPAV1@AAVRFs@@PAVCApaAppRegFinder@@HH@Z @ 56 NONAME ABSENT ; class CApaAppList * CApaAppList::NewL(class RFs &, class CApaAppRegFinder *, int, int)
+	?NewL@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 57 NONAME ; public: static class CApaDoor * __cdecl CApaDoor::NewL(class RFs &,class CApaDocument &,class TSize const &)
+	?NewL@CApaDoor@@SAPAV1@AAVRFs@@ABVCStreamStore@@VTStreamId@@AAVCApaProcess@@@Z @ 58 NONAME ; public: static class CApaDoor * __cdecl CApaDoor::NewL(class RFs &,class CStreamStore const &,class TStreamId,class CApaProcess &)
+	?NewL@CApaMaskedBitmap@@SAPAV1@PBV1@@Z @ 59 NONAME ; class CApaMaskedBitmap * CApaMaskedBitmap::NewL(class CApaMaskedBitmap const *)
+	?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@@Z @ 60 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewL(class RWsSession const &)
+	?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@ABVTDesC16@@@Z @ 61 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewL(class RWsSession const &,class TDesC16 const &)
+	?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@H@Z @ 62 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewL(class RWsSession const &,int)
+	?NewLC@CApaAppInfoFileReader@@SAPAV1@AAVRFs@@ABVTDesC16@@VTUid@@@Z @ 63 NONAME ABSENT ; public: static class CApaAppInfoFileReader * __cdecl CApaAppInfoFileReader::NewLC(class RFs &,class TDesC16 const &,class TUid)
+	?NewLC@CApaAppInfoFileWriter@@SAPAV1@AAVRFs@@ABVTDesC16@@VTUid@@@Z @ 64 NONAME ABSENT ; public: static class CApaAppInfoFileWriter * __cdecl CApaAppInfoFileWriter::NewLC(class RFs &,class TDesC16 const &,class TUid)
+	?NewLC@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 65 NONAME ; public: static class CApaDoor * __cdecl CApaDoor::NewLC(class RFs &,class CApaDocument &,class TSize const &)
+	?NewLC@CApaMaskedBitmap@@SAPAV1@XZ @ 66 NONAME ; public: static class CApaMaskedBitmap * __cdecl CApaMaskedBitmap::NewLC(void)
+	?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@@Z @ 67 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewLC(class RWsSession const &)
+	?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@ABVTDesC16@@@Z @ 68 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewLC(class RWsSession const &,class TDesC16 const &)
+	?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@H@Z @ 69 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewLC(class RWsSession const &,int)
+	?NewPictureL@TApaPictureFactory@@UBEXAAVTPictureHeader@@ABVCStreamStore@@@Z @ 70 NONAME ; public: virtual void __thiscall TApaPictureFactory::NewPictureL(class TPictureHeader &,class CStreamStore const &)const 
+	?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@@Z @ 71 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::NextApp(class CApaAppData const *)const 
+	?PurgeL@CApaAppList@@QAEXXZ @ 72 NONAME ABSENT ; public: void __thiscall CApaAppList::PurgeL(void)
+	?RespondsToShutdownEvent@CApaWindowGroupName@@QBEHXZ @ 73 NONAME ; public: int __thiscall CApaWindowGroupName::RespondsToShutdownEvent(void)const 
+	?RespondsToSwitchFilesEvent@CApaWindowGroupName@@QBEHXZ @ 74 NONAME ; public: int __thiscall CApaWindowGroupName::RespondsToSwitchFilesEvent(void)const 
+	?RestoreL@CApaDoor@@QAEXABVCStreamStore@@VTStreamId@@@Z @ 75 NONAME ; public: void __thiscall CApaDoor::RestoreL(class CStreamStore const &,class TStreamId)
+	?SendKey@TApaTask@@QAEXABUTKeyEvent@@@Z @ 76 NONAME ; public: void __thiscall TApaTask::SendKey(struct TKeyEvent const &)
+	?SendKey@TApaTask@@QAEXHH@Z @ 77 NONAME ; public: void __thiscall TApaTask::SendKey(int,int)
+	?SendMessage@TApaTask@@QAEHVTUid@@ABVTDesC8@@@Z @ 78 NONAME ; public: int __thiscall TApaTask::SendMessage(class TUid,class TDesC8 const &)
+	?SendSystemEvent@TApaTask@@QAEXW4TApaSystemEvent@@@Z @ 79 NONAME ; public: void __thiscall TApaTask::SendSystemEvent(enum TApaSystemEvent)
+	?SendToBackground@TApaTask@@QAEXXZ @ 80 NONAME ; public: void __thiscall TApaTask::SendToBackground(void)
+	?SetAppUid@CApaWindowGroupName@@QAEXVTUid@@@Z @ 81 NONAME ; public: void __thiscall CApaWindowGroupName::SetAppUid(class TUid)
+	?SetBusy@CApaWindowGroupName@@QAEXH@Z @ 82 NONAME ; public: void __thiscall CApaWindowGroupName::SetBusy(int)
+	?SetCapability@CApaAppInfoFileWriter@@QAEHABVTDesC8@@@Z @ 83 NONAME ABSENT ; public: int __thiscall CApaAppInfoFileWriter::SetCapability(class TDesC8 const &)
+	?SetCaptionL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 84 NONAME ; public: void __thiscall CApaWindowGroupName::SetCaptionL(class TDesC16 const &)
+	?SetDocNameIsAFile@CApaWindowGroupName@@QAEXH@Z @ 85 NONAME ; public: void __thiscall CApaWindowGroupName::SetDocNameIsAFile(int)
+	?SetDocNameL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 86 NONAME ; public: void __thiscall CApaWindowGroupName::SetDocNameL(class TDesC16 const &)
+	?SetFormatToGlassL@CApaDoor@@QAEXXZ @ 87 NONAME ; public: void __thiscall CApaDoor::SetFormatToGlassL(void)
+	?SetFormatToIconL@CApaDoor@@QAEXXZ @ 88 NONAME ; public: void __thiscall CApaDoor::SetFormatToIconL(void)
+	?SetFormatToTemporaryIconL@CApaDoor@@QAEXH@Z @ 89 NONAME ; public: void __thiscall CApaDoor::SetFormatToTemporaryIconL(int)
+	?SetRespondsToShutdownEvent@CApaWindowGroupName@@QAEXH@Z @ 90 NONAME ; public: void __thiscall CApaWindowGroupName::SetRespondsToShutdownEvent(int)
+	?SetRespondsToSwitchFilesEvent@CApaWindowGroupName@@QAEXH@Z @ 91 NONAME ; public: void __thiscall CApaWindowGroupName::SetRespondsToSwitchFilesEvent(int)
+	?SetSystem@CApaWindowGroupName@@QAEXH@Z @ 92 NONAME ; public: void __thiscall CApaWindowGroupName::SetSystem(int)
+	?SetWgId@TApaTask@@QAEXH@Z @ 93 NONAME ; public: void __thiscall TApaTask::SetWgId(int)
+	?SetWindowGroupName@CApaWindowGroupName@@QAEXPAVHBufC16@@@Z @ 94 NONAME ; public: void __thiscall CApaWindowGroupName::SetWindowGroupName(class HBufC16 *)
+	?SetWindowGroupName@CApaWindowGroupName@@QBEHAAVRWindowGroup@@@Z @ 95 NONAME ; public: int __thiscall CApaWindowGroupName::SetWindowGroupName(class RWindowGroup &)const 
+	?SetWindowGroupNameL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 96 NONAME ; public: void __thiscall CApaWindowGroupName::SetWindowGroupNameL(class TDesC16 const &)
+	?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@@Z @ 97 NONAME ; public: int __thiscall RApaLsSession::StartApp(class CApaCommandLine const &)
+	?StoreL@CApaAppInfoFileWriter@@QAEXXZ @ 98 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::StoreL(void)
+	?StretchDrawL@CApaAppInfoFileReader@@SAXPAVCFbsBitmap@@0VTSize@@@Z @ 99 NONAME ABSENT ; public: static void __cdecl CApaAppInfoFileReader::StretchDrawL(class CFbsBitmap *,class CFbsBitmap *,class TSize)
+	?SwitchCreateFile@TApaTask@@QAEHABVTDesC16@@@Z @ 100 NONAME ; public: int __thiscall TApaTask::SwitchCreateFile(class TDesC16 const &)
+	?SwitchOpenFile@TApaTask@@QAEHABVTDesC16@@@Z @ 101 NONAME ; public: int __thiscall TApaTask::SwitchOpenFile(class TDesC16 const &)
+	?ThreadId@TApaTask@@QBE?AVTThreadId@@XZ @ 102 NONAME ; public: class TThreadId  __thiscall TApaTask::ThreadId(void)const 
+	?UpdateCounter@CApaAppList@@QBEHXZ @ 103 NONAME ABSENT ; public: int __thiscall CApaAppList::UpdateCounter(void)const 
+	?UpdateL@CApaAppList@@QAEXXZ @ 104 NONAME ABSENT ; public: void __thiscall CApaAppList::UpdateL(void)
+	?Version@RApaLsSession@@QBE?AVTVersion@@XZ @ 105 NONAME ; public: class TVersion  __thiscall RApaLsSession::Version(void)const 
+	?WgId@TApaTask@@QBEHXZ @ 106 NONAME ; public: int __thiscall TApaTask::WgId(void)const 
+	?WindowGroupName@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 107 NONAME ; public: class TPtrC16  __thiscall CApaWindowGroupName::WindowGroupName(void)const 
+	??1CApaSystemControlList@@UAE@XZ @ 108 NONAME ; public: virtual __thiscall CApaSystemControlList::~CApaSystemControlList(void)
+	?Caption@CApaSystemControl@@QBE?AVTPtrC16@@XZ @ 109 NONAME ; public: class TPtrC16  __thiscall CApaSystemControl::Caption(void)const 
+	?Control@CApaSystemControlList@@QBEPAVCApaSystemControl@@H@Z @ 110 NONAME ; public: class CApaSystemControl * __thiscall CApaSystemControlList::Control(int)const 
+	?Control@CApaSystemControlList@@QBEPAVCApaSystemControl@@VTUid@@@Z @ 111 NONAME ; public: class CApaSystemControl * __thiscall CApaSystemControlList::Control(class TUid)const 
+	?Count@CApaSystemControlList@@QBEHXZ @ 112 NONAME ; public: int __thiscall CApaSystemControlList::Count(void)const 
+	?CreateL@CApaSystemControl@@QAEXXZ @ 113 NONAME ; public: void __thiscall CApaSystemControl::CreateL(void)
+	?FileName@CApaSystemControl@@QBE?AV?$TBuf@$0BAA@@@XZ @ 114 NONAME ; public: class TBuf<256>  __thiscall CApaSystemControl::FileName(void)const 
+	?Icon@CApaSystemControl@@QBEPAVCApaMaskedBitmap@@XZ @ 115 NONAME ; public: class CApaMaskedBitmap * __thiscall CApaSystemControl::Icon(void)const 
+	?Index@CApaSystemControlList@@QBEHVTUid@@@Z @ 116 NONAME ; public: int __thiscall CApaSystemControlList::Index(class TUid)const 
+	?NewL@CApaSystemControlList@@SAPAV1@AAVRFs@@AAVCApaAppFinder@@ABVTDesC16@@@Z @ 117 NONAME ABSENT ; public: static class CApaSystemControlList * __cdecl CApaSystemControlList::NewL(class RFs &,class CApaAppFinder &,class TDesC16 const &)
+	?Type@CApaSystemControl@@QBE?AVTUid@@XZ @ 118 NONAME ; public: class TUid  __thiscall CApaSystemControl::Type(void)const 
+	?UpdateL@CApaSystemControlList@@QAEXXZ @ 119 NONAME ; public: void __thiscall CApaSystemControlList::UpdateL(void)
+	?AddDataTypeL@CApaAppInfoFileWriter@@QAEXABVTDataTypeWithPriority@@@Z @ 120 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddDataTypeL(class TDataTypeWithPriority const &)
+	?AppForDataType@RApaLsSession@@QBEHABVTDataType@@AAVTUid@@@Z @ 121 NONAME ; public: int __thiscall RApaLsSession::AppForDataType(class TDataType const &,class TUid &)const 
+	?AppForDocument@RApaLsSession@@QBEHABVTDesC16@@AAVTUid@@AAVTDataType@@@Z @ 122 NONAME ; public: int __thiscall RApaLsSession::AppForDocument(class TDesC16 const &,class TUid &,class TDataType &)const 
+	?CreateDocument@RApaLsSession@@QAEHABVTDesC16@@VTUid@@AAVTThreadId@@W4TLaunchType@1@@Z @ 123 NONAME ; public: int __thiscall RApaLsSession::CreateDocument(class TDesC16 const &,class TUid,class TThreadId &,enum RApaLsSession::TLaunchType)
+	?DataType@CApaAppData@@QBEJABVTDataType@@@Z @ 124 NONAME ABSENT ; long CApaAppData::DataType(class TDataType const &) const
+	?DataTypesSupportedL@CApaAppInfoFileReader@@QBEXAAV?$CArrayFix@VTDataTypeWithPriority@@@@@Z @ 125 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileReader::DataTypesSupportedL(class CArrayFix<class TDataTypeWithPriority> &)const 
+	?GetAcceptedConfidence@RApaLsSession@@QBEHAAH@Z @ 126 NONAME ; public: int __thiscall RApaLsSession::GetAcceptedConfidence(int &)const 
+	?GetAppIcon@RApaLsSession@@QBEHVTUid@@HAAVCApaMaskedBitmap@@@Z @ 127 NONAME ; public: int __thiscall RApaLsSession::GetAppIcon(class TUid,int,class CApaMaskedBitmap &)const 
+	?GetMaxDataBufSize@RApaLsSession@@QBEHAAH@Z @ 128 NONAME ; public: int __thiscall RApaLsSession::GetMaxDataBufSize(int &)const 
+	?GetSupportedDataTypesL@RApaLsSession@@QBEHAAV?$CArrayFixFlat@VTDataType@@@@@Z @ 129 NONAME ; public: int __thiscall RApaLsSession::GetSupportedDataTypesL(class CArrayFixFlat<class TDataType> &)const 
+	?IsProgram@RApaLsSession@@QBEHABVTDesC16@@AAH@Z @ 130 NONAME ; public: int __thiscall RApaLsSession::IsProgram(class TDesC16 const &,int &)const 
+	?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@@Z @ 131 NONAME ABSENT ; public: class TUid  __thiscall CApaAppList::PreferredDataHandlerL(class TDataType const &)const 
+	?RecognizeData@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@AAVTDataRecognitionResult@@@Z @ 132 NONAME ; public: int __thiscall RApaLsSession::RecognizeData(class TDesC16 const &,class TDesC8 const &,class TDataRecognitionResult &)const 
+	?RecognizeSpecificData@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@ABVTDataType@@AAH@Z @ 133 NONAME ; public: int __thiscall RApaLsSession::RecognizeSpecificData(class TDesC16 const &,class TDesC8 const &,class TDataType const &,int &)const 
+	?SetAcceptedConfidence@RApaLsSession@@QAEHH@Z @ 134 NONAME ; public: int __thiscall RApaLsSession::SetAcceptedConfidence(int)
+	?SetMaxDataBufSize@RApaLsSession@@QAEHH@Z @ 135 NONAME ; public: int __thiscall RApaLsSession::SetMaxDataBufSize(int)
+	?StartDocument@RApaLsSession@@QAEHABVTDesC16@@AAVTThreadId@@W4TLaunchType@1@@Z @ 136 NONAME ; public: int __thiscall RApaLsSession::StartDocument(class TDesC16 const &,class TThreadId &,enum RApaLsSession::TLaunchType)
+	?StartDocument@RApaLsSession@@QAEHABVTDesC16@@ABVTDataType@@AAVTThreadId@@W4TLaunchType@1@@Z @ 137 NONAME ; public: int __thiscall RApaLsSession::StartDocument(class TDesC16 const &,class TDataType const &,class TThreadId &,enum RApaLsSession::TLaunchType)
+	?StartDocument@RApaLsSession@@QAEHABVTDesC16@@VTUid@@AAVTThreadId@@W4TLaunchType@1@@Z @ 138 NONAME ; public: int __thiscall RApaLsSession::StartDocument(class TDesC16 const &,class TUid,class TThreadId &,enum RApaLsSession::TLaunchType)
+	?StartIdleUpdateL@CApaAppList@@QAEXXZ @ 139 NONAME ABSENT ; public: void __thiscall CApaAppList::StartIdleUpdateL(void)
+	??1CApaAppListNotifier@@UAE@XZ @ 140 NONAME ; public: virtual __thiscall CApaAppListNotifier::~CApaAppListNotifier(void)
+	?NewL@CApaAppListNotifier@@SAPAV1@PAVMApaAppListServObserver@@W4TPriority@CActive@@@Z @ 141 NONAME ; public: static class CApaAppListNotifier * __cdecl CApaAppListNotifier::NewL(class MApaAppListServObserver *,enum CActive::TPriority)
+	?StartIdleUpdateL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 142 NONAME ABSENT ; public: void __thiscall CApaAppList::StartIdleUpdateL(class MApaAppListObserver *)
+	?GetAppIcon@RApaLsSession@@QBEHVTUid@@VTSize@@AAVCApaMaskedBitmap@@@Z @ 143 NONAME ; public: int __thiscall RApaLsSession::GetAppIcon(class TUid,class TSize,class CApaMaskedBitmap &)const 
+	?GetAppIconSizes@RApaLsSession@@QBEHVTUid@@AAV?$CArrayFixFlat@VTSize@@@@@Z @ 144 NONAME ; public: int __thiscall RApaLsSession::GetAppIconSizes(class TUid,class CArrayFixFlat<class TSize> &)const 
+	?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@VTSize@@@Z @ 145 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAppData::Icon(class TSize)const 
+	?IconSizesL@CApaAppData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 146 NONAME ABSENT ; public: class CArrayFixFlat<class TSize> * __thiscall CApaAppData::IconSizesL(void)const 
+	?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@H@Z @ 147 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAppData::Icon(int)const 
+	?Hidden@CApaWindowGroupName@@QBEHXZ @ 148 NONAME ; int CApaWindowGroupName::Hidden(void) const
+	?SetHidden@CApaWindowGroupName@@QAEXH@Z @ 149 NONAME ; public: void __thiscall CApaWindowGroupName::SetHidden(int)
+	?AddViewCaptionL@CApaAppInfoFileWriter@@QAEXW4TLanguage@@ABVTDesC16@@VTUid@@@Z @ 150 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddViewCaptionL(enum TLanguage,class TDesC16 const &,class TUid)
+	?AddViewIconL@CApaAppInfoFileWriter@@QAEXAAVCApaMaskedBitmap@@VTUid@@@Z @ 151 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddViewIconL(class CApaMaskedBitmap &,class TUid)
+	?AddViewL@CApaAppInfoFileWriter@@QAEXVTUid@@@Z @ 152 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddViewL(class TUid)
+	?CaptionL@CApaAIFViewData@@QBE?AV?$TBuf@$0BAA@@@W4TLanguage@@@Z @ 153 NONAME ABSENT ; public: class TBuf<256>  __thiscall CApaAIFViewData::CaptionL(enum TLanguage)const 
+	?GetAppViewIcon@RApaLsSession@@QBEHVTUid@@0ABVTSize@@AAVCApaMaskedBitmap@@@Z @ 154 NONAME ; public: int __thiscall RApaLsSession::GetAppViewIcon(class TUid,class TUid,class TSize const &,class CApaMaskedBitmap &)const 
+	?GetAppViews@RApaLsSession@@QBEHAAV?$CArrayFixFlat@VTApaAppViewInfo@@@@VTUid@@@Z @ 155 NONAME ; public: int __thiscall RApaLsSession::GetAppViews(class CArrayFixFlat<class TApaAppViewInfo> &,class TUid)const 
+	?GetViewsL@CApaAppInfoFileReader@@QBEXAAV?$CArrayPtr@VCApaAIFViewData@@@@@Z @ 156 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileReader::GetViewsL(class CArrayPtr<class CApaAIFViewData> &)const 
+	?Icon@CApaAppViewData@@QBEPAVCApaMaskedBitmap@@ABVTSize@@@Z @ 157 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAppViewData::Icon(class TSize const &)const 
+	?IconByIndexL@CApaAIFViewData@@QBEPAVCApaMaskedBitmap@@H@Z @ 158 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAIFViewData::IconByIndexL(int)const 
+	?IconSizesL@CApaAppViewData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 159 NONAME ABSENT ; public: class CArrayFixFlat<class TSize> * __thiscall CApaAppViewData::IconSizesL(void)const 
+	?NumberOfIcons@CApaAIFViewData@@QBEHXZ @ 160 NONAME ABSENT ; public: int __thiscall CApaAIFViewData::NumberOfIcons(void)const 
+	?StoreViewL@CApaAppInfoFileWriter@@QAEXVTUid@@@Z @ 161 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::StoreViewL(class TUid)
+	?Uid@CApaAppViewData@@QBE?AVTUid@@XZ @ 162 NONAME ABSENT ; public: class TUid  __thiscall CApaAppViewData::Uid(void)const 
+	?ViewUid@CApaAIFViewData@@QBE?AVTUid@@XZ @ 163 NONAME ABSENT ; public: class TUid  __thiscall CApaAIFViewData::ViewUid(void)const 
+	?Views@CApaAppData@@QBEPAV?$CArrayPtrFlat@VCApaAppViewData@@@@XZ @ 164 NONAME ABSENT ; public: class CArrayPtrFlat<class CApaAppViewData> * __thiscall CApaAppData::Views(void)const 
+	?AddOwnedFileL@CApaAppInfoFileWriter@@QAEXABVTDesC16@@@Z @ 165 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddOwnedFileL(class TDesC16 const &)
+	?GetOwnedFilesL@CApaAppInfoFileReader@@QBEXAAVCDesC16Array@@@Z @ 166 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileReader::GetOwnedFilesL(class CDesC16Array &)const 
+	?OwnedFiles@CApaAppData@@QBEPAVCDesC16Array@@XZ @ 167 NONAME ABSENT ; public: class CDesC16Array * __thiscall CApaAppData::OwnedFiles(void)const 
+	?GetAppOwnedFiles@RApaLsSession@@QBEHAAVCDesC16Array@@VTUid@@@Z @ 168 NONAME ; public: int __thiscall RApaLsSession::GetAppOwnedFiles(class CDesC16Array &,class TUid)const 
+	?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@AAVTThreadId@@@Z @ 169 NONAME ; public: int __thiscall RApaLsSession::StartApp(class CApaCommandLine const &,class TThreadId &)
+	?GetAifFileName@AppInfoFileUtils@@SAXABVRFs@@AAVTDes16@@@Z @ 170 NONAME ABSENT ; public: static void __cdecl AppInfoFileUtils::GetAifFileName(class RFs const &,class TDes16 &)
+	?AddViewL@CApaAppInfoFileWriter@@QAEXVTUid@@H@Z @ 171 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddViewL(class TUid,int)
+	?CanUseScreenMode@CApaAppData@@QAEHH@Z @ 172 NONAME ABSENT ; public: int __thiscall CApaAppData::CanUseScreenMode(int)
+	?FirstApp@CApaAppList@@QBEPAVCApaAppData@@H@Z @ 173 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::FirstApp(int)const 
+	?GetAllApps@RApaLsSession@@QBEHH@Z @ 174 NONAME ; public: int __thiscall RApaLsSession::GetAllApps(int)const 
+	?GetEmbeddableApps@RApaLsSession@@QBEHH@Z @ 175 NONAME ; public: int __thiscall RApaLsSession::GetEmbeddableApps(int)const 
+	?GetNextApp@RApaLsSession@@QBEHAAVTApaAppInfo@@H@Z @ 176 NONAME ; public: int __thiscall RApaLsSession::GetNextApp(class TApaAppInfo &,int)const 
+	?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@H@Z @ 177 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::NextApp(class CApaAppData const *,int)const 
+	?ScreenMode@CApaAIFViewData@@QBEHXZ @ 178 NONAME ABSENT ; public: int __thiscall CApaAIFViewData::ScreenMode(void)const 
+	?ScreenMode@CApaAppViewData@@QBEHXZ @ 179 NONAME ABSENT ; public: int __thiscall CApaAppViewData::ScreenMode(void)const 
+	?ShortCaption@CApaSystemControl@@QBE?AVTPtrC16@@XZ @ 180 NONAME ; public: class TPtrC16  __thiscall CApaSystemControl::ShortCaption(void)const 
+	?IsIdleUpdateComplete@CApaAppList@@QBEHXZ @ 181 NONAME ABSENT ; public: int __thiscall CApaAppList::IsIdleUpdateComplete(void)const 
+	?IsAppReady@CApaWindowGroupName@@QBEHXZ @ 182 NONAME ; public: int __thiscall CApaWindowGroupName::IsAppReady(void)const 
+	?SetAppReady@CApaWindowGroupName@@QAEXH@Z @ 183 NONAME ; public: void __thiscall CApaWindowGroupName::SetAppReady(int)
+	?InitListL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 184 NONAME ABSENT ; public: void __thiscall CApaAppList::InitListL(class MApaAppListObserver *)
+	?NumberOfBitmaps@CApaAppInfoFileReader@@QBEHXZ @ 185 NONAME ABSENT ; public: int __thiscall CApaAppInfoFileReader::NumberOfBitmaps(void)const 
+	?IsFirstScanComplete@CApaAppList@@QBEHXZ @ 186 NONAME ABSENT ; public: int __thiscall CApaAppList::IsFirstScanComplete(void)const 
+	?SetMaskBitmap@CApaMaskedBitmap@@QAEXPAVCFbsBitmap@@@Z @ 187 NONAME ; public: void __thiscall CApaMaskedBitmap::SetMaskBitmap(class CFbsBitmap *)
+	?GetAppInfo_7_0@RApaLsSession@@ABEHAAVTApaAppInfo_7_0@@VTUid@@@Z @ 188 NONAME ABSENT ; int RApaLsSession::GetAppInfo_7_0(class TApaAppInfo_7_0 &, class TUid) const
+	?GetNextApp_7_0@RApaLsSession@@ABEHAAVTApaAppInfo_7_0@@@Z @ 189 NONAME ABSENT ; int RApaLsSession::GetNextApp_7_0(class TApaAppInfo_7_0 &) const
+	?GetNextApp_7_0@RApaLsSession@@ABEHAAVTApaAppInfo_7_0@@H@Z @ 190 NONAME ABSENT ; int RApaLsSession::GetNextApp_7_0(class TApaAppInfo_7_0 &, int) const
+	?GetIconInfo@CApaAppData@@QBEXAAH0@Z @ 191 NONAME ABSENT ; void CApaAppData::GetIconInfo(int &, int &) const
+	?NumberOfOwnDefinedIcons@RApaLsSession@@QBEHVTUid@@AAH@Z @ 192 NONAME ; public: int __thiscall RApaLsSession::NumberOfOwnDefinedIcons(class TUid,int &)const 
+	?GetFilteredApps@RApaLsSession@@QBEHABVTApaEmbeddabilityFilter@@@Z @ 193 NONAME ; public: int __thiscall RApaLsSession::GetFilteredApps(class TApaEmbeddabilityFilter const &)const 
+	?GetFilteredApps@RApaLsSession@@QBEHABVTApaEmbeddabilityFilter@@H@Z @ 194 NONAME ; public: int __thiscall RApaLsSession::GetFilteredApps(class TApaEmbeddabilityFilter const &,int)const 
+	?NewL@CApaAppList@@SAPAV1@AAVRFs@@PAVCApaAppFinder@@PAVCApaAppRegFinder@@H@Z @ 195 NONAME ABSENT ; class CApaAppList * CApaAppList::NewL(class RFs &, class CApaAppFinder *, class CApaAppRegFinder *, int)	
+	?DefaultScreenNumber@CApaAppData@@QBEIXZ @ 196 NONAME ABSENT ; unsigned int CApaAppData::DefaultScreenNumber(void) const
+	?GetFilteredApps@RApaLsSession@@QBEHII@Z @ 197 NONAME ; int RApaLsSession::GetFilteredApps(unsigned int, unsigned int) const
+	?GetFilteredApps@RApaLsSession@@QBEHIIH@Z @ 198 NONAME ; int RApaLsSession::GetFilteredApps(unsigned int, unsigned int, int) const
+	?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 199 NONAME ABSENT ; int CApaAppData::RegistrationFileUsed(void) const
+	?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAPAVHBufC16@@@Z @ 200 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class HBufC16 * &) const
+	?IconFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 201 NONAME ABSENT ; class TPtrC16 CApaAppData::IconFileName(void) const
+	?GetAppViewIcon@RApaLsSession@@QBEHVTUid@@0AAPAVHBufC16@@@Z @ 202 NONAME ; int RApaLsSession::GetAppViewIcon(class TUid, class TUid, class HBufC16 * &) const
+	?IconFileName@CApaAppViewData@@QBE?AVTPtrC16@@XZ @ 203 NONAME ABSENT ; class TPtrC16 CApaAppViewData::IconFileName(void) const
+	?NonMbmIconFile@CApaAppData@@QBEHXZ @ 204 NONAME ABSENT ; int CApaAppData::NonMbmIconFile(void) const
+	?NonMbmIconFile@CApaAppViewData@@QBEHXZ @ 205 NONAME ABSENT ; int CApaAppViewData::NonMbmIconFile(void) const
+	?StartupApaServer@@YAHAAVMApaAppStarter@@@Z @ 206 NONAME ABSENT ; int StartupApaServer(class MApaAppStarter &)
+	?StartupApaServerProcess@@YAHXZ @ 207 NONAME ; int StartupApaServerProcess(void)
+	?DeleteDataMapping@RApaLsSession@@QAEHABVTDataType@@@Z @ 208 NONAME ; int RApaLsSession::DeleteDataMapping(class TDataType const &)
+	?InsertDataMapping@RApaLsSession@@QAEHABVTDataType@@JVTUid@@@Z @ 209 NONAME ; int RApaLsSession::InsertDataMapping(class TDataType const &, long, class TUid)
+	?InsertDataMappingIfHigher@RApaLsSession@@QAEHABVTDataType@@JVTUid@@AAH@Z @ 210 NONAME ; int RApaLsSession::InsertDataMappingIfHigher(class TDataType const &, long, class TUid, int &)
+	?ApplicationLanguage@CApaAppData@@QBE?AW4TLanguage@@XZ @ 211 NONAME ABSENT ; enum TLanguage CApaAppData::ApplicationLanguage(void) const
+	?ApplicationLanguage@RApaLsSession@@QBEHVTUid@@AAW4TLanguage@@@Z @ 212 NONAME ; int RApaLsSession::ApplicationLanguage(class TUid, enum TLanguage &) const
+	?NewL@CApaSystemControlList@@SAPAV1@AAVRFs@@@Z @ 213 NONAME ; class CApaSystemControlList * CApaSystemControlList::NewL(class RFs &)
+	?AppForDataTypeAndService@RApaLsSession@@QBEHABVTDataType@@VTUid@@AAV3@@Z @ 214 NONAME ; int RApaLsSession::AppForDataTypeAndService(class TDataType const &, class TUid, class TUid &) const
+	?AppForDocumentAndService@RApaLsSession@@QBEHABVRFile@@VTUid@@AAV3@AAVTDataType@@@Z @ 215 NONAME ; int RApaLsSession::AppForDocumentAndService(class RFile const &, class TUid, class TUid &, class TDataType &) const
+	?AppForDocumentAndService@RApaLsSession@@QBEHABVTDesC16@@VTUid@@AAV3@AAVTDataType@@@Z @ 216 NONAME ; int RApaLsSession::AppForDocumentAndService(class TDesC16 const &, class TUid, class TUid &, class TDataType &) const
+	?GetAppServiceOpaqueDataLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@0@Z @ 217 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetAppServiceOpaqueDataLC(class TUid, class TUid) const
+	?GetAppServicesL@RApaLsSession@@QBEXVTUid@@AAV?$CArrayFixFlat@VTUid@@@@@Z @ 218 NONAME ; void RApaLsSession::GetAppServicesL(class TUid, class CArrayFixFlat<class TUid> &) const
+	?GetAppServicesLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@@Z @ 219 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetAppServicesLC(class TUid) const
+	?GetServerApps@RApaLsSession@@QBEHVTUid@@@Z @ 220 NONAME ; int RApaLsSession::GetServerApps(class TUid) const
+	?GetServerApps@RApaLsSession@@QBEHVTUid@@H@Z @ 221 NONAME ; int RApaLsSession::GetServerApps(class TUid, int) const
+	?GetServiceImplementationsLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@@Z @ 222 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetServiceImplementationsLC(class TUid) const
+	?ImplementsService@CApaAppData@@QBEHVTUid@@@Z @ 223 NONAME ABSENT ; int CApaAppData::ImplementsService(class TUid) const
+	?OpaqueData@TApaAppServiceInfo@@QBEABVTDesC8@@XZ @ 224 NONAME ABSENT ; class TDesC8 const & TApaAppServiceInfo::OpaqueData(void) const
+	?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@PBV2@AAH@Z @ 225 NONAME ABSENT ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &, class TUid const *, int &) const
+	?ServiceArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 226 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceArrayBufferL(class TUid) const
+	?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 227 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid) const
+	?ServiceOpaqueDataBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@0@Z @ 228 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceOpaqueDataBufferL(class TUid, class TUid) const
+	?ServiceUidBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 229 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceUidBufferL(class TUid) const
+	?Uid@TApaAppServiceInfo@@QBE?AVTUid@@XZ @ 230 NONAME ABSENT ; class TUid TApaAppServiceInfo::Uid(void) const
+	?StartDocument@RApaLsSession@@QAEHAAVRFile@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 231 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TThreadId &, class TRequestStatus *)
+	?CreateMaskedBitmapByIndexLC@CApaAppInfoFileReader@@QAEPAVCApaMaskedBitmap@@H@Z @ 232 NONAME ABSENT ; class CApaMaskedBitmap * CApaAppInfoFileReader::CreateMaskedBitmapByIndexLC(int)
+	?CancelListPopulationCompleteObserver@RApaLsSession@@QBEHXZ @ 233 NONAME ; int RApaLsSession::CancelListPopulationCompleteObserver(void) const
+	?RegisterListPopulationCompleteObserver@RApaLsSession@@QBEXAAVTRequestStatus@@@Z @ 234 NONAME ; void RApaLsSession::RegisterListPopulationCompleteObserver(class TRequestStatus &) const
+	?NewInterimFormatFileWriterLC@ForJavaMIDletInstaller@@SAPAVCApaAppInfoFileWriter@@AAVRFs@@ABVTDesC16@@VTUid@@KH@Z @ 235 NONAME ABSENT ; class CApaAppInfoFileWriter * ForJavaMIDletInstaller::NewInterimFormatFileWriterLC(class RFs &, class TDesC16 const &, class TUid, unsigned long, int)
+	?CheckInterimFormatFileNotCorruptL@ForJavaMIDletInstaller@@SAXAAVRFile@@@Z @ 236 NONAME ABSENT ; void ForJavaMIDletInstaller::CheckInterimFormatFileNotCorruptL(class RFile &)
+	?RegisterJavaMIDletViaIterimFormat@RApaLsSession@@QAEHABVTDesC16@@AAVRFile@@@Z @ 237 NONAME ABSENT ; int RApaLsSession::RegisterJavaMIDletViaIterimFormat(class TDesC16 const &, class RFile &)
+	?DeregisterJavaMIDlet@RApaLsSession@@QAEHABVTDesC16@@@Z @ 238 NONAME ABSENT ; int RApaLsSession::DeregisterJavaMIDlet(class TDesC16 const &)
+	?AppForDocument@RApaLsSession@@QBEHABVRFile@@AAVTUid@@AAVTDataType@@@Z @ 239 NONAME ; int RApaLsSession::AppForDocument(class RFile const &, class TUid &, class TDataType &) const
+	?ClearFsSession@RApaLsSession@@SAXXZ @ 240 NONAME ; void RApaLsSession::ClearFsSession(void)
+	?FsSession@RApaLsSession@@SAPAVRFs@@XZ @ 241 NONAME ; class RFs * RApaLsSession::FsSession(void)
+	?RecognizeData@RApaLsSession@@QBEHABVRFile@@AAVTDataRecognitionResult@@@Z @ 242 NONAME ; int RApaLsSession::RecognizeData(class RFile const &, class TDataRecognitionResult &) const	
+	?RecognizeSpecificData@RApaLsSession@@QBEHABVRFile@@ABVTDataType@@AAH@Z @ 243 NONAME ; int RApaLsSession::RecognizeSpecificData(class RFile const &, class TDataType const &, int &) const
+	?SetFsSessionL@RApaLsSession@@SAXAAVRFs@@@Z @ 244 NONAME ; void RApaLsSession::SetFsSessionL(class RFs &)
+	?StartDocument@RApaLsSession@@QAEHAAVRFile@@ABVTDataType@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 245 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TDataType const &, class TThreadId &, class TRequestStatus *)
+	?StartDocument@RApaLsSession@@QAEHAAVRFile@@VTUid@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 246 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TUid, class TThreadId &, class TRequestStatus *)
+	?GetPreferredBufSize@RApaLsSession@@QBEHAAH@Z @ 247 NONAME ; public: int __thiscall RApaLsSession::GetPreferredBufSize(int &)const 
+	?GetJavaMIDletInfoL@ForJavaMIDletInstaller@@SAXAAVRFs@@ABVTDesC16@@AAK2@Z @ 248 NONAME ABSENT ; void ForJavaMIDletInstaller::GetJavaMIDletInfoL(class RFs &, class TDesC16 const &, unsigned long &, unsigned long &)
+	?HandleAsRegistrationFile@ApaUtils@@SAHABVTUidType@@@Z @ 249 NONAME ABSENT ; int ApaUtils::HandleAsRegistrationFile(class TUidType const &)
+	?DataTypes@TApaAppServiceInfo@@QBEABV?$CArrayFixFlat@VTDataTypeWithPriority@@@@XZ @ 250 NONAME ABSENT ; class CArrayFixFlat<class TDataTypeWithPriority> const & TApaAppServiceInfo::DataTypes(void) const
+	?GetServiceImplementationsLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@ABVTDataType@@@Z @ 251 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetServiceImplementationsLC(class TUid, class TDataType const &) const
+	?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@ABVTDataType@@@Z @ 252 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid, class TDataType const &) const
+	?Close@RApaLsSession@@QAEXXZ @ 253 NONAME ; void RApaLsSession::Close(void)
+	??0MApaAppListServObserver@@IAE@XZ @ 254 NONAME ; MApaAppListServObserver::MApaAppListServObserver(void)
+	??0TApaPictureFactory@@IAE@XZ @ 255 NONAME ; TApaPictureFactory::TApaPictureFactory(void)
+	?MApaAppListServObserver_Reserved1@MApaAppListServObserver@@EAEXXZ @ 256 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved1(void)
+	?MApaAppListServObserver_Reserved2@MApaAppListServObserver@@EAEXXZ @ 257 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved2(void)
+	?RApaLsSession_Reserved1@RApaLsSession@@EAEXXZ @ 258 NONAME ; void RApaLsSession::RApaLsSession_Reserved1(void)
+	?RApaLsSession_Reserved2@RApaLsSession@@EAEXXZ @ 259 NONAME ; void RApaLsSession::RApaLsSession_Reserved2(void)
+	??0CDataRecognitionResultArray@@QAE@XZ @ 260 NONAME ; CDataRecognitionResultArray::CDataRecognitionResultArray(void)
+	??1CDataRecognitionResultArray@@UAE@XZ @ 261 NONAME ; CDataRecognitionResultArray::~CDataRecognitionResultArray(void)
+	?CancelRecognizeFiles@RApaLsSession@@QAEXXZ @ 262 NONAME ; void RApaLsSession::CancelRecognizeFiles(void)
+	?Count@CDataRecognitionResultArray@@QBEIXZ @ 263 NONAME ; unsigned int CDataRecognitionResultArray::Count(void) const
+	?GetDataRecognitionResultL@CDataRecognitionResultArray@@QBEXAAVTDataRecognitionResult@@I@Z @ 264 NONAME ; void CDataRecognitionResultArray::GetDataRecognitionResultL(class TDataRecognitionResult &, unsigned int) const
+	?GetFileNameL@CDataRecognitionResultArray@@QBEXAAV?$TBuf@$0BAA@@@I@Z @ 265 NONAME ; void CDataRecognitionResultArray::GetFileNameL(class TBuf<256> &, unsigned int) const
+	?Path@CDataRecognitionResultArray@@QBEABV?$TBuf@$0BAA@@@XZ @ 266 NONAME ; class TBuf<256> const & CDataRecognitionResultArray::Path(void) const
+	?RecognizeFilesL@RApaLsSession@@QBEHABVTDesC16@@AAVCDataRecognitionResultArray@@@Z @ 267 NONAME ; int RApaLsSession::RecognizeFilesL(class TDesC16 const &, class CDataRecognitionResultArray &) const
+	?RecognizeFilesL@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@AAVCDataRecognitionResultArray@@@Z @ 268 NONAME ; int RApaLsSession::RecognizeFilesL(class TDesC16 const &, class TDesC8 const &, class CDataRecognitionResultArray &) const
+	?RecognizeFilesL@RApaLsSession@@QAEXABVTDesC16@@AAVCDataRecognitionResultArray@@AAVTRequestStatus@@@Z @ 269 NONAME ; void RApaLsSession::RecognizeFilesL(class TDesC16 const &, class CDataRecognitionResultArray &, class TRequestStatus &)
+	?RecognizeFilesL@RApaLsSession@@QAEXABVTDesC16@@ABVTDesC8@@AAVCDataRecognitionResultArray@@AAVTRequestStatus@@@Z @ 270 NONAME ; void RApaLsSession::RecognizeFilesL(class TDesC16 const &, class TDesC8 const &, class CDataRecognitionResultArray &, class TRequestStatus &)
+	?InsertDataMapping@RApaLsSession@@QAEHABVTDataType@@JVTUid@@1@Z @ 271 NONAME ; int RApaLsSession::InsertDataMapping(class TDataType const &, long, class TUid, class TUid)
+	?DeleteDataMapping@RApaLsSession@@QAEHABVTDataType@@VTUid@@@Z @ 272 NONAME ; int RApaLsSession::DeleteDataMapping(class TDataType const &, class TUid)
+	?GetAppByDataType@RApaLsSession@@QBEHABVTDataType@@VTUid@@AAV3@@Z @ 273 NONAME ; int RApaLsSession::GetAppByDataType(class TDataType const &, class TUid, class TUid &) const
+	?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 274 NONAME ; int RApaLsSession::StartApp(class CApaCommandLine const &, class TThreadId &, class TRequestStatus *)
+	?RegisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@ABVTDesC16@@@Z @ 275 NONAME ; void RApaLsSession::RegisterNonNativeApplicationTypeL(class TUid, class TDesC16 const &)
+	?DeregisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@@Z @ 276 NONAME ; void RApaLsSession::DeregisterNonNativeApplicationTypeL(class TUid)
+	?RegisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@ABVTDriveUnit@@AAVCApaRegistrationResourceFileWriter@@PAVCApaLocalisableResourceFileWriter@@PBVRFile@@@Z @ 277 NONAME ; void RApaLsSession::RegisterNonNativeApplicationL(class TUid, class TDriveUnit const &, class CApaRegistrationResourceFileWriter &, class CApaLocalisableResourceFileWriter *, class RFile const *)
+	?DeregisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@@Z @ 278 NONAME ; void RApaLsSession::DeregisterNonNativeApplicationL(class TUid)
+	?AppDataByFileName@CApaAppList@@QBEPAVCApaAppData@@ABVTDesC16@@@Z @ 279 NONAME ABSENT ; class CApaAppData* CApaAppList::AppDataByFileName(class TDesC16 const &) const
+	?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 280 NONAME ABSENT ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const
+	?OpaqueData@CApaAppData@@QBE?AVTPtrC8@@XZ @ 281 NONAME ABSENT ; class TPtrC8 CApaAppData::OpaqueData(void) const
+	?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 282 NONAME ABSENT ; class TPtrC16 CApaAppData::RegistrationFileName(void) const
+	?GetDefaultScreenNumber@RApaLsSession@@QBEHAAHVTUid@@@Z @ 283 NONAME ; int RApaLsSession::GetDefaultScreenNumber(int &, class TUid) const
+	?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 284 NONAME ABSENT ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid)
+	?MatchesSecurityPolicy@RApaLsSession@@QBEHAAHVTUid@@ABVTSecurityPolicy@@@Z @ 285 NONAME ; int RApaLsSession::MatchesSecurityPolicy(int &, class TUid, class TSecurityPolicy const &) const
+	?AddDataTypeL@CApaRegistrationResourceFileWriter@@QAEXHABVTDesC8@@@Z @ 286 NONAME ; void CApaRegistrationResourceFileWriter::AddDataTypeL(int, class TDesC8 const &)
+	?AddFileOwnershipInfoL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC16@@@Z @ 287 NONAME ; void CApaRegistrationResourceFileWriter::AddFileOwnershipInfoL(class TDesC16 const &)
+	?NewL@CApaLocalisableResourceFileWriter@@SAPAV1@ABVTDesC16@@0H0@Z @ 288 NONAME ; class CApaLocalisableResourceFileWriter * CApaLocalisableResourceFileWriter::NewL(class TDesC16 const &, class TDesC16 const &, int, class TDesC16 const &)
+	?NewL@CApaRegistrationResourceFileWriter@@SAPAV1@VTUid@@ABVTDesC16@@I@Z @ 289 NONAME ; class CApaRegistrationResourceFileWriter * CApaRegistrationResourceFileWriter::NewL(class TUid, class TDesC16 const &, unsigned int)
+	?NonNativeApplicationType@CApaAppData@@QBE?AVTUid@@XZ @ 290 NONAME ABSENT ; class TUid CApaAppData::NonNativeApplicationType(void) const
+	?SetAppIsHiddenL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 291 NONAME ; void CApaRegistrationResourceFileWriter::SetAppIsHiddenL(int)
+	?SetDefaultScreenNumberL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 292 NONAME ; void CApaRegistrationResourceFileWriter::SetDefaultScreenNumberL(int)
+	?SetEmbeddabilityL@CApaRegistrationResourceFileWriter@@QAEXW4TEmbeddability@TApaAppCapability@@@Z @ 293 NONAME ; void CApaRegistrationResourceFileWriter::SetEmbeddabilityL(enum TApaAppCapability::TEmbeddability)
+	?SetGroupNameL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC16@@@Z @ 294 NONAME ; void CApaRegistrationResourceFileWriter::SetGroupNameL(class TDesC16 const &)
+	?SetLaunchInBackgroundL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 295 NONAME ; void CApaRegistrationResourceFileWriter::SetLaunchInBackgroundL(int)
+	?SetOpaqueDataL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC8@@@Z @ 296 NONAME ; void CApaRegistrationResourceFileWriter::SetOpaqueDataL(class TDesC8 const &)
+	?SetSupportsNewFileL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 297 NONAME ; void CApaRegistrationResourceFileWriter::SetSupportsNewFileL(int)
+	??1CApaLocalisableResourceFileWriter@@UAE@XZ @ 298 NONAME ; CApaLocalisableResourceFileWriter::~CApaLocalisableResourceFileWriter(void)
+	??1CApaRegistrationResourceFileWriter@@UAE@XZ @ 299 NONAME ; CApaRegistrationResourceFileWriter::~CApaRegistrationResourceFileWriter(void)
+	?AppScanInProgress@CApaAppList@@QBEHXZ @ 300 NONAME ABSENT ; int CApaAppList::AppScanInProgress(void) const
+	?CancelNotify@RApaLsSession@@QAEXXZ @ 301 NONAME ; void RApaLsSession::CancelNotify(void)
+	?SetNotify@RApaLsSession@@QAEXHAAVTRequestStatus@@@Z @ 302 NONAME ; void RApaLsSession::SetNotify(int, class TRequestStatus &)
+	?CancelNotifyOnDataMappingChange@RApaLsSession@@QAEXXZ @ 303 NONAME ; void RApaLsSession::CancelNotifyOnDataMappingChange(void)
+	?NotifyOnDataMappingChange@RApaLsSession@@QAEXAAVTRequestStatus@@@Z @ 304 NONAME ; void RApaLsSession::NotifyOnDataMappingChange(class TRequestStatus &)
+	?GetAppType@RApaLsSession@@QBEHAAVTUid@@V2@@Z @ 305 NONAME ; int RApaLsSession::GetAppType(class TUid &, class TUid) const
+	?CommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 306 NONAME ; void RApaLsSession::CommitNonNativeApplicationsUpdatesL(void)
+	?PrepareNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 307 NONAME ; void RApaLsSession::PrepareNonNativeApplicationsUpdatesL(void)
+	?RollbackNonNativeApplicationsUpdates@RApaLsSession@@QAEHXZ @ 308 NONAME ; int RApaLsSession::RollbackNonNativeApplicationsUpdates(void)
+	?SetUpdatedAppsList@CApaAppList@@QAEXPAVCUpdatedAppsList@@@Z @ 309 NONAME ABSENT ; void CApaAppList::SetUpdatedAppsList(class CUpdatedAppsList *)
+	?UpdatedAppsList@CApaAppList@@QAEPAVCUpdatedAppsList@@XZ @ 310 NONAME ABSENT ; class CUpdatedAppsList * CApaAppList::UpdatedAppsList(void)
+	??1CApaAppData@@UAE@XZ @ 311 NONAME ABSENT ; CApaAppData::~CApaAppData(void)
+	?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 312 NONAME ABSENT ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &)
+	?Self@CApaAppList@@SAPAV1@XZ @ 313 NONAME ABSENT ; class CApaAppList * CApaAppList::Self(void)
+	?ShareProtectedFileServer@CApaAppList@@QAEAAVRFs@@XZ @ 314 NONAME ABSENT ; class RFs & CApaAppList::ShareProtectedFileServer(void)
+	X @ 315 NONAME ABSENT ; Old @internalComponent function that never needed to be exported
+	X @ 316 NONAME ABSENT ; Old @internalComponent function that never needed to be exported
+	X @ 317 NONAME ABSENT ; Old @internalComponent function that never needed to be exported
+	X @ 318 NONAME ABSENT ; Old @internalComponent function that never needed to be exported
+	?SetAppShortCaption@RApaLsSession@@QAEHABVTDesC16@@W4TLanguage@@VTUid@@@Z @ 319 NONAME ; int RApaLsSession::SetAppShortCaption(class TDesC16 const &, enum TLanguage, class TUid)
+	?SetShortCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 320 NONAME ABSENT ; void CApaAppData::SetShortCaptionL(class TDesC16 const &)
+	?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VTDesC16@@@@@Z @ 321 NONAME ; int RApaLsSession::ForceRegistration(class RPointerArray<class TDesC16> const &)
+	?AddForcedRegistrationL@CApaAppList@@QAEXPAVHBufC16@@@Z @ 322 NONAME ABSENT ; void CApaAppList::AddForcedRegistrationL(class HBufC16 *)
+	?CompareStrings@CApaAppList@@SAHABVHBufC16@@0@Z @ 323 NONAME ABSENT ; int CApaAppList::CompareStrings(class HBufC16 const &, class HBufC16 const &)
+	?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 324 NONAME ABSENT ; void CApaAppList::ResetForcedRegistrations(void)
+	?RestartScanL@CApaAppList@@QAEXXZ @ 325 NONAME ABSENT ; void CApaAppList::RestartScanL(void)
+	?StopScan@CApaAppList@@QAEXXZ @ 326 NONAME ABSENT ; void CApaAppList::StopScan(void)
+	?MinApplicationStackSize@@YAIXZ @ 327 NONAME ; unsigned int MinApplicationStackSize(void)
+	?KMinApplicationStackSize@@3HB @ 328 NONAME ; int const KMinApplicationStackSize
+	?IsLanguageChangePending@CApaAppList@@QBEHXZ @ 329 NONAME ABSENT ; int CApaAppList::IsLanguageChangePending(void) const
+	?IsPending@CApaAppData@@QBEHXZ @ 330 NONAME ABSENT ; int CApaAppData::IsPending(void) const
+	?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAVRFile@@@Z @ 331 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class RFile &) const
+	?CheckAppSecurity@CApaSecurityUtils@@SAHABVTPtrC16@@AAH1@Z @ 332 NONAME ; int CApaSecurityUtils::CheckAppSecurity(class TPtrC16 const &, int &, int &)
+	X @ 333 NONAME ABSENT
+	X @ 334 NONAME ABSENT
+	?ForceCommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 335 NONAME ; void RApaLsSession::ForceCommitNonNativeApplicationsUpdatesL(void)
+	?RecognizeData@RApaLsSession@@QBEHABVTDesC8@@AAVTDataRecognitionResult@@@Z @ 336 NONAME ; TInt RecognizeData(const TDesC8& aBuffer, TDataRecognitionResult& aDataType) const
+	??0TApaAppUpdateInfo@@QAE@XZ @ 337 NONAME ; TApaAppUpdateInfo::TApaAppUpdateInfo(void)
+	?InternalizeL@TApaAppUpdateInfo@@QAEXAAVRReadStream@@@Z @ 338 NONAME ; void TApaAppUpdateInfo::InternalizeL(class RReadStream &)
+	?UpdateAppListL@RApaLsSession@@QAEHAAV?$RArray@VTApaAppUpdateInfo@@@@@Z @ 339 NONAME ; int RApaLsSession::UpdateAppListL(class RArray<class TApaAppUpdateInfo> &)
+	?ExternalizeL@TApaAppUpdateInfo@@QBEXAAVRWriteStream@@@Z @ 340 NONAME ; void TApaAppUpdateInfo::ExternalizeL(class RWriteStream &) const
+	??0TApaAppUpdateInfo@@QAE@VTUid@@W4TApaAppAction@0@@Z @ 341 NONAME ; TApaAppUpdateInfo::TApaAppUpdateInfo(class TUid, enum TApaAppUpdateInfo::TApaAppAction)
+	?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VCApplicationRegistrationData@Usif@@@@@Z @ 342 NONAME ; int RApaLsSession::ForceRegistration(class RPointerArray<class Usif::CApplicationRegistrationData> const &)
+	?UpdatedAppsInfoL@RApaLsSession@@QAEHAAV?$RArray@VTApaAppUpdateInfo@@@@@Z @ 343 NONAME ; int RApaLsSession::UpdatedAppsInfoL(class RArray<class TApaAppUpdateInfo> &)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/bwins/apservu.def	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,27 @@
+EXPORTS
+	??1CApaAppArcServer@@UAE@XZ @ 1 NONAME ; public: virtual __thiscall CApaAppArcServer::~CApaAppArcServer(void)
+	?NewL@CApaAppArcServer@@SAPAV1@PAVCApaAppList@@PAVCApaFileRecognizer@@@Z @ 2 NONAME ABSENT ; public: static class CApaAppArcServer * __cdecl CApaAppArcServer::NewL(class CApaAppList *,class CApaFileRecognizer *)
+	??1CApaFsMonitor@@UAE@XZ @ 3 NONAME ; public: virtual __thiscall CApaFsMonitor::~CApaFsMonitor(void)
+	?NameApaServServerThread@@YA?AVTPtrC16@@XZ @ 4 NONAME ; class TPtrC16  __cdecl NameApaServServerThread(void)
+	?NameApaServStartSemaphore@@YA?AVTPtrC16@@XZ @ 5 NONAME ; class TPtrC16  __cdecl NameApaServStartSemaphore(void)
+	?NewL@CApaAppArcServer@@SAPAV1@XZ @ 6  NONAME ; class CApaAppArcServer * CApaAppArcServer::NewL(void)
+	?NewL@CApaFsMonitor@@SAPAV1@AAVRFs@@ABVTDesC16@@VTCallBack@@@Z @ 7 NONAME ; public: static class CApaFsMonitor * __cdecl CApaFsMonitor::NewL(class RFs &,class TDesC16 const &,class TCallBack)
+	?NotifyType@CApaFsMonitor@@QBE?AW4TNotifyType@@XZ @ 8 NONAME ; public: enum TNotifyType  __thiscall CApaFsMonitor::NotifyType(void)const 
+	?SetBlocked@CApaFsMonitor@@QAEXH@Z @ 9 NONAME ; public: void __thiscall CApaFsMonitor::SetBlocked(int)
+	?Start@CApaFsMonitor@@QAEXW4TNotifyType@@@Z @ 10 NONAME ; public: void __thiscall CApaFsMonitor::Start(enum TNotifyType)
+	?Self@CApaAppArcServer@@SAPAV1@XZ @ 11 NONAME ; class CApaAppArcServer * CApaAppArcServer::Self(void)
+	?AddLocationL@CApaFsMonitor@@QAEXABVTDesC16@@@Z @ 12 NONAME ; void CApaFsMonitor::AddLocationL(class TDesC16 const &)
+	?Cancel@CApaFsMonitor@@QAEXXZ @ 13 NONAME ; void CApaFsMonitor::Cancel(void)
+	?ApaServThreadStart@@YAHPAX@Z @ 14 NONAME ; int ApaServThreadStart(void *)
+	??1CUpdatedAppsList@@UAE@XZ @ 15 NONAME ABSENT ; CUpdatedAppsList::~CUpdatedAppsList(void)
+	?CloseAndDeletePermanentStore@CUpdatedAppsList@@QAEXXZ @ 16 NONAME ABSENT ; void CUpdatedAppsList::CloseAndDeletePermanentStore(void)
+	?IsInList@CUpdatedAppsList@@QBEHABVTDesC16@@@Z @ 17 NONAME ABSENT ; int CUpdatedAppsList::IsInList(class TDesC16 const &) const
+	?RescanCallBack@CApaAppArcServer@@QAE?AVTCallBack@@XZ @ 18 NONAME ABSENT; class TCallBack CApaAppArcServer::RescanCallBack(void)
+	?KApaLoadDataRecognizersOnDemand@@3HB @ 19 NONAME DATA 4 ; int const KApaLoadDataRecognizersOnDemand
+	?KApaUnloadRecognizersTimeout@@3HB @ 20 NONAME DATA 4 ; int const KApaUnloadRecognizersTimeout
+	?HandleInstallationEndEventL@CApaAppArcServer@@QAEXXZ @ 21 NONAME ABSENT; void CApaAppArcServer::HandleEndUninstallEventL(void)
+	?HandleInstallationStartEvent@CApaAppArcServer@@QAEXXZ @ 22 NONAME ABSENT; void CApaAppArcServer::HandleStartUninstallEvent(void)
+	?KApaDrivesToMonitor@@3HB @ 23 NONAME ; int const KApaDrivesToMonitor
+	?KApaLoadMbmIconsOnDemand@@3HB @ 24 NONAME ; int const KApaLoadMbmIconsOnDemand
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/bwins/ticonforleaksu.def	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,350 @@
+EXPORTS
+	??0CDataRecognitionResultArray@@QAE@XZ @ 1 NONAME ; CDataRecognitionResultArray::CDataRecognitionResultArray(void)
+	??0MApaAppListServObserver@@IAE@XZ @ 2 NONAME ; MApaAppListServObserver::MApaAppListServObserver(void)
+	??0RApaLsSession@@QAE@XZ @ 3 NONAME ; RApaLsSession::RApaLsSession(void)
+	??0TApaPictureFactory@@IAE@XZ @ 4 NONAME ; TApaPictureFactory::TApaPictureFactory(void)
+	??0TApaPictureFactory@@QAE@PAVCApaProcess@@@Z @ 5 NONAME ; TApaPictureFactory::TApaPictureFactory(class CApaProcess *)
+	??0TApaTask@@QAE@AAVRWsSession@@@Z @ 6 NONAME ; TApaTask::TApaTask(class RWsSession &)
+	??0TApaTaskList@@QAE@AAVRWsSession@@@Z @ 7 NONAME ; TApaTaskList::TApaTaskList(class RWsSession &)
+	??1CApaAppData@@UAE@XZ @ 8 NONAME ; CApaAppData::~CApaAppData(void)
+	??1CApaAppInfoFileWriter@@UAE@XZ @ 9 NONAME ABSENT ; CApaAppInfoFileWriter::~CApaAppInfoFileWriter(void)
+	??1CApaAppList@@UAE@XZ @ 10 NONAME ; CApaAppList::~CApaAppList(void)
+	??1CApaAppListNotifier@@UAE@XZ @ 11 NONAME ; CApaAppListNotifier::~CApaAppListNotifier(void)
+	??1CApaDoor@@UAE@XZ @ 12 NONAME ; CApaDoor::~CApaDoor(void)
+	??1CApaLocalisableResourceFileWriter@@UAE@XZ @ 13 NONAME ; CApaLocalisableResourceFileWriter::~CApaLocalisableResourceFileWriter(void)
+	??1CApaMaskedBitmap@@UAE@XZ @ 14 NONAME ; CApaMaskedBitmap::~CApaMaskedBitmap(void)
+	??1CApaRegistrationResourceFileWriter@@UAE@XZ @ 15 NONAME ; CApaRegistrationResourceFileWriter::~CApaRegistrationResourceFileWriter(void)
+	??1CApaSystemControlList@@UAE@XZ @ 16 NONAME ; CApaSystemControlList::~CApaSystemControlList(void)
+	??1CApaWindowGroupName@@UAE@XZ @ 17 NONAME ; CApaWindowGroupName::~CApaWindowGroupName(void)
+	??1CDataRecognitionResultArray@@UAE@XZ @ 18 NONAME ; CDataRecognitionResultArray::~CDataRecognitionResultArray(void)
+	?AddCaptionL@CApaAppInfoFileWriter@@QAEXW4TLanguage@@ABVTDesC16@@@Z @ 19 NONAME ABSENT ; void CApaAppInfoFileWriter::AddCaptionL(enum TLanguage, class TDesC16 const &)
+	?AddDataTypeL@CApaAppInfoFileWriter@@QAEXABVTDataTypeWithPriority@@@Z @ 20 NONAME ABSENT ; void CApaAppInfoFileWriter::AddDataTypeL(class TDataTypeWithPriority const &)
+	?AddDataTypeL@CApaRegistrationResourceFileWriter@@QAEXHABVTDesC8@@@Z @ 21 NONAME ; void CApaRegistrationResourceFileWriter::AddDataTypeL(int, class TDesC8 const &)
+	?AddFileOwnershipInfoL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC16@@@Z @ 22 NONAME ; void CApaRegistrationResourceFileWriter::AddFileOwnershipInfoL(class TDesC16 const &)
+	?AddForcedRegistrationL@CApaAppList@@QAEXPAVHBufC16@@@Z @ 23 NONAME ABSENT ; void CApaAppList::AddForcedRegistrationL(class HBufC16 *)
+	?AddIconL@CApaAppInfoFileWriter@@QAEXAAVCApaMaskedBitmap@@@Z @ 24 NONAME ABSENT ; void CApaAppInfoFileWriter::AddIconL(class CApaMaskedBitmap &)
+	?AppCount@RApaLsSession@@QBEHAAH@Z @ 25 NONAME ; int RApaLsSession::AppCount(int &) const
+	?AppDataByFileName@CApaAppList@@QBEPAVCApaAppData@@ABVTDesC16@@@Z @ 26 NONAME ; class CApaAppData * CApaAppList::AppDataByFileName(class TDesC16 const &) const
+	?AppDataByUid@CApaAppList@@QBEPAVCApaAppData@@VTUid@@@Z @ 27 NONAME ; class CApaAppData * CApaAppList::AppDataByUid(class TUid) const
+	?AppEntry@CApaAppData@@QBE?AVTApaAppEntry@@XZ @ 28 NONAME ; class TApaAppEntry CApaAppData::AppEntry(void) const
+	?AppForDataType@RApaLsSession@@QBEHABVTDataType@@AAVTUid@@@Z @ 29 NONAME ; int RApaLsSession::AppForDataType(class TDataType const &, class TUid &) const
+	?AppForDataTypeAndService@RApaLsSession@@QBEHABVTDataType@@VTUid@@AAV3@@Z @ 30 NONAME ; int RApaLsSession::AppForDataTypeAndService(class TDataType const &, class TUid, class TUid &) const
+	?AppForDocument@RApaLsSession@@QBEHABVRFile@@AAVTUid@@AAVTDataType@@@Z @ 31 NONAME ; int RApaLsSession::AppForDocument(class RFile const &, class TUid &, class TDataType &) const
+	?AppForDocument@RApaLsSession@@QBEHABVTDesC16@@AAVTUid@@AAVTDataType@@@Z @ 32 NONAME ; int RApaLsSession::AppForDocument(class TDesC16 const &, class TUid &, class TDataType &) const
+	?AppForDocumentAndService@RApaLsSession@@QBEHABVRFile@@VTUid@@AAV3@AAVTDataType@@@Z @ 33 NONAME ; int RApaLsSession::AppForDocumentAndService(class RFile const &, class TUid, class TUid &, class TDataType &) const
+	?AppForDocumentAndService@RApaLsSession@@QBEHABVTDesC16@@VTUid@@AAV3@AAVTDataType@@@Z @ 34 NONAME ; int RApaLsSession::AppForDocumentAndService(class TDesC16 const &, class TUid, class TUid &, class TDataType &) const
+	?AppScanInProgress@CApaAppList@@QBEHXZ @ 35 NONAME ; int CApaAppList::AppScanInProgress(void) const
+	?AppUid@CApaWindowGroupName@@QBE?AVTUid@@XZ @ 36 NONAME ; class TUid CApaWindowGroupName::AppUid(void) const
+	?AppUidL@CApaDoor@@QBE?AVTUid@@XZ @ 37 NONAME ; class TUid CApaDoor::AppUidL(void) const
+	?ApplicationLanguage@CApaAppData@@QBE?AW4TLanguage@@XZ @ 38 NONAME ; enum TLanguage CApaAppData::ApplicationLanguage(void) const
+	?ApplicationLanguage@RApaLsSession@@QBEHVTUid@@AAW4TLanguage@@@Z @ 39 NONAME ; int RApaLsSession::ApplicationLanguage(class TUid, enum TLanguage &) const
+	?BringToForeground@TApaTask@@QAEXXZ @ 40 NONAME ; void TApaTask::BringToForeground(void)
+	?CanUseScreenMode@CApaAppData@@QAEHH@Z @ 41 NONAME ; int CApaAppData::CanUseScreenMode(int)
+	?CancelListPopulationCompleteObserver@RApaLsSession@@QBEHXZ @ 42 NONAME ; int RApaLsSession::CancelListPopulationCompleteObserver(void) const
+	?CancelNotify@RApaLsSession@@QAEXXZ @ 43 NONAME ; void RApaLsSession::CancelNotify(void)
+	?CancelNotifyOnDataMappingChange@RApaLsSession@@QAEXXZ @ 44 NONAME ; void RApaLsSession::CancelNotifyOnDataMappingChange(void)
+	?CancelRecognizeFiles@RApaLsSession@@QAEXXZ @ 45 NONAME ; void RApaLsSession::CancelRecognizeFiles(void)
+	?Capability@CApaAppData@@QBEXAAVTDes8@@@Z @ 46 NONAME ; void CApaAppData::Capability(class TDes8 &) const
+	?Caption@CApaSystemControl@@QBE?AVTPtrC16@@XZ @ 47 NONAME ; class TPtrC16 CApaSystemControl::Caption(void) const
+	?Caption@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 48 NONAME ; class TPtrC16 CApaWindowGroupName::Caption(void) const
+	?CheckInterimFormatFileNotCorruptL@ForJavaMIDletInstaller@@SAXAAVRFile@@@Z @ 49 NONAME ABSENT ; void ForJavaMIDletInstaller::CheckInterimFormatFileNotCorruptL(class RFile &)
+	?ClearFsSession@RApaLsSession@@SAXXZ @ 50 NONAME ; void RApaLsSession::ClearFsSession(void)
+	?Close@RApaLsSession@@QAEXXZ @ 51 NONAME ; void RApaLsSession::Close(void)
+	?CommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 52 NONAME ; void RApaLsSession::CommitNonNativeApplicationsUpdatesL(void)
+	?CompareStrings@CApaAppList@@SAHABVHBufC16@@0@Z @ 53 NONAME ABSENT ; int CApaAppList::CompareStrings(class HBufC16 const &, class HBufC16 const &)
+	?Connect@RApaLsSession@@QAEHXZ @ 54 NONAME ; int RApaLsSession::Connect(void)
+	?ConstructFromWgIdL@CApaWindowGroupName@@QAEXH@Z @ 55 NONAME ; void CApaWindowGroupName::ConstructFromWgIdL(int)
+	?Control@CApaSystemControlList@@QBEPAVCApaSystemControl@@H@Z @ 56 NONAME ; class CApaSystemControl * CApaSystemControlList::Control(int) const
+	?Control@CApaSystemControlList@@QBEPAVCApaSystemControl@@VTUid@@@Z @ 57 NONAME ; class CApaSystemControl * CApaSystemControlList::Control(class TUid) const
+	?Count@CApaAppList@@QBEHXZ @ 58 NONAME ; int CApaAppList::Count(void) const
+	?Count@CApaSystemControlList@@QBEHXZ @ 59 NONAME ; int CApaSystemControlList::Count(void) const
+	?Count@CDataRecognitionResultArray@@QBEIXZ @ 60 NONAME ; unsigned int CDataRecognitionResultArray::Count(void) const
+	?CreateDocument@RApaLsSession@@QAEHABVTDesC16@@VTUid@@AAVTThreadId@@W4TLaunchType@1@@Z @ 61 NONAME ; int RApaLsSession::CreateDocument(class TDesC16 const &, class TUid, class TThreadId &, enum RApaLsSession::TLaunchType)
+	?CreateL@CApaSystemControl@@QAEXXZ @ 62 NONAME ; void CApaSystemControl::CreateL(void)
+	?CycleTasks@TApaTaskList@@QAEHVTUid@@W4TCycleDirection@1@@Z @ 63 NONAME ; int TApaTaskList::CycleTasks(class TUid, enum TApaTaskList::TCycleDirection)
+	?DataType@CApaAppData@@QBEJABVTDataType@@@Z @ 64 NONAME ; long CApaAppData::DataType(class TDataType const &) const
+	?DataTypes@TApaAppServiceInfo@@QBEABV?$CArrayFixFlat@VTDataTypeWithPriority@@@@XZ @ 65 NONAME ; class CArrayFixFlat<class TDataTypeWithPriority> const & TApaAppServiceInfo::DataTypes(void) const
+	?DefaultScreenNumber@CApaAppData@@QBEIXZ @ 66 NONAME ; unsigned int CApaAppData::DefaultScreenNumber(void) const
+	?DeleteDataMapping@RApaLsSession@@QAEHABVTDataType@@@Z @ 67 NONAME ; int RApaLsSession::DeleteDataMapping(class TDataType const &)
+	?DeleteDataMapping@RApaLsSession@@QAEHABVTDataType@@VTUid@@@Z @ 68 NONAME ; int RApaLsSession::DeleteDataMapping(class TDataType const &, class TUid)
+	?DeregisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@@Z @ 69 NONAME ; void RApaLsSession::DeregisterNonNativeApplicationL(class TUid)
+	?DeregisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@@Z @ 70 NONAME ; void RApaLsSession::DeregisterNonNativeApplicationTypeL(class TUid)
+	?DocName@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 71 NONAME ; class TPtrC16 CApaWindowGroupName::DocName(void) const
+	?DocNameIsAFile@CApaWindowGroupName@@QBEHXZ @ 72 NONAME ; int CApaWindowGroupName::DocNameIsAFile(void) const
+	?DocumentL@CApaDoor@@QAEPAVCApaDocument@@H@Z @ 73 NONAME ; class CApaDocument * CApaDoor::DocumentL(int)
+	?EmbeddableAppCount@RApaLsSession@@QBEHAAH@Z @ 74 NONAME ; int RApaLsSession::EmbeddableAppCount(int &) const
+	?EndTask@TApaTask@@QAEXXZ @ 75 NONAME ; void TApaTask::EndTask(void)
+	?Exists@TApaTask@@QBEHXZ @ 76 NONAME ; int TApaTask::Exists(void) const
+	?ExternalizeL@CApaMaskedBitmap@@QBEXAAVRWriteStream@@@Z @ 77 NONAME ; void CApaMaskedBitmap::ExternalizeL(class RWriteStream &) const
+	?FileName@CApaSystemControl@@QBE?AV?$TBuf@$0BAA@@@XZ @ 78 NONAME ; class TBuf<256> CApaSystemControl::FileName(void) const
+	?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 79 NONAME ABSENT ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid)
+	?FindApp@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 80 NONAME ; class TApaTask TApaTaskList::FindApp(class TDesC16 const &)
+	?FindApp@TApaTaskList@@QAE?AVTApaTask@@VTUid@@@Z @ 81 NONAME ; class TApaTask TApaTaskList::FindApp(class TUid)
+	?FindByAppUid@CApaWindowGroupName@@SAXVTUid@@AAVRWsSession@@AAH@Z @ 82 NONAME ; void CApaWindowGroupName::FindByAppUid(class TUid, class RWsSession &, int &)
+	?FindByCaption@CApaWindowGroupName@@SAXABVTDesC16@@AAVRWsSession@@AAH@Z @ 83 NONAME ; void CApaWindowGroupName::FindByCaption(class TDesC16 const &, class RWsSession &, int &)
+	?FindByDocName@CApaWindowGroupName@@SAXABVTDesC16@@AAVRWsSession@@AAH@Z @ 84 NONAME ; void CApaWindowGroupName::FindByDocName(class TDesC16 const &, class RWsSession &, int &)
+	?FindByPos@TApaTaskList@@QAE?AVTApaTask@@H@Z @ 85 NONAME ; class TApaTask TApaTaskList::FindByPos(int)
+	?FindDoc@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 86 NONAME ; class TApaTask TApaTaskList::FindDoc(class TDesC16 const &)
+	?FirstApp@CApaAppList@@QBEPAVCApaAppData@@H@Z @ 87 NONAME ; class CApaAppData * CApaAppList::FirstApp(int) const
+	?FirstApp@CApaAppList@@QBEPAVCApaAppData@@XZ @ 88 NONAME ; class CApaAppData * CApaAppList::FirstApp(void) const
+	?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VTDesC16@@@@@Z @ 89 NONAME ABSENT; int RApaLsSession::ForceRegistration(class RPointerArray<class TDesC16> const &)
+	?FsSession@RApaLsSession@@SAPAVRFs@@XZ @ 90 NONAME ; class RFs * RApaLsSession::FsSession(void)
+	?GetAcceptedConfidence@RApaLsSession@@QBEHAAH@Z @ 91 NONAME ; int RApaLsSession::GetAcceptedConfidence(int &) const
+	?GetAllApps@RApaLsSession@@QBEHH@Z @ 92 NONAME ; int RApaLsSession::GetAllApps(int) const
+	?GetAllApps@RApaLsSession@@QBEHXZ @ 93 NONAME ; int RApaLsSession::GetAllApps(void) const
+	?GetAppByDataType@RApaLsSession@@QBEHABVTDataType@@VTUid@@AAV3@@Z @ 94 NONAME ; int RApaLsSession::GetAppByDataType(class TDataType const &, class TUid, class TUid &) const
+	?GetAppCapability@RApaLsSession@@QBEHAAVTDes8@@VTUid@@@Z @ 95 NONAME ; int RApaLsSession::GetAppCapability(class TDes8 &, class TUid) const
+	?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAPAVHBufC16@@@Z @ 96 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class HBufC16 * &) const
+	?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAVRFile@@@Z @ 97 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class RFile &) const
+	?GetAppIcon@RApaLsSession@@QBEHVTUid@@HAAVCApaMaskedBitmap@@@Z @ 98 NONAME ; int RApaLsSession::GetAppIcon(class TUid, int, class CApaMaskedBitmap &) const
+	?GetAppIcon@RApaLsSession@@QBEHVTUid@@VTSize@@AAVCApaMaskedBitmap@@@Z @ 99 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class TSize, class CApaMaskedBitmap &) const
+	?GetAppIconSizes@RApaLsSession@@QBEHVTUid@@AAV?$CArrayFixFlat@VTSize@@@@@Z @ 100 NONAME ; int RApaLsSession::GetAppIconSizes(class TUid, class CArrayFixFlat<class TSize> &) const
+	?GetAppInfo@RApaLsSession@@QBEHAAVTApaAppInfo@@VTUid@@@Z @ 101 NONAME ; int RApaLsSession::GetAppInfo(class TApaAppInfo &, class TUid) const
+	?GetAppOwnedFiles@RApaLsSession@@QBEHAAVCDesC16Array@@VTUid@@@Z @ 102 NONAME ; int RApaLsSession::GetAppOwnedFiles(class CDesC16Array &, class TUid) const
+	?GetAppServiceOpaqueDataLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@0@Z @ 103 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetAppServiceOpaqueDataLC(class TUid, class TUid) const
+	?GetAppServicesL@RApaLsSession@@QBEXVTUid@@AAV?$CArrayFixFlat@VTUid@@@@@Z @ 104 NONAME ; void RApaLsSession::GetAppServicesL(class TUid, class CArrayFixFlat<class TUid> &) const
+	?GetAppServicesLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@@Z @ 105 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetAppServicesLC(class TUid) const
+	?GetAppType@RApaLsSession@@QBEHAAVTUid@@V2@@Z @ 106 NONAME ; int RApaLsSession::GetAppType(class TUid &, class TUid) const
+	?GetAppViewIcon@RApaLsSession@@QBEHVTUid@@0AAPAVHBufC16@@@Z @ 107 NONAME ; int RApaLsSession::GetAppViewIcon(class TUid, class TUid, class HBufC16 * &) const
+	?GetAppViewIcon@RApaLsSession@@QBEHVTUid@@0ABVTSize@@AAVCApaMaskedBitmap@@@Z @ 108 NONAME ; int RApaLsSession::GetAppViewIcon(class TUid, class TUid, class TSize const &, class CApaMaskedBitmap &) const
+	?GetAppViews@RApaLsSession@@QBEHAAV?$CArrayFixFlat@VTApaAppViewInfo@@@@VTUid@@@Z @ 109 NONAME ; int RApaLsSession::GetAppViews(class CArrayFixFlat<class TApaAppViewInfo> &, class TUid) const
+	?GetDataRecognitionResultL@CDataRecognitionResultArray@@QBEXAAVTDataRecognitionResult@@I@Z @ 110 NONAME ; void CDataRecognitionResultArray::GetDataRecognitionResultL(class TDataRecognitionResult &, unsigned int) const
+	?GetDefaultScreenNumber@RApaLsSession@@QBEHAAHVTUid@@@Z @ 111 NONAME ; int RApaLsSession::GetDefaultScreenNumber(int &, class TUid) const
+	?GetEmbeddableApps@RApaLsSession@@QBEHH@Z @ 112 NONAME ; int RApaLsSession::GetEmbeddableApps(int) const
+	?GetEmbeddableApps@RApaLsSession@@QBEHXZ @ 113 NONAME ; int RApaLsSession::GetEmbeddableApps(void) const
+	?GetFileNameL@CDataRecognitionResultArray@@QBEXAAV?$TBuf@$0BAA@@@I@Z @ 114 NONAME ; void CDataRecognitionResultArray::GetFileNameL(class TBuf<256> &, unsigned int) const
+	?GetFilteredApps@RApaLsSession@@QBEHABVTApaEmbeddabilityFilter@@@Z @ 115 NONAME ; int RApaLsSession::GetFilteredApps(class TApaEmbeddabilityFilter const &) const
+	?GetFilteredApps@RApaLsSession@@QBEHABVTApaEmbeddabilityFilter@@H@Z @ 116 NONAME ; int RApaLsSession::GetFilteredApps(class TApaEmbeddabilityFilter const &, int) const
+	?GetFilteredApps@RApaLsSession@@QBEHII@Z @ 117 NONAME ; int RApaLsSession::GetFilteredApps(unsigned int, unsigned int) const
+	?GetFilteredApps@RApaLsSession@@QBEHIIH@Z @ 118 NONAME ; int RApaLsSession::GetFilteredApps(unsigned int, unsigned int, int) const
+	?GetIconInfo@CApaAppData@@QBEXAAH0@Z @ 119 NONAME ; void CApaAppData::GetIconInfo(int &, int &) const
+	?GetJavaMIDletInfoL@ForJavaMIDletInstaller@@SAXAAVRFs@@ABVTDesC16@@AAK2@Z @ 120 NONAME ABSENT ; void ForJavaMIDletInstaller::GetJavaMIDletInfoL(class RFs &, class TDesC16 const &, unsigned long &, unsigned long &)
+	?GetMaxDataBufSize@RApaLsSession@@QBEHAAH@Z @ 121 NONAME ; int RApaLsSession::GetMaxDataBufSize(int &) const
+	?GetNextApp@RApaLsSession@@QBEHAAVTApaAppInfo@@@Z @ 122 NONAME ; int RApaLsSession::GetNextApp(class TApaAppInfo &) const
+	?GetNextApp@RApaLsSession@@QBEHAAVTApaAppInfo@@H@Z @ 123 NONAME ; int RApaLsSession::GetNextApp(class TApaAppInfo &, int) const
+	?GetPreferredBufSize@RApaLsSession@@QBEHAAH@Z @ 124 NONAME ; int RApaLsSession::GetPreferredBufSize(int &) const
+	?GetServerApps@RApaLsSession@@QBEHVTUid@@@Z @ 125 NONAME ; int RApaLsSession::GetServerApps(class TUid) const
+	?GetServerApps@RApaLsSession@@QBEHVTUid@@H@Z @ 126 NONAME ; int RApaLsSession::GetServerApps(class TUid, int) const
+	?GetServiceImplementationsLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@@Z @ 127 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetServiceImplementationsLC(class TUid) const
+	?GetServiceImplementationsLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@ABVTDataType@@@Z @ 128 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetServiceImplementationsLC(class TUid, class TDataType const &) const
+	?GetSupportedDataTypesL@RApaLsSession@@QBEHAAV?$CArrayFixFlat@VTDataType@@@@@Z @ 129 NONAME ; int RApaLsSession::GetSupportedDataTypesL(class CArrayFixFlat<class TDataType> &) const
+	?HandleAsRegistrationFile@ApaUtils@@SAHABVTUidType@@@Z @ 130 NONAME ABSENT ; int ApaUtils::HandleAsRegistrationFile(class TUidType const &)
+	?Hidden@CApaWindowGroupName@@QBEHXZ @ 131 NONAME ; int CApaWindowGroupName::Hidden(void) const
+	?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@H@Z @ 132 NONAME ; class CApaMaskedBitmap * CApaAppData::Icon(int) const
+	?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@VTSize@@@Z @ 133 NONAME ; class CApaMaskedBitmap * CApaAppData::Icon(class TSize) const
+	?Icon@CApaAppViewData@@QBEPAVCApaMaskedBitmap@@ABVTSize@@@Z @ 134 NONAME ; class CApaMaskedBitmap * CApaAppViewData::Icon(class TSize const &) const
+	?Icon@CApaSystemControl@@QBEPAVCApaMaskedBitmap@@XZ @ 135 NONAME ; class CApaMaskedBitmap * CApaSystemControl::Icon(void) const
+	?IconFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 136 NONAME ; class TPtrC16 CApaAppData::IconFileName(void) const
+	?IconFileName@CApaAppViewData@@QBE?AVTPtrC16@@XZ @ 137 NONAME ; class TPtrC16 CApaAppViewData::IconFileName(void) const
+	?IconSizesL@CApaAppData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 138 NONAME ; class CArrayFixFlat<class TSize> * CApaAppData::IconSizesL(void) const
+	?IconSizesL@CApaAppViewData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 139 NONAME ; class CArrayFixFlat<class TSize> * CApaAppViewData::IconSizesL(void) const
+	?ImplementsService@CApaAppData@@QBEHVTUid@@@Z @ 140 NONAME ; int CApaAppData::ImplementsService(class TUid) const
+	?Index@CApaSystemControlList@@QBEHVTUid@@@Z @ 141 NONAME ; int CApaSystemControlList::Index(class TUid) const
+	?InitListL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 142 NONAME ; void CApaAppList::InitListL(class MApaAppListObserver *)
+	?InsertDataMapping@RApaLsSession@@QAEHABVTDataType@@JVTUid@@1@Z @ 143 NONAME ; int RApaLsSession::InsertDataMapping(class TDataType const &, long, class TUid, class TUid)
+	?InsertDataMapping@RApaLsSession@@QAEHABVTDataType@@JVTUid@@@Z @ 144 NONAME ; int RApaLsSession::InsertDataMapping(class TDataType const &, long, class TUid)
+	?InsertDataMappingIfHigher@RApaLsSession@@QAEHABVTDataType@@JVTUid@@AAH@Z @ 145 NONAME ; int RApaLsSession::InsertDataMappingIfHigher(class TDataType const &, long, class TUid, int &)
+	?InternalizeL@CApaMaskedBitmap@@QAEXAAVRReadStream@@@Z @ 146 NONAME ; void CApaMaskedBitmap::InternalizeL(class RReadStream &)
+	?IsAppReady@CApaWindowGroupName@@QBEHXZ @ 147 NONAME ; int CApaWindowGroupName::IsAppReady(void) const
+	?IsBusy@CApaWindowGroupName@@QBEHXZ @ 148 NONAME ; int CApaWindowGroupName::IsBusy(void) const
+	?IsFirstScanComplete@CApaAppList@@QBEHXZ @ 149 NONAME ; int CApaAppList::IsFirstScanComplete(void) const
+	?IsIdleUpdateComplete@CApaAppList@@QBEHXZ @ 150 NONAME ; int CApaAppList::IsIdleUpdateComplete(void) const
+	?IsLanguageChangePending@CApaAppList@@QBEHXZ @ 151 NONAME ; int CApaAppList::IsLanguageChangePending(void) const
+	?IsPending@CApaAppData@@QBEHXZ @ 152 NONAME ABSENT ; int CApaAppData::IsPending(void) const
+	?IsProgram@RApaLsSession@@QBEHABVTDesC16@@AAH@Z @ 153 NONAME ; int RApaLsSession::IsProgram(class TDesC16 const &, int &) const
+	?IsSystem@CApaWindowGroupName@@QBEHXZ @ 154 NONAME ; int CApaWindowGroupName::IsSystem(void) const
+	?KillTask@TApaTask@@QAEXXZ @ 155 NONAME ; void TApaTask::KillTask(void)
+	?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 156 NONAME ABSENT ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const
+	?MApaAppListServObserver_Reserved1@MApaAppListServObserver@@EAEXXZ @ 157 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved1(void)
+	?MApaAppListServObserver_Reserved2@MApaAppListServObserver@@EAEXXZ @ 158 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved2(void)
+	?Mask@CApaMaskedBitmap@@QBEPAVCFbsBitmap@@XZ @ 159 NONAME ; class CFbsBitmap * CApaMaskedBitmap::Mask(void) const
+	?MatchesSecurityPolicy@RApaLsSession@@QBEHAAHVTUid@@ABVTSecurityPolicy@@@Z @ 160 NONAME ; int RApaLsSession::MatchesSecurityPolicy(int &, class TUid, class TSecurityPolicy const &) const
+	?MinApplicationStackSize@@YAIXZ @ 161 NONAME ; unsigned int MinApplicationStackSize(void)
+	?New@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@PAVHBufC16@@@Z @ 162 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::New(class RWsSession const &, class HBufC16 *)
+	?NewInterimFormatFileWriterLC@ForJavaMIDletInstaller@@SAPAVCApaAppInfoFileWriter@@AAVRFs@@ABVTDesC16@@VTUid@@KH@Z @ 163 NONAME ABSENT ; class CApaAppInfoFileWriter * ForJavaMIDletInstaller::NewInterimFormatFileWriterLC(class RFs &, class TDesC16 const &, class TUid, unsigned long, int)
+	?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 164 NONAME ABSENT ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &)
+	?NewL@CApaAppList@@SAPAV1@AAVRFs@@PAVCApaAppRegFinder@@HH@Z @ 165 NONAME ABSENT ; class CApaAppList * CApaAppList::NewL(class RFs &, class CApaAppRegFinder *, int, int)
+	?NewL@CApaAppListNotifier@@SAPAV1@PAVMApaAppListServObserver@@W4TPriority@CActive@@@Z @ 166 NONAME ; class CApaAppListNotifier * CApaAppListNotifier::NewL(class MApaAppListServObserver *, enum CActive::TPriority)
+	?NewL@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 167 NONAME ; class CApaDoor * CApaDoor::NewL(class RFs &, class CApaDocument &, class TSize const &)
+	?NewL@CApaDoor@@SAPAV1@AAVRFs@@ABVCStreamStore@@VTStreamId@@AAVCApaProcess@@@Z @ 168 NONAME ; class CApaDoor * CApaDoor::NewL(class RFs &, class CStreamStore const &, class TStreamId, class CApaProcess &)
+	?NewL@CApaLocalisableResourceFileWriter@@SAPAV1@ABVTDesC16@@0H0@Z @ 169 NONAME ; class CApaLocalisableResourceFileWriter * CApaLocalisableResourceFileWriter::NewL(class TDesC16 const &, class TDesC16 const &, int, class TDesC16 const &)
+	?NewL@CApaMaskedBitmap@@SAPAV1@PBV1@@Z @ 170 NONAME ; class CApaMaskedBitmap * CApaMaskedBitmap::NewL(class CApaMaskedBitmap const *)
+	?NewL@CApaRegistrationResourceFileWriter@@SAPAV1@VTUid@@ABVTDesC16@@I@Z @ 171 NONAME ; class CApaRegistrationResourceFileWriter * CApaRegistrationResourceFileWriter::NewL(class TUid, class TDesC16 const &, unsigned int)
+	?NewL@CApaSystemControlList@@SAPAV1@AAVRFs@@@Z @ 172 NONAME ; class CApaSystemControlList * CApaSystemControlList::NewL(class RFs &)
+	?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@@Z @ 173 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewL(class RWsSession const &)
+	?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@ABVTDesC16@@@Z @ 174 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewL(class RWsSession const &, class TDesC16 const &)
+	?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@H@Z @ 175 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewL(class RWsSession const &, int)
+	?NewLC@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 176 NONAME ; class CApaDoor * CApaDoor::NewLC(class RFs &, class CApaDocument &, class TSize const &)
+	?NewLC@CApaMaskedBitmap@@SAPAV1@XZ @ 177 NONAME ; class CApaMaskedBitmap * CApaMaskedBitmap::NewLC(void)
+	?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@@Z @ 178 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewLC(class RWsSession const &)
+	?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@ABVTDesC16@@@Z @ 179 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewLC(class RWsSession const &, class TDesC16 const &)
+	?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@H@Z @ 180 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewLC(class RWsSession const &, int)
+	?NewPictureL@TApaPictureFactory@@UBEXAAVTPictureHeader@@ABVCStreamStore@@@Z @ 181 NONAME ; void TApaPictureFactory::NewPictureL(class TPictureHeader &, class CStreamStore const &) const
+	?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@@Z @ 182 NONAME ; class CApaAppData * CApaAppList::NextApp(class CApaAppData const *) const
+	?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@H@Z @ 183 NONAME ; class CApaAppData * CApaAppList::NextApp(class CApaAppData const *, int) const
+	?NonMbmIconFile@CApaAppData@@QBEHXZ @ 184 NONAME ; int CApaAppData::NonMbmIconFile(void) const
+	?NonMbmIconFile@CApaAppViewData@@QBEHXZ @ 185 NONAME ; int CApaAppViewData::NonMbmIconFile(void) const
+	?NonNativeApplicationType@CApaAppData@@QBE?AVTUid@@XZ @ 186 NONAME ; class TUid CApaAppData::NonNativeApplicationType(void) const
+	?NotifyOnDataMappingChange@RApaLsSession@@QAEXAAVTRequestStatus@@@Z @ 187 NONAME ; void RApaLsSession::NotifyOnDataMappingChange(class TRequestStatus &)
+	?NumberOfOwnDefinedIcons@RApaLsSession@@QBEHVTUid@@AAH@Z @ 188 NONAME ; int RApaLsSession::NumberOfOwnDefinedIcons(class TUid, int &) const
+	?OpaqueData@CApaAppData@@QBE?AVTPtrC8@@XZ @ 189 NONAME ; class TPtrC8 CApaAppData::OpaqueData(void) const
+	?OpaqueData@TApaAppServiceInfo@@QBEABVTDesC8@@XZ @ 190 NONAME ; class TDesC8 const & TApaAppServiceInfo::OpaqueData(void) const
+	?OwnedFiles@CApaAppData@@QBEPAVCDesC16Array@@XZ @ 191 NONAME ; class CDesC16Array * CApaAppData::OwnedFiles(void) const
+	?Path@CDataRecognitionResultArray@@QBEABV?$TBuf@$0BAA@@@XZ @ 192 NONAME ; class TBuf<256> const & CDataRecognitionResultArray::Path(void) const
+	?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@@Z @ 193 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &) const
+	?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@PBV2@AAH@Z @ 194 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &, class TUid const *, int &) const
+	?PrepareNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 195 NONAME ; void RApaLsSession::PrepareNonNativeApplicationsUpdatesL(void)
+	?PurgeL@CApaAppList@@QAEXXZ @ 196 NONAME ABSENT ; void CApaAppList::PurgeL(void)
+	?RApaLsSession_Reserved1@RApaLsSession@@EAEXXZ @ 197 NONAME ; void RApaLsSession::RApaLsSession_Reserved1(void)
+	?RApaLsSession_Reserved2@RApaLsSession@@EAEXXZ @ 198 NONAME ; void RApaLsSession::RApaLsSession_Reserved2(void)
+	?RecognizeData@RApaLsSession@@QBEHABVRFile@@AAVTDataRecognitionResult@@@Z @ 199 NONAME ; int RApaLsSession::RecognizeData(class RFile const &, class TDataRecognitionResult &) const
+	?RecognizeData@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@AAVTDataRecognitionResult@@@Z @ 200 NONAME ; int RApaLsSession::RecognizeData(class TDesC16 const &, class TDesC8 const &, class TDataRecognitionResult &) const
+	?RecognizeFilesL@RApaLsSession@@QAEXABVTDesC16@@AAVCDataRecognitionResultArray@@AAVTRequestStatus@@@Z @ 201 NONAME ; void RApaLsSession::RecognizeFilesL(class TDesC16 const &, class CDataRecognitionResultArray &, class TRequestStatus &)
+	?RecognizeFilesL@RApaLsSession@@QAEXABVTDesC16@@ABVTDesC8@@AAVCDataRecognitionResultArray@@AAVTRequestStatus@@@Z @ 202 NONAME ; void RApaLsSession::RecognizeFilesL(class TDesC16 const &, class TDesC8 const &, class CDataRecognitionResultArray &, class TRequestStatus &)
+	?RecognizeFilesL@RApaLsSession@@QBEHABVTDesC16@@AAVCDataRecognitionResultArray@@@Z @ 203 NONAME ; int RApaLsSession::RecognizeFilesL(class TDesC16 const &, class CDataRecognitionResultArray &) const
+	?RecognizeFilesL@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@AAVCDataRecognitionResultArray@@@Z @ 204 NONAME ; int RApaLsSession::RecognizeFilesL(class TDesC16 const &, class TDesC8 const &, class CDataRecognitionResultArray &) const
+	?RecognizeSpecificData@RApaLsSession@@QBEHABVRFile@@ABVTDataType@@AAH@Z @ 205 NONAME ; int RApaLsSession::RecognizeSpecificData(class RFile const &, class TDataType const &, int &) const
+	?RecognizeSpecificData@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@ABVTDataType@@AAH@Z @ 206 NONAME ; int RApaLsSession::RecognizeSpecificData(class TDesC16 const &, class TDesC8 const &, class TDataType const &, int &) const
+	?RegisterListPopulationCompleteObserver@RApaLsSession@@QBEXAAVTRequestStatus@@@Z @ 207 NONAME ; void RApaLsSession::RegisterListPopulationCompleteObserver(class TRequestStatus &) const
+	?RegisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@ABVTDriveUnit@@AAVCApaRegistrationResourceFileWriter@@PAVCApaLocalisableResourceFileWriter@@PBVRFile@@@Z @ 208 NONAME ; void RApaLsSession::RegisterNonNativeApplicationL(class TUid, class TDriveUnit const &, class CApaRegistrationResourceFileWriter &, class CApaLocalisableResourceFileWriter *, class RFile const *)
+	?RegisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@ABVTDesC16@@@Z @ 209 NONAME ; void RApaLsSession::RegisterNonNativeApplicationTypeL(class TUid, class TDesC16 const &)
+	?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 210 NONAME ABSENT ; class TPtrC16 CApaAppData::RegistrationFileName(void) const
+	?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 211 NONAME ABSENT ; int CApaAppData::RegistrationFileUsed(void) const
+	?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 212 NONAME ABSENT; void CApaAppList::ResetForcedRegistrations(void)
+	?RespondsToShutdownEvent@CApaWindowGroupName@@QBEHXZ @ 213 NONAME ; int CApaWindowGroupName::RespondsToShutdownEvent(void) const
+	?RespondsToSwitchFilesEvent@CApaWindowGroupName@@QBEHXZ @ 214 NONAME ; int CApaWindowGroupName::RespondsToSwitchFilesEvent(void) const
+	?RestartScanL@CApaAppList@@QAEXXZ @ 215 NONAME ABSENT ; void CApaAppList::RestartScanL(void)
+	?RestoreL@CApaDoor@@QAEXABVCStreamStore@@VTStreamId@@@Z @ 216 NONAME ; void CApaDoor::RestoreL(class CStreamStore const &, class TStreamId)
+	?RollbackNonNativeApplicationsUpdates@RApaLsSession@@QAEHXZ @ 217 NONAME ; int RApaLsSession::RollbackNonNativeApplicationsUpdates(void)
+	?ScreenMode@CApaAppViewData@@QBEHXZ @ 218 NONAME ; int CApaAppViewData::ScreenMode(void) const
+	?Self@CApaAppList@@SAPAV1@XZ @ 219 NONAME ; class CApaAppList * CApaAppList::Self(void)
+	?SendKey@TApaTask@@QAEXABUTKeyEvent@@@Z @ 220 NONAME ; void TApaTask::SendKey(struct TKeyEvent const &)
+	?SendKey@TApaTask@@QAEXHH@Z @ 221 NONAME ; void TApaTask::SendKey(int, int)
+	?SendMessage@TApaTask@@QAEHVTUid@@ABVTDesC8@@@Z @ 222 NONAME ; int TApaTask::SendMessage(class TUid, class TDesC8 const &)
+	?SendSystemEvent@TApaTask@@QAEXW4TApaSystemEvent@@@Z @ 223 NONAME ; void TApaTask::SendSystemEvent(enum TApaSystemEvent)
+	?SendToBackground@TApaTask@@QAEXXZ @ 224 NONAME ; void TApaTask::SendToBackground(void)
+	?ServiceArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 225 NONAME ; class CBufFlat * CApaAppList::ServiceArrayBufferL(class TUid) const
+	?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 226 NONAME ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid) const
+	?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@ABVTDataType@@@Z @ 227 NONAME ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid, class TDataType const &) const
+	?ServiceOpaqueDataBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@0@Z @ 228 NONAME ; class CBufFlat * CApaAppList::ServiceOpaqueDataBufferL(class TUid, class TUid) const
+	?ServiceUidBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 229 NONAME ; class CBufFlat * CApaAppList::ServiceUidBufferL(class TUid) const
+	?SetAcceptedConfidence@RApaLsSession@@QAEHH@Z @ 230 NONAME ; int RApaLsSession::SetAcceptedConfidence(int)
+	?SetAppIsHiddenL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 231 NONAME ; void CApaRegistrationResourceFileWriter::SetAppIsHiddenL(int)
+	?SetAppReady@CApaWindowGroupName@@QAEXH@Z @ 232 NONAME ; void CApaWindowGroupName::SetAppReady(int)
+	?SetAppShortCaption@RApaLsSession@@QAEHABVTDesC16@@W4TLanguage@@VTUid@@@Z @ 233 NONAME ; int RApaLsSession::SetAppShortCaption(class TDesC16 const &, enum TLanguage, class TUid)
+	?SetAppUid@CApaWindowGroupName@@QAEXVTUid@@@Z @ 234 NONAME ; void CApaWindowGroupName::SetAppUid(class TUid)
+	?SetBusy@CApaWindowGroupName@@QAEXH@Z @ 235 NONAME ; void CApaWindowGroupName::SetBusy(int)
+	?SetCapability@CApaAppInfoFileWriter@@QAEHABVTDesC8@@@Z @ 236 NONAME ABSENT ; int CApaAppInfoFileWriter::SetCapability(class TDesC8 const &)
+	?SetCaptionL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 237 NONAME ; void CApaWindowGroupName::SetCaptionL(class TDesC16 const &)
+	?SetDefaultScreenNumberL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 238 NONAME ; void CApaRegistrationResourceFileWriter::SetDefaultScreenNumberL(int)
+	?SetDocNameIsAFile@CApaWindowGroupName@@QAEXH@Z @ 239 NONAME ; void CApaWindowGroupName::SetDocNameIsAFile(int)
+	?SetDocNameL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 240 NONAME ; void CApaWindowGroupName::SetDocNameL(class TDesC16 const &)
+	?SetEmbeddabilityL@CApaRegistrationResourceFileWriter@@QAEXW4TEmbeddability@TApaAppCapability@@@Z @ 241 NONAME ; void CApaRegistrationResourceFileWriter::SetEmbeddabilityL(enum TApaAppCapability::TEmbeddability)
+	?SetFormatToGlassL@CApaDoor@@QAEXXZ @ 242 NONAME ; void CApaDoor::SetFormatToGlassL(void)
+	?SetFormatToIconL@CApaDoor@@QAEXXZ @ 243 NONAME ; void CApaDoor::SetFormatToIconL(void)
+	?SetFormatToTemporaryIconL@CApaDoor@@QAEXH@Z @ 244 NONAME ; void CApaDoor::SetFormatToTemporaryIconL(int)
+	?SetFsSessionL@RApaLsSession@@SAXAAVRFs@@@Z @ 245 NONAME ; void RApaLsSession::SetFsSessionL(class RFs &)
+	?SetGroupNameL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC16@@@Z @ 246 NONAME ; void CApaRegistrationResourceFileWriter::SetGroupNameL(class TDesC16 const &)
+	?SetHidden@CApaWindowGroupName@@QAEXH@Z @ 247 NONAME ; void CApaWindowGroupName::SetHidden(int)
+	?SetLaunchInBackgroundL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 248 NONAME ; void CApaRegistrationResourceFileWriter::SetLaunchInBackgroundL(int)
+	?SetMaskBitmap@CApaMaskedBitmap@@QAEXPAVCFbsBitmap@@@Z @ 249 NONAME ; void CApaMaskedBitmap::SetMaskBitmap(class CFbsBitmap *)
+	?SetMaxDataBufSize@RApaLsSession@@QAEHH@Z @ 250 NONAME ; int RApaLsSession::SetMaxDataBufSize(int)
+	?SetNotify@RApaLsSession@@QAEXHAAVTRequestStatus@@@Z @ 251 NONAME ; void RApaLsSession::SetNotify(int, class TRequestStatus &)
+	?SetOpaqueDataL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC8@@@Z @ 252 NONAME ; void CApaRegistrationResourceFileWriter::SetOpaqueDataL(class TDesC8 const &)
+	?SetRespondsToShutdownEvent@CApaWindowGroupName@@QAEXH@Z @ 253 NONAME ; void CApaWindowGroupName::SetRespondsToShutdownEvent(int)
+	?SetRespondsToSwitchFilesEvent@CApaWindowGroupName@@QAEXH@Z @ 254 NONAME ; void CApaWindowGroupName::SetRespondsToSwitchFilesEvent(int)
+	?SetShortCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 255 NONAME ; void CApaAppData::SetShortCaptionL(class TDesC16 const &)
+	?SetSupportsNewFileL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 256 NONAME ; void CApaRegistrationResourceFileWriter::SetSupportsNewFileL(int)
+	?SetSystem@CApaWindowGroupName@@QAEXH@Z @ 257 NONAME ; void CApaWindowGroupName::SetSystem(int)
+	?SetUpdatedAppsList@CApaAppList@@QAEXPAVCUpdatedAppsList@@@Z @ 258 NONAME ABSENT ; void CApaAppList::SetUpdatedAppsList(class CUpdatedAppsList *)
+	?SetWgId@TApaTask@@QAEXH@Z @ 259 NONAME ; void TApaTask::SetWgId(int)
+	?SetWindowGroupName@CApaWindowGroupName@@QAEXPAVHBufC16@@@Z @ 260 NONAME ; void CApaWindowGroupName::SetWindowGroupName(class HBufC16 *)
+	?SetWindowGroupName@CApaWindowGroupName@@QBEHAAVRWindowGroup@@@Z @ 261 NONAME ; int CApaWindowGroupName::SetWindowGroupName(class RWindowGroup &) const
+	?SetWindowGroupNameL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 262 NONAME ; void CApaWindowGroupName::SetWindowGroupNameL(class TDesC16 const &)
+	?ShortCaption@CApaSystemControl@@QBE?AVTPtrC16@@XZ @ 263 NONAME ; class TPtrC16 CApaSystemControl::ShortCaption(void) const
+	?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@@Z @ 264 NONAME ; int RApaLsSession::StartApp(class CApaCommandLine const &)
+	?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@AAVTThreadId@@@Z @ 265 NONAME ; int RApaLsSession::StartApp(class CApaCommandLine const &, class TThreadId &)
+	?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 266 NONAME ; int RApaLsSession::StartApp(class CApaCommandLine const &, class TThreadId &, class TRequestStatus *)
+	?StartDocument@RApaLsSession@@QAEHAAVRFile@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 267 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TThreadId &, class TRequestStatus *)
+	?StartDocument@RApaLsSession@@QAEHAAVRFile@@ABVTDataType@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 268 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TDataType const &, class TThreadId &, class TRequestStatus *)
+	?StartDocument@RApaLsSession@@QAEHAAVRFile@@VTUid@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 269 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TUid, class TThreadId &, class TRequestStatus *)
+	?StartDocument@RApaLsSession@@QAEHABVTDesC16@@AAVTThreadId@@W4TLaunchType@1@@Z @ 270 NONAME ; int RApaLsSession::StartDocument(class TDesC16 const &, class TThreadId &, enum RApaLsSession::TLaunchType)
+	?StartDocument@RApaLsSession@@QAEHABVTDesC16@@ABVTDataType@@AAVTThreadId@@W4TLaunchType@1@@Z @ 271 NONAME ; int RApaLsSession::StartDocument(class TDesC16 const &, class TDataType const &, class TThreadId &, enum RApaLsSession::TLaunchType)
+	?StartDocument@RApaLsSession@@QAEHABVTDesC16@@VTUid@@AAVTThreadId@@W4TLaunchType@1@@Z @ 272 NONAME ; int RApaLsSession::StartDocument(class TDesC16 const &, class TUid, class TThreadId &, enum RApaLsSession::TLaunchType)
+	?StartIdleUpdateL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 273 NONAME ; void CApaAppList::StartIdleUpdateL(class MApaAppListObserver *)
+	?StartIdleUpdateL@CApaAppList@@QAEXXZ @ 274 NONAME ; void CApaAppList::StartIdleUpdateL(void)
+	?StartupApaServer@@YAHAAVMApaAppStarter@@@Z @ 275 NONAME ABSENT ; int StartupApaServer(class MApaAppStarter &)
+	?StartupApaServerProcess@@YAHXZ @ 276 NONAME ; int StartupApaServerProcess(void)
+	?StopScan@CApaAppList@@QAEXH@Z @ 277 NONAME ABSENT ; void CApaAppList::StopScan(int)
+	?StoreL@CApaAppInfoFileWriter@@QAEXXZ @ 278 NONAME ABSENT ; void CApaAppInfoFileWriter::StoreL(void)
+	?SwitchCreateFile@TApaTask@@QAEHABVTDesC16@@@Z @ 279 NONAME ; int TApaTask::SwitchCreateFile(class TDesC16 const &)
+	?SwitchOpenFile@TApaTask@@QAEHABVTDesC16@@@Z @ 280 NONAME ; int TApaTask::SwitchOpenFile(class TDesC16 const &)
+	?TestIconLoaderAndIconArrayL@TIconLoaderAndIconArrayForLeaks@@SAXXZ @ 281 NONAME ; void TIconLoaderAndIconArrayForLeaks::TestIconLoaderAndIconArrayL(void)
+	?ThreadId@TApaTask@@QBE?AVTThreadId@@XZ @ 282 NONAME ; class TThreadId TApaTask::ThreadId(void) const
+	?Type@CApaSystemControl@@QBE?AVTUid@@XZ @ 283 NONAME ; class TUid CApaSystemControl::Type(void) const
+	?Uid@CApaAppViewData@@QBE?AVTUid@@XZ @ 284 NONAME ; class TUid CApaAppViewData::Uid(void) const
+	?Uid@TApaAppServiceInfo@@QBE?AVTUid@@XZ @ 285 NONAME ; class TUid TApaAppServiceInfo::Uid(void) const
+	?UpdateL@CApaSystemControlList@@QAEXXZ @ 286 NONAME ; void CApaSystemControlList::UpdateL(void)
+	?UpdatedAppsList@CApaAppList@@QAEPAVCUpdatedAppsList@@XZ @ 287 NONAME ABSENT ; class CUpdatedAppsList * CApaAppList::UpdatedAppsList(void)
+	?Version@RApaLsSession@@QBE?AVTVersion@@XZ @ 288 NONAME ; class TVersion RApaLsSession::Version(void) const
+	?Views@CApaAppData@@QBEPAV?$CArrayPtrFlat@VCApaAppViewData@@@@XZ @ 289 NONAME ; class CArrayPtrFlat<class CApaAppViewData> * CApaAppData::Views(void) const
+	?WgId@TApaTask@@QBEHXZ @ 290 NONAME ; int TApaTask::WgId(void) const
+	?WindowGroupName@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 291 NONAME ; class TPtrC16 CApaWindowGroupName::WindowGroupName(void) const
+	?KMinApplicationStackSize@@3HB @ 292 NONAME ; int const KMinApplicationStackSize
+	?CheckAppSecurity@CApaSecurityUtils@@SAHABVTPtrC16@@AAH1@Z @ 293 NONAME ; int CApaSecurityUtils::CheckAppSecurity(class TPtrC16 const &, int &, int &)
+	?SetCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 294 NONAME ; void CApaAppData::SetCaptionL(class TDesC16 const &)
+	?SetIconsL@CApaAppData@@QAEXABVTDesC16@@H@Z @ 295 NONAME ; void CApaAppData::SetIconsL(class TDesC16 const &, int)
+	?TestIconCaptionOverridesL@TIconLoaderAndIconArrayForLeaks@@SAXXZ @ 296 NONAME ; void TIconLoaderAndIconArrayForLeaks::TestIconCaptionOverridesL(void)
+	?ForceCommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 297 NONAME ; void RApaLsSession::ForceCommitNonNativeApplicationsUpdatesL(void)
+	?DataTypes@TApaAppServiceInfo@@QAEAAV?$CArrayFixFlat@VTDataTypeWithPriority@@@@XZ @ 298 NONAME ; class CArrayFixFlat<class TDataTypeWithPriority> & TApaAppServiceInfo::DataTypes(void)
+	??0TApaAppIdentifier@@QAE@XZ @ 299 NONAME ; TApaAppIdentifier::TApaAppIdentifier(void)
+	?AddForcedRegistrationL@CApaAppList@@QAEXABVTDesC16@@@Z @ 300 NONAME ABSENT; void CApaAppList::AddForcedRegistrationL(class TDesC16 const &)
+	?ExternalizeL@TApaAppCapability@@QBEXAAVRWriteStream@@@Z @ 301 NONAME ; void TApaAppCapability::ExternalizeL(class RWriteStream &) const
+	??0TApaAppInfo@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@11@Z @ 302 NONAME ; TApaAppInfo::TApaAppInfo(class TUid, class TBuf<256> const &, class TBuf<256> const &, class TBuf<256> const &)
+	?AddEmbeddability@TApaEmbeddabilityFilter@@QAEXW4TEmbeddability@TApaAppCapability@@@Z @ 303 NONAME ; void TApaEmbeddabilityFilter::AddEmbeddability(enum TApaAppCapability::TEmbeddability)
+	?InternalizeL@TApaAppServiceInfo@@QAEXAAVRReadStream@@@Z @ 304 NONAME ; void TApaAppServiceInfo::InternalizeL(class RReadStream &)
+	?InternalizeL@TApaAppViewInfo@@QAEXAAVRReadStream@@@Z @ 305 NONAME ; void TApaAppViewInfo::InternalizeL(class RReadStream &)
+	?MatchesEmbeddability@TApaEmbeddabilityFilter@@QBEHW4TEmbeddability@TApaAppCapability@@@Z @ 306 NONAME ; int TApaEmbeddabilityFilter::MatchesEmbeddability(enum TApaAppCapability::TEmbeddability) const
+	?ExternalizeL@TApaAppServiceInfo@@QBEXAAVRWriteStream@@@Z @ 307 NONAME ; void TApaAppServiceInfo::ExternalizeL(class RWriteStream &) const
+	??0CApaAppServiceInfoArray@@IAE@XZ @ 308 NONAME ; CApaAppServiceInfoArray::CApaAppServiceInfoArray(void)
+	??0TApaAppIdentifier@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@@Z @ 309 NONAME ; TApaAppIdentifier::TApaAppIdentifier(class TUid, class TBuf<256> const &)
+	?CopyCapability@TApaAppCapability@@SAXAAVTDes8@@ABVTDesC8@@@Z @ 310 NONAME ; void TApaAppCapability::CopyCapability(class TDes8 &, class TDesC8 const &)
+	??0TApaAppServiceInfo@@QAE@XZ @ 311 NONAME ; TApaAppServiceInfo::TApaAppServiceInfo(void)
+	?Release@TApaAppServiceInfo@@QAEXXZ @ 312 NONAME ; void TApaAppServiceInfo::Release(void)
+	?UpdateAppListByShortCaptionL@CApaAppList@@QAEXXZ @ 313 NONAME ; void CApaAppList::UpdateAppListByShortCaptionL(void)
+	?ExternalizeL@TApaAppIdentifier@@QBEXAAVRWriteStream@@@Z @ 314 NONAME ; void TApaAppIdentifier::ExternalizeL(class RWriteStream &) const
+	?ExternalizeL@TApaAppViewInfo@@QBEXAAVRWriteStream@@@Z @ 315 NONAME ; void TApaAppViewInfo::ExternalizeL(class RWriteStream &) const
+	?NewL@CApaAppList@@SAPAV1@AAVRFs@@HH@Z @ 316 NONAME ; class CApaAppList * CApaAppList::NewL(class RFs &, int, int)
+	?CApaAppServiceInfoArray_Reserved1@CApaAppServiceInfoArray@@EAEXXZ @ 317 NONAME ; void CApaAppServiceInfoArray::CApaAppServiceInfoArray_Reserved1(void)
+	?ExternalizeL@TApaAppInfo@@QBEXAAVRWriteStream@@@Z @ 318 NONAME ; void TApaAppInfo::ExternalizeL(class RWriteStream &) const
+	?InternalizeL@TApaAppCapability@@QAEXAAVRReadStream@@@Z @ 319 NONAME ; void TApaAppCapability::InternalizeL(class RReadStream &)
+	??0TApaAppEntry@@QAE@XZ @ 320 NONAME ; TApaAppEntry::TApaAppEntry(void)
+	?AddCustomAppInfoInListL@CApaAppList@@QAEXVTUid@@W4TLanguage@@ABVTDesC16@@@Z @ 321 NONAME ; void CApaAppList::AddCustomAppInfoInListL(class TUid, enum TLanguage, class TDesC16 const &)
+	?CApaAppServiceInfoArray_Reserved2@CApaAppServiceInfoArray@@EAEXXZ @ 322 NONAME ; void CApaAppServiceInfoArray::CApaAppServiceInfoArray_Reserved2(void)
+	?UpdateAppListByIconCaptionOverridesL@CApaAppList@@QAEXXZ @ 323 NONAME ; void CApaAppList::UpdateAppListByIconCaptionOverridesL(void)
+	??0TApaAppInfo@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@1@Z @ 324 NONAME ; TApaAppInfo::TApaAppInfo(class TUid, class TBuf<256> const &, class TBuf<256> const &)
+	?InternalizeL@TApaAppInfo@@QAEXAAVRReadStream@@@Z @ 325 NONAME ; void TApaAppInfo::InternalizeL(class RReadStream &)
+	??0TApaEmbeddabilityFilter@@QAE@XZ @ 326 NONAME ; TApaEmbeddabilityFilter::TApaEmbeddabilityFilter(void)
+	?InternalizeL@TApaAppIdentifier@@QAEXAAVRReadStream@@@Z @ 327 NONAME ; void TApaAppIdentifier::InternalizeL(class RReadStream &)
+	??0TApaAppViewInfo@@QAE@XZ @ 328 NONAME ; TApaAppViewInfo::TApaAppViewInfo(void)
+	??0TApaAppInfo@@QAE@XZ @ 329 NONAME ; TApaAppInfo::TApaAppInfo(void)
+	??0TApaAppViewInfo@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@H@Z @ 330 NONAME ; TApaAppViewInfo::TApaAppViewInfo(class TUid, class TBuf<256> const &, int)
+	??0TApaAppServiceInfo@@QAE@VTUid@@PAV?$CArrayFixFlat@VTDataTypeWithPriority@@@@PAVHBufC8@@@Z @ 331 NONAME ; TApaAppServiceInfo::TApaAppServiceInfo(class TUid, class CArrayFixFlat<class TDataTypeWithPriority> *, class HBufC8 *)
+	?AppListUpdatePending@CApaAppList@@QAEHXZ @ 332 NONAME ABSENT ; int CApaAppList::AppListUpdatePending(void)
+	?RecognizeData@RApaLsSession@@QBEHABVTDesC8@@AAVTDataRecognitionResult@@@Z @ 333 NONAME ; TInt RecognizeData(class TDesC8 const &, class TDataRecognitionResult & ) const
+	?UninstalledAppArray@CApaAppList@@QAEPAV?$CArrayFixFlat@VTUid@@@@XZ @ 334 NONAME ; class CArrayFixFlat<class TUid> * CApaAppList::UninstalledAppArray(void)
+	?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@VTUid@@@Z @ 335 NONAME ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class TUid)
+	?NewL@CApaAppData@@SAPAV1@ABVCApplicationRegistrationData@Usif@@AAVRFs@@ABVRSoftwareComponentRegistry@3@@Z @ 336 NONAME ; class CApaAppData * CApaAppData::NewL(class Usif::CApplicationRegistrationData const &, class RFs &, class Usif::RSoftwareComponentRegistry const &)
+	?InitializeApplistL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 337 NONAME ; void CApaAppList::InitializeApplistL(class MApaAppListObserver *)
+	??0TApaAppUpdateInfo@@QAE@XZ @ 338 NONAME ; TApaAppUpdateInfo::TApaAppUpdateInfo(void)
+	?InternalizeL@TApaAppUpdateInfo@@QAEXAAVRReadStream@@@Z @ 339 NONAME ; void TApaAppUpdateInfo::InternalizeL(class RReadStream &)
+	?UpdateAppListL@RApaLsSession@@QAEHAAV?$RArray@VTApaAppUpdateInfo@@@@@Z @ 340 NONAME ; int RApaLsSession::UpdateAppListL(class RArray<class TApaAppUpdateInfo> &)
+	?ExternalizeL@TApaAppUpdateInfo@@QBEXAAVRWriteStream@@@Z @ 341 NONAME ; void TApaAppUpdateInfo::ExternalizeL(class RWriteStream &) const
+	??0TApaAppUpdateInfo@@QAE@VTUid@@W4TApaAppAction@0@@Z @ 342 NONAME ; TApaAppUpdateInfo::TApaAppUpdateInfo(class TUid, enum TApaAppUpdateInfo::TApaAppAction)
+	?UpdateApplistByForceRegAppsL@CApaAppList@@QAEXAAV?$RPointerArray@VCApplicationRegistrationData@Usif@@@@@Z @ 343 NONAME ; void CApaAppList::UpdateApplistByForceRegAppsL(class RPointerArray<class Usif::CApplicationRegistrationData> &)
+	?UpdatedAppsInfo@CApaAppList@@QAEPAV?$CArrayFixFlat@VTApaAppUpdateInfo@@@@XZ @ 344 NONAME ; class CArrayFixFlat<class TApaAppUpdateInfo> * CApaAppList::UpdatedAppsInfo(void)
+	?UpdateApplistL@CApaAppList@@QAEXPAVMApaAppListObserver@@PAV?$RArray@VTApaAppUpdateInfo@@@@VTUid@@@Z @ 345 NONAME ; void CApaAppList::UpdateApplistL(class MApaAppListObserver *, class RArray<class TApaAppUpdateInfo> *, class TUid)
+	?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VCApplicationRegistrationData@Usif@@@@@Z @ 346 NONAME ; int RApaLsSession::ForceRegistration(class RPointerArray<class Usif::CApplicationRegistrationData> const &)
+	?UpdatedAppsInfoL@RApaLsSession@@QAEHAAV?$RArray@VTApaAppUpdateInfo@@@@@Z @ 347 NONAME ; int RApaLsSession::UpdatedAppsInfoL(class RArray<class TApaAppUpdateInfo> &)
+	?IsLangChangePending@CApaAppData@@QAEHXZ @ 348 NONAME ; int CApaAppData::IsLangChangePending(void)
+
--- a/appfw/apparchitecture/eabi/APFILEU.DEF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-EXPORTS
-	_ZN19CApaAppLocatorProxy16GetAppEntryByUidER12TApaAppEntry4TUid @ 1 NONAME ABSENT
-	_ZN19CApaAppLocatorProxy21GetAppCapabilityByUidER5TDes84TUid @ 2 NONAME ABSENT
-	_ZN19CApaAppLocatorProxy4NewLER3RFs @ 3 NONAME ABSENT
-	_ZN19CApaAppLocatorProxyD0Ev @ 4 NONAME ABSENT
-	_ZN19CApaAppLocatorProxyD1Ev @ 5 NONAME ABSENT
-	_ZN19CApaAppLocatorProxyD2Ev @ 6 NONAME ABSENT
-	_ZN21CApaScanningAppFinder12FindAllAppsLEv @ 7 NONAME ABSENT
-	_ZN21CApaScanningAppFinder4NewLERK3RFs @ 8 NONAME ABSENT
-	_ZN21CApaScanningAppFinder5NewLCERK3RFs @ 9 NONAME ABSENT
-	_ZN21CApaScanningAppFinder5NextLER12TApaAppEntry @ 10 NONAME ABSENT
-	_ZN21CApaScanningAppFinder8FindAppLERK7TDesC164TUid @ 11 NONAME ABSENT
-	_ZN21CApaScanningAppFinderD0Ev @ 12 NONAME ABSENT
-	_ZN21CApaScanningAppFinderD1Ev @ 13 NONAME ABSENT
-	_ZN21CApaScanningAppFinderD2Ev @ 14 NONAME ABSENT
-	_ZN25CApaScanningControlFinder12FindAllAppsLEv @ 15 NONAME ABSENT
-	_ZN25CApaScanningControlFinder4NewLERK3RFs @ 16 NONAME ABSENT
-	_ZN25CApaScanningControlFinder5NewLCERK3RFs @ 17 NONAME ABSENT
-	_ZN25CApaScanningControlFinder5NextLER12TApaAppEntry @ 18 NONAME ABSENT
-	_ZN25CApaScanningControlFinder8FindAppLERK7TDesC164TUid @ 19 NONAME ABSENT
-	_ZN25CApaScanningControlFinderD0Ev @ 20 NONAME ABSENT
-	_ZN25CApaScanningControlFinderD1Ev @ 21 NONAME ABSENT
-	_ZN25CApaScanningControlFinderD2Ev @ 22 NONAME ABSENT
-	_ZN26CApaScanningFileRecognizer10ConstructLEv @ 23 NONAME ABSENT
-	_ZN26CApaScanningFileRecognizer14SetRecognizerLERKNS_11TRecognizerE @ 24 NONAME ABSENT
-	_ZN26CApaScanningFileRecognizer15RecognizerCountEv @ 25 NONAME ABSENT
-	_ZN26CApaScanningFileRecognizer19ScanForRecognizersLEv @ 26 NONAME ABSENT
-	_ZN26CApaScanningFileRecognizer23SetRecognizersFromListLERK13CArrayFixFlatINS_11TRecognizerEE @ 27 NONAME ABSENT
-	_ZN26CApaScanningFileRecognizer4NewLER3RFsP14MApaAppStarter @ 28 NONAME ABSENT
-	_ZN26CApaScanningFileRecognizerC1ER3RFsP14MApaAppStarter @ 29 NONAME ABSENT
-	_ZN26CApaScanningFileRecognizerC2ER3RFsP14MApaAppStarter @ 30 NONAME ABSENT
-	_ZN26CApaScanningFileRecognizerD0Ev @ 31 NONAME ABSENT
-	_ZN26CApaScanningFileRecognizerD1Ev @ 32 NONAME ABSENT
-	_ZN26CApaScanningFileRecognizerD2Ev @ 33 NONAME ABSENT
-	_ZN6Apfile8TempPathEv @ 34 NONAME ABSENT
-	_ZNK21CApaScanningAppFinder22DefaultAppInfoFileNameEv @ 35 NONAME ABSENT
-	_ZNK21CApaScanningAppFinder8TempPathEv @ 36 NONAME ABSENT
-	_ZNK25CApaScanningControlFinder22DefaultAppInfoFileNameEv @ 37 NONAME ABSENT
-	_ZNK25CApaScanningControlFinder8TempPathEv @ 38 NONAME ABSENT
-	_ZNK26CApaScanningFileRecognizer13UpdateCounterEv @ 39 NONAME ABSENT
-	_ZNK26CApaScanningFileRecognizer16RecognizerListLCEv @ 40 NONAME ABSENT
-	_ZNK26CApaScanningFileRecognizerixEi @ 41 NONAME ABSENT
-	_ZTI26CApaScanningFileRecognizer @ 42 NONAME ABSENT ; #<TI>#
-	_ZTV26CApaScanningFileRecognizer @ 43 NONAME ABSENT ; #<VT>#
-	_ZN26CApaScanningFileRecognizer18SetEcomRecognizerLERKNS_11TRecognizerE @ 44 NONAME ABSENT
-	_ZN26CApaScanningFileRecognizer27SetEcomRecognizersFromListLERK13CArrayFixFlatINS_11TRecognizerEE @ 45 NONAME ABSENT
-	_ZTI17CApaRecognizerDll @ 46 NONAME ABSENT ; #<TI>#
-	_ZTI19CApaAppLocatorProxy @ 47 NONAME ABSENT ; #<TI>#
-	_ZTI21CApaScanningAppFinder @ 48 NONAME ABSENT ; #<TI>#
-	_ZTI25CApaScanningControlFinder @ 49 NONAME ABSENT ; #<TI>#
-	_ZTIN26CApaScanningFileRecognizer27CApaBackupOperationObserverE @ 50 NONAME ABSENT ; #<TI>#
-	_ZTV17CApaRecognizerDll @ 51 NONAME ABSENT ; #<VT>#
-	_ZTV19CApaAppLocatorProxy @ 52 NONAME ABSENT ; #<VT>#
-	_ZTV21CApaScanningAppFinder @ 53 NONAME ABSENT ; #<VT>#
-	_ZTV25CApaScanningControlFinder @ 54 NONAME ABSENT ; #<VT>#
-	_ZTVN26CApaScanningFileRecognizer27CApaBackupOperationObserverE @ 55 NONAME ABSENT ; #<VT>#
-	_ZN16CApaAppRegFinder12FindAllAppsLEv @ 56 NONAME ABSENT
-	_ZN16CApaAppRegFinder4NewLERK3RFs @ 57 NONAME ABSENT
-	_ZN16CApaAppRegFinder5NewLCERK3RFs @ 58 NONAME ABSENT
-	_ZN16CApaAppRegFinder5NextLER12TApaAppEntry @ 59 NONAME ABSENT
-	_ZN16CApaAppRegFinder5NextLER12TApaAppEntryRK13RPointerArrayI7HBufC16E @ 60 NONAME ABSENT
-	_ZNK16CApaAppRegFinder8TempPathEv @ 61 NONAME ABSENT
-	_ZTI16CApaAppRegFinder @ 62 NONAME ABSENT ; #<TI>#
-	_ZTV16CApaAppRegFinder @ 63 NONAME ABSENT ; #<VT>#
-	_ZN17CAppLaunchChecker10Reserved_1Ev @ 64 NONAME
-	_ZN17CAppLaunchChecker10Reserved_2Ev @ 65 NONAME
-	_ZN17CAppLaunchChecker10Reserved_3Ev @ 66 NONAME
-	_ZN17CAppLaunchCheckerD0Ev @ 67 NONAME
-	_ZN17CAppLaunchCheckerD1Ev @ 68 NONAME
-	_ZN17CAppLaunchCheckerD2Ev @ 69 NONAME
-	_ZN28CApaScanningRuleBasedPlugIns4NewLEv @ 70 NONAME
-	_ZNK28CApaScanningRuleBasedPlugInsixEi @ 71 NONAME
-	_ZTI16CApaRuleBasedDll @ 72 NONAME ; #<TI>#
-	_ZTI17CAppLaunchChecker @ 73 NONAME ; #<TI>#
-	_ZTV16CApaRuleBasedDll @ 74 NONAME ; #<VT>#
-	_ZTV17CAppLaunchChecker @ 75 NONAME ; #<VT>#
-	_ZN28CApaScanningRuleBasedPlugInsD0Ev @ 76 NONAME
-	_ZN28CApaScanningRuleBasedPlugInsD1Ev @ 77 NONAME
-	_ZN28CApaScanningRuleBasedPlugInsD2Ev @ 78 NONAME
-	_ZTI28CApaScanningRuleBasedPlugIns @ 79 NONAME ; #<TI>#
-	_ZTV28CApaScanningRuleBasedPlugIns @ 80 NONAME ; #<VT>#
-	_ZN28CApaScanningRuleBasedPlugIns24ScanForRuleBasedPlugInsLEv @ 81 NONAME
-	_ZNK28CApaScanningRuleBasedPlugIns19ImplementationCountEv @ 82 NONAME
-	_ZN14CAppSidChecker18SetRescanCallBackLERK9TCallBack @ 83 NONAME ABSENT
-	_ZN14CAppSidChecker9reserved1Ev @ 84 NONAME ABSENT
-	_ZN14CAppSidChecker9reserved2Ev @ 85 NONAME ABSENT
-	_ZN14CAppSidChecker9reserved3Ev @ 86 NONAME ABSENT
-	_ZN14CAppSidCheckerD0Ev @ 87 NONAME ABSENT
-	_ZN14CAppSidCheckerD1Ev @ 88 NONAME ABSENT
-	_ZN14CAppSidCheckerD2Ev @ 89 NONAME ABSENT
-	_ZTI14CAppSidChecker @ 90 NONAME ABSENT ; #<TI>#
-	_ZTV14CAppSidChecker @ 91 NONAME ABSENT ; #<VT>#
-	_ZNK16CApaAppRegFinder9DriveListEv @ 92 NONAME ABSENT
-	_ZN16CApaAppRegFinder26FindAllRemovableMediaAppsLEv @ 93 NONAME ABSENT
-	_ZN26CApaAppInstallationMonitor4NewLEP16CApaAppArcServer @ 94 NONAME ABSENT
-	_ZN26CApaAppInstallationMonitor5StartEv @ 95 NONAME ABSENT
-	_ZN26CApaAppInstallationMonitorD0Ev @ 96 NONAME ABSENT
-	_ZN26CApaAppInstallationMonitorD1Ev @ 97 NONAME ABSENT
-	_ZN26CApaAppInstallationMonitorD2Ev @ 98 NONAME ABSENT
-	_ZN21CApfMimeContentPolicy12IsClosedTypeERK7TDesC16 @ 99 NONAME
-	_ZN21CApfMimeContentPolicy13IsClosedFileLER5RFile @ 100 NONAME
-	_ZN21CApfMimeContentPolicy13IsClosedFileLERK7TDesC16 @ 101 NONAME
-	_ZN21CApfMimeContentPolicy14IsDRMEnvelopeLER5RFile @ 102 NONAME
-	_ZN21CApfMimeContentPolicy14IsDRMEnvelopeLERK7TDesC16 @ 103 NONAME
-	_ZN21CApfMimeContentPolicy17IsClosedExtensionERK7TDesC16 @ 104 NONAME
-	_ZN21CApfMimeContentPolicy4NewLER3RFs @ 105 NONAME
-	_ZN21CApfMimeContentPolicy4NewLEv @ 106 NONAME
-	_ZN21CApfMimeContentPolicy5NewLCER3RFs @ 107 NONAME
-	_ZN21CApfMimeContentPolicy5NewLCEv @ 108 NONAME
-	_ZN21CApfMimeContentPolicyD0Ev @ 109 NONAME
-	_ZN21CApfMimeContentPolicyD1Ev @ 110 NONAME
-	_ZN21CApfMimeContentPolicyD2Ev @ 111 NONAME
-	_ZTI21CApfMimeContentPolicy @ 112 NONAME
-	_ZTV21CApfMimeContentPolicy @ 113 NONAME
-
--- a/appfw/apparchitecture/eabi/APGRFXU.DEF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,445 +0,0 @@
-EXPORTS
-	_ZNK11CApaAppData11GetIconInfoERiS0_ @ 1 NONAME ABSENT
-	_ZN11CApaAppData16CanUseScreenModeEi @ 2 NONAME ABSENT
-	_ZN11CApaAppList16StartIdleUpdateLEP19MApaAppListObserver @ 3 NONAME ABSENT
-	_ZN11CApaAppList16StartIdleUpdateLEv @ 4 NONAME ABSENT
-	_ZN11CApaAppList4NewLER3RFsP16CApaAppRegFinderii @ 5 NONAME ABSENT
-	_ZN11CApaAppList6PurgeLEv @ 6 NONAME ABSENT
-	_ZN11CApaAppList7UpdateLEv @ 7 NONAME ABSENT
-	_ZN11CApaAppList9InitListLEP19MApaAppListObserver @ 8 NONAME ABSENT
-	_ZN11CApaAppListD0Ev @ 9 NONAME ABSENT
-	_ZN11CApaAppListD1Ev @ 10 NONAME ABSENT
-	_ZN11CApaAppListD2Ev @ 11 NONAME ABSENT
-	_ZN12TApaTaskList10CycleTasksE4TUidNS_15TCycleDirectionE @ 12 NONAME
-	_ZN12TApaTaskList7FindAppE4TUid @ 13 NONAME
-	_ZN12TApaTaskList7FindAppERK7TDesC16 @ 14 NONAME
-	_ZN12TApaTaskList7FindDocERK7TDesC16 @ 15 NONAME
-	_ZN12TApaTaskList9FindByPosEi @ 16 NONAME
-	_ZN12TApaTaskListC1ER10RWsSession @ 17 NONAME
-	_ZN12TApaTaskListC2ER10RWsSession @ 18 NONAME
-	_ZN13RApaLsSession13StartDocumentERK7TDesC164TUidR9TThreadIdNS_11TLaunchTypeE @ 19 NONAME
-	_ZN13RApaLsSession13StartDocumentERK7TDesC16R9TThreadIdNS_11TLaunchTypeE @ 20 NONAME
-	_ZN13RApaLsSession13StartDocumentERK7TDesC16RK9TDataTypeR9TThreadIdNS_11TLaunchTypeE @ 21 NONAME
-	_ZN13RApaLsSession14CreateDocumentERK7TDesC164TUidR9TThreadIdNS_11TLaunchTypeE @ 22 NONAME
-	_ZN13RApaLsSession17SetMaxDataBufSizeEi @ 23 NONAME
-	_ZN13RApaLsSession21SetAcceptedConfidenceEi @ 24 NONAME
-	_ZN13RApaLsSession7ConnectEv @ 25 NONAME
-	_ZN13RApaLsSession8StartAppERK15CApaCommandLine @ 26 NONAME
-	_ZN13RApaLsSession8StartAppERK15CApaCommandLineR9TThreadId @ 27 NONAME
-	_ZN13RApaLsSessionC1Ev @ 28 NONAME
-	_ZN13RApaLsSessionC2Ev @ 29 NONAME
-	_ZN16AppInfoFileUtils14GetAifFileNameERK3RFsR6TDes16 @ 30 NONAME ABSENT
-	_ZN16CApaMaskedBitmap12InternalizeLER11RReadStream @ 31 NONAME
-	_ZN16CApaMaskedBitmap13SetMaskBitmapEP10CFbsBitmap @ 32 NONAME
-	_ZN16CApaMaskedBitmap4NewLEPKS_ @ 33 NONAME
-	_ZN16CApaMaskedBitmap5NewLCEv @ 34 NONAME
-	_ZN16CApaMaskedBitmapD0Ev @ 35 NONAME
-	_ZN16CApaMaskedBitmapD1Ev @ 36 NONAME
-	_ZN16CApaMaskedBitmapD2Ev @ 37 NONAME
-	_ZN17CApaSystemControl7CreateLEv @ 38 NONAME
-	_ZN18TApaPictureFactoryC1EP11CApaProcess @ 39 NONAME
-	_ZN18TApaPictureFactoryC2EP11CApaProcess @ 40 NONAME
-	_ZN19CApaAppListNotifier4NewLEP23MApaAppListServObserverN7CActive9TPriorityE @ 41 NONAME
-	_ZN19CApaAppListNotifierD0Ev @ 42 NONAME
-	_ZN19CApaAppListNotifierD1Ev @ 43 NONAME
-	_ZN19CApaAppListNotifierD2Ev @ 44 NONAME
-	_ZN19CApaWindowGroupName11SetAppReadyEi @ 45 NONAME
-	_ZN19CApaWindowGroupName11SetCaptionLERK7TDesC16 @ 46 NONAME
-	_ZN19CApaWindowGroupName11SetDocNameLERK7TDesC16 @ 47 NONAME
-	_ZN19CApaWindowGroupName12FindByAppUidE4TUidR10RWsSessionRi @ 48 NONAME
-	_ZN19CApaWindowGroupName13FindByCaptionERK7TDesC16R10RWsSessionRi @ 49 NONAME
-	_ZN19CApaWindowGroupName13FindByDocNameERK7TDesC16R10RWsSessionRi @ 50 NONAME
-	_ZN19CApaWindowGroupName17SetDocNameIsAFileEi @ 51 NONAME
-	_ZN19CApaWindowGroupName18ConstructFromWgIdLEi @ 52 NONAME
-	_ZN19CApaWindowGroupName18SetWindowGroupNameEP7HBufC16 @ 53 NONAME
-	_ZN19CApaWindowGroupName19SetWindowGroupNameLERK7TDesC16 @ 54 NONAME
-	_ZN19CApaWindowGroupName26SetRespondsToShutdownEventEi @ 55 NONAME
-	_ZN19CApaWindowGroupName29SetRespondsToSwitchFilesEventEi @ 56 NONAME
-	_ZN19CApaWindowGroupName3NewERK10RWsSessionP7HBufC16 @ 57 NONAME
-	_ZN19CApaWindowGroupName4NewLERK10RWsSession @ 58 NONAME
-	_ZN19CApaWindowGroupName4NewLERK10RWsSessionRK7TDesC16 @ 59 NONAME
-	_ZN19CApaWindowGroupName4NewLERK10RWsSessioni @ 60 NONAME
-	_ZN19CApaWindowGroupName5NewLCERK10RWsSession @ 61 NONAME
-	_ZN19CApaWindowGroupName5NewLCERK10RWsSessionRK7TDesC16 @ 62 NONAME
-	_ZN19CApaWindowGroupName5NewLCERK10RWsSessioni @ 63 NONAME
-	_ZNK19CApaWindowGroupName6HiddenEv @ 64 NONAME
-	_ZN19CApaWindowGroupName7SetBusyEi @ 65 NONAME
-	_ZN19CApaWindowGroupName9SetAppUidE4TUid @ 66 NONAME
-	_ZN19CApaWindowGroupName9SetHiddenEi @ 67 NONAME
-	_ZN19CApaWindowGroupName9SetSystemEi @ 68 NONAME
-	_ZN19CApaWindowGroupNameD0Ev @ 69 NONAME
-	_ZN19CApaWindowGroupNameD1Ev @ 70 NONAME
-	_ZN19CApaWindowGroupNameD2Ev @ 71 NONAME
-	_ZN21CApaAppInfoFileReader12StretchDrawLEP10CFbsBitmapS1_5TSize @ 72 NONAME ABSENT
-	_ZN21CApaAppInfoFileReader19CreateMaskedBitmapLEi @ 73 NONAME ABSENT
-	_ZN21CApaAppInfoFileReader4NewLER3RFsRK7TDesC164TUid @ 74 NONAME ABSENT
-	_ZN21CApaAppInfoFileReader5NewLCER3RFsRK7TDesC164TUid @ 75 NONAME ABSENT
-	_ZN21CApaAppInfoFileReader8CaptionLE9TLanguage @ 76 NONAME ABSENT
-	_ZN21CApaAppInfoFileReaderD0Ev @ 77 NONAME ABSENT
-	_ZN21CApaAppInfoFileReaderD1Ev @ 78 NONAME ABSENT
-	_ZN21CApaAppInfoFileReaderD2Ev @ 79 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter10StoreViewLE4TUid @ 80 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter11AddCaptionLE9TLanguageRK7TDesC16 @ 81 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter12AddDataTypeLERK21TDataTypeWithPriority @ 82 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter12AddViewIconLER16CApaMaskedBitmap4TUid @ 83 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter13AddOwnedFileLERK7TDesC16 @ 84 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter13SetCapabilityERK6TDesC8 @ 85 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter15AddViewCaptionLE9TLanguageRK7TDesC164TUid @ 86 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter5NewLCER3RFsRK7TDesC164TUid @ 87 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter6StoreLEv @ 88 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter8AddIconLER16CApaMaskedBitmap @ 89 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter8AddIconLERK7TDesC16 @ 90 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter8AddViewLE4TUid @ 91 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter8AddViewLE4TUidi @ 92 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriterD0Ev @ 93 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriterD1Ev @ 94 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriterD2Ev @ 95 NONAME ABSENT
-	_ZN21CApaSystemControlList4NewLER3RFsR13CApaAppFinderRK7TDesC16 @ 96 NONAME ABSENT
-	_ZN21CApaSystemControlList7UpdateLEv @ 97 NONAME
-	_ZN21CApaSystemControlListD0Ev @ 98 NONAME
-	_ZN21CApaSystemControlListD1Ev @ 99 NONAME
-	_ZN21CApaSystemControlListD2Ev @ 100 NONAME
-	_ZN8CApaDoor16SetFormatToIconLEv @ 101 NONAME
-	_ZN8CApaDoor17SetFormatToGlassLEv @ 102 NONAME
-	_ZN8CApaDoor25SetFormatToTemporaryIconLEi @ 103 NONAME
-	_ZN8CApaDoor4NewLER3RFsR12CApaDocumentRK5TSize @ 104 NONAME
-	_ZN8CApaDoor4NewLER3RFsRK12CStreamStore9TStreamIdR11CApaProcess @ 105 NONAME
-	_ZN8CApaDoor5NewLCER3RFsR12CApaDocumentRK5TSize @ 106 NONAME
-	_ZN8CApaDoor8RestoreLERK12CStreamStore9TStreamId @ 107 NONAME
-	_ZN8CApaDoor9DocumentLEi @ 108 NONAME
-	_ZN8CApaDoorD0Ev @ 109 NONAME
-	_ZN8CApaDoorD1Ev @ 110 NONAME
-	_ZN8CApaDoorD2Ev @ 111 NONAME
-	_ZN8TApaTask11SendMessageE4TUidRK6TDesC8 @ 112 NONAME
-	_ZN8TApaTask14SwitchOpenFileERK7TDesC16 @ 113 NONAME
-	_ZN8TApaTask15SendSystemEventE15TApaSystemEvent @ 114 NONAME
-	_ZN8TApaTask16SendToBackgroundEv @ 115 NONAME
-	_ZN8TApaTask16SwitchCreateFileERK7TDesC16 @ 116 NONAME
-	_ZN8TApaTask17BringToForegroundEv @ 117 NONAME
-	_ZN8TApaTask7EndTaskEv @ 118 NONAME
-	_ZN8TApaTask7SendKeyERK9TKeyEvent @ 119 NONAME
-	_ZN8TApaTask7SendKeyEii @ 120 NONAME
-	_ZN8TApaTask7SetWgIdEi @ 121 NONAME
-	_ZN8TApaTask8KillTaskEv @ 122 NONAME
-	_ZN8TApaTaskC1ER10RWsSession @ 123 NONAME
-	_ZN8TApaTaskC2ER10RWsSession @ 124 NONAME
-	_ZNK11CApaAppData10CapabilityER5TDes8 @ 125 NONAME ABSENT
-	_ZNK11CApaAppData10IconSizesLEv @ 126 NONAME ABSENT
-	_ZNK11CApaAppData10OwnedFilesEv @ 127 NONAME ABSENT
-	_ZNK11CApaAppData4IconE5TSize @ 128 NONAME ABSENT
-	_ZNK11CApaAppData4IconEi @ 129 NONAME ABSENT
-	_ZNK11CApaAppData5ViewsEv @ 130 NONAME ABSENT
-	_ZNK11CApaAppData8AppEntryEv @ 131 NONAME ABSENT
-	_ZNK11CApaAppData8DataTypeERK9TDataType @ 132 NONAME ABSENT
-	_ZNK11CApaAppList12AppDataByUidE4TUid @ 133 NONAME ABSENT
-	_ZNK11CApaAppList13UpdateCounterEv @ 134 NONAME ABSENT
-	_ZNK11CApaAppList19IsFirstScanCompleteEv @ 135 NONAME ABSENT
-	_ZNK11CApaAppList20IsIdleUpdateCompleteEv @ 136 NONAME ABSENT
-	_ZNK11CApaAppList21PreferredDataHandlerLERK9TDataType @ 137 NONAME ABSENT
-	_ZNK11CApaAppList5CountEv @ 138 NONAME ABSENT
-	_ZNK11CApaAppList7NextAppEPK11CApaAppData @ 139 NONAME ABSENT
-	_ZNK11CApaAppList7NextAppEPK11CApaAppDatai @ 140 NONAME ABSENT
-	_ZNK11CApaAppList8FirstAppEi @ 141 NONAME ABSENT
-	_ZNK11CApaAppList8FirstAppEv @ 142 NONAME ABSENT
-	_ZNK13RApaLsSession10GetAllAppsEi @ 143 NONAME
-	_ZNK13RApaLsSession10GetAllAppsEv @ 144 NONAME
-	_ZNK13RApaLsSession10GetAppIconE4TUid5TSizeR16CApaMaskedBitmap @ 145 NONAME
-	_ZNK13RApaLsSession10GetAppIconE4TUidiR16CApaMaskedBitmap @ 146 NONAME
-	_ZNK13RApaLsSession10GetAppInfoER11TApaAppInfo4TUid @ 147 NONAME
-	_ZNK13RApaLsSession10GetNextAppER11TApaAppInfo @ 148 NONAME
-	_ZNK13RApaLsSession10GetNextAppER11TApaAppInfoi @ 149 NONAME
-	_ZNK13RApaLsSession11GetAppViewsER13CArrayFixFlatI15TApaAppViewInfoE4TUid @ 150 NONAME
-	_ZNK13RApaLsSession13RecognizeDataERK7TDesC16RK6TDesC8R22TDataRecognitionResult @ 151 NONAME
-	_ZNK13RApaLsSession14AppForDataTypeERK9TDataTypeR4TUid @ 152 NONAME
-	_ZNK13RApaLsSession14AppForDocumentERK7TDesC16R4TUidR9TDataType @ 153 NONAME
-	_ZNK13RApaLsSession14GetAppInfo_7_0ER15TApaAppInfo_7_04TUid @ 154 NONAME ABSENT
-	_ZNK13RApaLsSession14GetAppViewIconE4TUidS0_RK5TSizeR16CApaMaskedBitmap @ 155 NONAME
-	_ZNK13RApaLsSession14GetNextApp_7_0ER15TApaAppInfo_7_0 @ 156 NONAME ABSENT
-	_ZNK13RApaLsSession14GetNextApp_7_0ER15TApaAppInfo_7_0i @ 157 NONAME ABSENT
-	_ZNK13RApaLsSession15GetAppIconSizesE4TUidR13CArrayFixFlatI5TSizeE @ 158 NONAME
-	_ZNK13RApaLsSession15GetFilteredAppsERK23TApaEmbeddabilityFilter @ 159 NONAME
-	_ZNK13RApaLsSession15GetFilteredAppsERK23TApaEmbeddabilityFilteri @ 160 NONAME
-	_ZNK13RApaLsSession16GetAppCapabilityER5TDes84TUid @ 161 NONAME
-	_ZNK13RApaLsSession16GetAppOwnedFilesER12CDesC16Array4TUid @ 162 NONAME
-	_ZNK13RApaLsSession17GetEmbeddableAppsEi @ 163 NONAME
-	_ZNK13RApaLsSession17GetEmbeddableAppsEv @ 164 NONAME
-	_ZNK13RApaLsSession17GetMaxDataBufSizeERi @ 165 NONAME
-	_ZNK13RApaLsSession18EmbeddableAppCountERi @ 166 NONAME
-	_ZNK13RApaLsSession21GetAcceptedConfidenceERi @ 167 NONAME
-	_ZNK13RApaLsSession21RecognizeSpecificDataERK7TDesC16RK6TDesC8RK9TDataTypeRi @ 168 NONAME
-	_ZNK13RApaLsSession22GetSupportedDataTypesLER13CArrayFixFlatI9TDataTypeE @ 169 NONAME
-	_ZNK13RApaLsSession23NumberOfOwnDefinedIconsE4TUidRi @ 170 NONAME
-	_ZNK13RApaLsSession7VersionEv @ 171 NONAME
-	_ZNK13RApaLsSession8AppCountERi @ 172 NONAME
-	_ZNK13RApaLsSession9IsProgramERK7TDesC16Ri @ 173 NONAME
-	_ZNK15CApaAIFViewData10ScreenModeEv @ 174 NONAME ABSENT
-	_ZNK15CApaAIFViewData12IconByIndexLEi @ 175 NONAME ABSENT
-	_ZNK15CApaAIFViewData13NumberOfIconsEv @ 176 NONAME ABSENT
-	_ZNK15CApaAIFViewData7ViewUidEv @ 177 NONAME ABSENT
-	_ZNK15CApaAIFViewData8CaptionLE9TLanguage @ 178 NONAME ABSENT
-	_ZNK15CApaAppViewData10IconSizesLEv @ 179 NONAME ABSENT
-	_ZNK15CApaAppViewData10ScreenModeEv @ 180 NONAME ABSENT
-	_ZNK15CApaAppViewData3UidEv @ 181 NONAME ABSENT
-	_ZNK15CApaAppViewData4IconERK5TSize @ 182 NONAME ABSENT
-	_ZNK16CApaMaskedBitmap12ExternalizeLER12RWriteStream @ 183 NONAME
-	_ZNK16CApaMaskedBitmap4MaskEv @ 184 NONAME
-	_ZNK17CApaSystemControl12ShortCaptionEv @ 185 NONAME
-	_ZNK17CApaSystemControl4IconEv @ 186 NONAME
-	_ZNK17CApaSystemControl4TypeEv @ 187 NONAME
-	_ZNK17CApaSystemControl7CaptionEv @ 188 NONAME
-	_ZNK17CApaSystemControl8FileNameEv @ 189 NONAME
-	_ZNK18TApaPictureFactory11NewPictureLER14TPictureHeaderRK12CStreamStore @ 190 NONAME
-	_ZNK19CApaWindowGroupName10IsAppReadyEv @ 191 NONAME
-	_ZNK19CApaWindowGroupName14DocNameIsAFileEv @ 192 NONAME
-	_ZNK19CApaWindowGroupName15WindowGroupNameEv @ 193 NONAME
-	_ZNK19CApaWindowGroupName18SetWindowGroupNameER12RWindowGroup @ 194 NONAME
-	_ZNK19CApaWindowGroupName23RespondsToShutdownEventEv @ 195 NONAME
-	_ZNK19CApaWindowGroupName26RespondsToSwitchFilesEventEv @ 196 NONAME
-	_ZNK19CApaWindowGroupName6AppUidEv @ 197 NONAME
-	_ZNK19CApaWindowGroupName6IsBusyEv @ 198 NONAME
-	_ZNK19CApaWindowGroupName7CaptionEv @ 199 NONAME
-	_ZNK19CApaWindowGroupName7DocNameEv @ 200 NONAME
-	_ZNK19CApaWindowGroupName8IsSystemEv @ 201 NONAME
-	_ZNK21CApaAppInfoFileReader10CapabilityER5TDes8 @ 202 NONAME ABSENT
-	_ZNK21CApaAppInfoFileReader14GetOwnedFilesLER12CDesC16Array @ 203 NONAME ABSENT
-	_ZNK21CApaAppInfoFileReader15NumberOfBitmapsEv @ 204 NONAME ABSENT
-	_ZNK21CApaAppInfoFileReader19DataTypesSupportedLER9CArrayFixI21TDataTypeWithPriorityE @ 205 NONAME ABSENT
-	_ZNK21CApaAppInfoFileReader9GetViewsLER9CArrayPtrI15CApaAIFViewDataE @ 206 NONAME ABSENT
-	_ZNK21CApaSystemControlList5CountEv @ 207 NONAME
-	_ZNK21CApaSystemControlList5IndexE4TUid @ 208 NONAME
-	_ZNK21CApaSystemControlList7ControlE4TUid @ 209 NONAME
-	_ZNK21CApaSystemControlList7ControlEi @ 210 NONAME
-	_ZNK8CApaDoor7AppUidLEv @ 211 NONAME
-	_ZNK8TApaTask4WgIdEv @ 212 NONAME
-	_ZNK8TApaTask6ExistsEv @ 213 NONAME
-	_ZNK8TApaTask8ThreadIdEv @ 214 NONAME
-	_ZTI18TApaPictureFactory @ 215 NONAME ; #<TI>#
-	_ZTV18TApaPictureFactory @ 216 NONAME ; #<VT>#
-	_ZTI11CApaAppData @ 217 NONAME ABSENT ; #<TI>#
-	_ZTI11CApaAppList @ 218 NONAME ABSENT ; #<TI>#
-	_ZTI12CApaAppEntry @ 219 NONAME ABSENT ; #<TI>#
-	_ZTI14CApaAIFCaption @ 220 NONAME ABSENT ; #<TI>#
-	_ZTI15CApaAIFViewData @ 221 NONAME ABSENT ; #<TI>#
-	_ZTI15CApaAppInfoFile @ 222 NONAME ABSENT ; #<TI>#
-	_ZTI15CApaAppViewData @ 223 NONAME ABSENT ; #<TI>#
-	_ZTI15CApaIconPicture @ 224 NONAME ; #<TI>#
-	_ZTI16CApaMaskedBitmap @ 225 NONAME ; #<TI>#
-	_ZTI16TDesCArrayFiller @ 226 NONAME ABSENT ; #<TI>#
-	_ZTI16TSizeArrayFiller @ 227 NONAME ABSENT ; #<TI>#
-	_ZTI17CApaSystemControl @ 228 NONAME ; #<TI>#
-	_ZTI19CApaAppListNotifier @ 229 NONAME ; #<TI>#
-	_ZTI19CApaWindowGroupName @ 230 NONAME ; #<TI>#
-	_ZTI20TViewDataArrayFiller @ 231 NONAME ABSENT ; #<TI>#
-	_ZTI21CApaAppInfoFileReader @ 232 NONAME ABSENT ; #<TI>#
-	_ZTI21CApaAppInfoFileWriter @ 233 NONAME ABSENT ; #<TI>#
-	_ZTI21CApaSystemControlList @ 234 NONAME ; #<TI>#
-	_ZTI7HBufBuf @ 235 NONAME ; #<TI>#
-	_ZTI8CApaDoor @ 236 NONAME ; #<TI>#
-	_ZTV11CApaAppData @ 237 NONAME ABSENT ; #<VT>#
-	_ZTV11CApaAppList @ 238 NONAME ABSENT ; #<VT>#
-	_ZTV12CApaAppEntry @ 239 NONAME ABSENT ; #<VT>#
-	_ZTV14CApaAIFCaption @ 240 NONAME ABSENT ; #<VT>#
-	_ZTV15CApaAIFViewData @ 241 NONAME ABSENT ; #<VT>#
-	_ZTV15CApaAppInfoFile @ 242 NONAME ABSENT ; #<VT>#
-	_ZTV15CApaAppViewData @ 243 NONAME ABSENT ; #<VT>#
-	_ZTV15CApaIconPicture @ 244 NONAME ; #<VT>#
-	_ZTV16CApaMaskedBitmap @ 245 NONAME ; #<VT>#
-	_ZTV16TDesCArrayFiller @ 246 NONAME ABSENT ; #<VT>#
-	_ZTV16TSizeArrayFiller @ 247 NONAME ABSENT ; #<VT>#
-	_ZTV17CApaSystemControl @ 248 NONAME ; #<VT>#
-	_ZTV19CApaAppListNotifier @ 249 NONAME ; #<VT>#
-	_ZTV19CApaWindowGroupName @ 250 NONAME ; #<VT>#
-	_ZTV20TViewDataArrayFiller @ 251 NONAME ABSENT ; #<VT>#
-	_ZTV21CApaAppInfoFileReader @ 252 NONAME ABSENT ; #<VT>#
-	_ZTV21CApaAppInfoFileWriter @ 253 NONAME ABSENT ; #<VT>#
-	_ZTV21CApaSystemControlList @ 254 NONAME ; #<VT>#
-	_ZTV7HBufBuf @ 255 NONAME ; #<VT>#
-	_ZTV8CApaDoor @ 256 NONAME ; #<VT>#
-	_ZN11CApaAppList4NewLER3RFsP13CApaAppFinderP16CApaAppRegFinderi @ 257 NONAME ABSENT
-	_ZNK11CApaAppData12IconFileNameEv @ 258 NONAME ABSENT
-	_ZNK11CApaAppData14NonMbmIconFileEv @ 259 NONAME ABSENT
-	_ZNK11CApaAppData19DefaultScreenNumberEv @ 260 NONAME ABSENT
-	_ZNK11CApaAppData20RegistrationFileUsedEv @ 261 NONAME ABSENT
-	_ZNK13RApaLsSession10GetAppIconE4TUidRP7HBufC16 @ 262 NONAME
-	_ZNK13RApaLsSession14GetAppViewIconE4TUidS0_RP7HBufC16 @ 263 NONAME
-	_ZNK13RApaLsSession15GetFilteredAppsEjj @ 264 NONAME
-	_ZNK13RApaLsSession15GetFilteredAppsEjji @ 265 NONAME
-	_ZNK15CApaAppViewData12IconFileNameEv @ 266 NONAME ABSENT
-	_ZNK15CApaAppViewData14NonMbmIconFileEv @ 267 NONAME ABSENT
-	_ZTI17CApaAppInfoReader @ 268 NONAME ABSENT ; #<TI>#
-	_ZTI19CApaAppInfoReaderV1 @ 269 NONAME ABSENT ; #<TI>#
-	_ZTI19CApaAppInfoReaderV2 @ 270 NONAME ABSENT ; #<TI>#
-	_ZTV17CApaAppInfoReader @ 271 NONAME ABSENT ; #<VT>#
-	_ZTV19CApaAppInfoReaderV1 @ 272 NONAME ABSENT ; #<VT>#
-	_ZTV19CApaAppInfoReaderV2 @ 273 NONAME ABSENT ; #<VT>#
-	_Z16StartupApaServerR14MApaAppStarter @ 274 NONAME ABSENT
-	_Z23StartupApaServerProcessv @ 275 NONAME
-	_ZN13RApaLsSession17DeleteDataMappingERK9TDataType @ 276 NONAME
-	_ZN13RApaLsSession17InsertDataMappingERK9TDataTypel4TUid @ 277 NONAME
-	_ZN13RApaLsSession25InsertDataMappingIfHigherERK9TDataTypel4TUidRi @ 278 NONAME
-	_ZNK11CApaAppData19ApplicationLanguageEv @ 279 NONAME ABSENT
-	_ZNK13RApaLsSession19ApplicationLanguageE4TUidR9TLanguage @ 280 NONAME
-	_ZN21CApaSystemControlList4NewLER3RFs @ 281 NONAME
-	_ZNK11CApaAppData17ImplementsServiceE4TUid @ 282 NONAME ABSENT
-	_ZNK11CApaAppList17ServiceUidBufferLE4TUid @ 283 NONAME ABSENT
-	_ZNK11CApaAppList19ServiceArrayBufferLE4TUid @ 284 NONAME ABSENT
-	_ZNK11CApaAppList21PreferredDataHandlerLERK9TDataTypePK4TUidRi @ 285 NONAME ABSENT
-	_ZNK11CApaAppList23ServiceImplArrayBufferLE4TUid @ 286 NONAME ABSENT
-	_ZNK11CApaAppList24ServiceOpaqueDataBufferLE4TUidS0_ @ 287 NONAME ABSENT
-	_ZNK13RApaLsSession13GetServerAppsE4TUid @ 288 NONAME
-	_ZNK13RApaLsSession13GetServerAppsE4TUidi @ 289 NONAME
-	_ZNK13RApaLsSession15GetAppServicesLE4TUidR13CArrayFixFlatIS0_E @ 290 NONAME
-	_ZNK13RApaLsSession16GetAppServicesLCE4TUid @ 291 NONAME
-	_ZNK13RApaLsSession24AppForDataTypeAndServiceERK9TDataType4TUidRS3_ @ 292 NONAME
-	_ZNK13RApaLsSession24AppForDocumentAndServiceERK5RFile4TUidRS3_R9TDataType @ 293 NONAME
-	_ZNK13RApaLsSession24AppForDocumentAndServiceERK7TDesC164TUidRS3_R9TDataType @ 294 NONAME
-	_ZNK13RApaLsSession25GetAppServiceOpaqueDataLCE4TUidS0_ @ 295 NONAME
-	_ZNK13RApaLsSession27GetServiceImplementationsLCE4TUid @ 296 NONAME
-	_ZNK18TApaAppServiceInfo10OpaqueDataEv @ 297 NONAME ABSENT
-	_ZNK18TApaAppServiceInfo3UidEv @ 298 NONAME ABSENT
-	_ZTI30CApaAppServiceInfoArrayWrapper @ 299 NONAME ABSENT ; #<TI>#
-	_ZTV30CApaAppServiceInfoArrayWrapper @ 300 NONAME ABSENT ; #<VT>#
-	_ZN13RApaLsSession13StartDocumentER5RFileR9TThreadIdP14TRequestStatus @ 301 NONAME
-	_ZN21CApaAppInfoFileReader27CreateMaskedBitmapByIndexLCEi @ 302 NONAME ABSENT
-	_ZNK13RApaLsSession36CancelListPopulationCompleteObserverEv @ 303 NONAME
-	_ZNK13RApaLsSession38RegisterListPopulationCompleteObserverER14TRequestStatus @ 304 NONAME
-	_ZN8ApaUtils24HandleAsRegistrationFileERK8TUidType @ 305 NONAME ABSENT
-	_ZN13RApaLsSession33RegisterJavaMIDletViaIterimFormatERK7TDesC16R5RFile @ 306 NONAME ABSENT
-	_ZN22ForJavaMIDletInstaller33CheckInterimFormatFileNotCorruptLER5RFile @ 307 NONAME ABSENT
-	_ZN13RApaLsSession20DeregisterJavaMIDletERK7TDesC16 @ 308 NONAME ABSENT
-	_ZN13RApaLsSession13SetFsSessionLER3RFs @ 309 NONAME
-	_ZN13RApaLsSession13StartDocumentER5RFile4TUidR9TThreadIdP14TRequestStatus @ 310 NONAME
-	_ZN13RApaLsSession13StartDocumentER5RFileRK9TDataTypeR9TThreadIdP14TRequestStatus @ 311 NONAME
-	_ZN13RApaLsSession14ClearFsSessionEv @ 312 NONAME
-	_ZN13RApaLsSession9FsSessionEv @ 313 NONAME
-	_ZNK13RApaLsSession13RecognizeDataERK5RFileR22TDataRecognitionResult @ 314 NONAME
-	_ZNK13RApaLsSession14AppForDocumentERK5RFileR4TUidR9TDataType @ 315 NONAME
-	_ZNK13RApaLsSession21RecognizeSpecificDataERK5RFileRK9TDataTypeRi @ 316 NONAME
-	_ZNK13RApaLsSession19GetPreferredBufSizeERi @ 317 NONAME
-	_ZN22ForJavaMIDletInstaller18GetJavaMIDletInfoLER3RFsRK7TDesC16RmS5_ @ 318 NONAME ABSENT
-	_ZN22ForJavaMIDletInstaller28NewInterimFormatFileWriterLCER3RFsRK7TDesC164TUidmi @ 319 NONAME ABSENT
-	_ZNK18TApaAppServiceInfo9DataTypesEv @ 320 NONAME ABSENT
-	_ZNK11CApaAppList23ServiceImplArrayBufferLE4TUidRK9TDataType @ 321 NONAME ABSENT
-	_ZNK13RApaLsSession27GetServiceImplementationsLCE4TUidRK9TDataType @ 322 NONAME
-	_ZN13RApaLsSession5CloseEv @ 323 NONAME
-	_ZTI22CApaLsSessionExtension @ 324 NONAME ABSENT ; #<TI>#
-	_ZTV22CApaLsSessionExtension @ 325 NONAME ABSENT ; #<VT>#
-	_ZN13RApaLsSession23RApaLsSession_Reserved1Ev @ 326 NONAME
-	_ZN13RApaLsSession23RApaLsSession_Reserved2Ev @ 327 NONAME
-	_ZN18TApaPictureFactoryC1Ev @ 328 NONAME
-	_ZN18TApaPictureFactoryC2Ev @ 329 NONAME
-	_ZN23MApaAppListServObserver33MApaAppListServObserver_Reserved1Ev @ 330 NONAME
-	_ZN23MApaAppListServObserver33MApaAppListServObserver_Reserved2Ev @ 331 NONAME
-	_ZN23MApaAppListServObserverC2Ev @ 332 NONAME
-	_ZTI13RApaLsSession @ 333 NONAME ; #<TI>#
-	_ZTI23MApaAppListServObserver @ 334 NONAME ; #<TI>#
-	_ZTV13RApaLsSession @ 335 NONAME ; #<VT>#
-	_ZTV23MApaAppListServObserver @ 336 NONAME ; #<VT>#
-	_ZNK13RApaLsSession15RecognizeFilesLERK7TDesC16R27CDataRecognitionResultArray @ 337 NONAME
-	_ZN13RApaLsSession15RecognizeFilesLERK7TDesC16R27CDataRecognitionResultArrayR14TRequestStatus @ 338 NONAME
-	_ZNK13RApaLsSession15RecognizeFilesLERK7TDesC16RK6TDesC8R27CDataRecognitionResultArray @ 339 NONAME
-	_ZN13RApaLsSession15RecognizeFilesLERK7TDesC16RK6TDesC8R27CDataRecognitionResultArrayR14TRequestStatus @ 340 NONAME
-	_ZN13RApaLsSession20CancelRecognizeFilesEv @ 341 NONAME
-	_ZN27CDataRecognitionResultArrayC1Ev @ 342 NONAME
-	_ZN27CDataRecognitionResultArrayC2Ev @ 343 NONAME
-	_ZN27CDataRecognitionResultArrayD0Ev @ 344 NONAME
-	_ZN27CDataRecognitionResultArrayD1Ev @ 345 NONAME
-	_ZN27CDataRecognitionResultArrayD2Ev @ 346 NONAME
-	_ZNK27CDataRecognitionResultArray12GetFileNameLER4TBufILi256EEj @ 347 NONAME
-	_ZNK27CDataRecognitionResultArray25GetDataRecognitionResultLER22TDataRecognitionResultj @ 348 NONAME
-	_ZNK27CDataRecognitionResultArray4PathEv @ 349 NONAME
-	_ZNK27CDataRecognitionResultArray5CountEv @ 350 NONAME
-	_ZTI21CAsyncFileRecognition @ 351 NONAME ABSENT ; #<TI>#
-	_ZTI27CDataRecognitionResultArray @ 352 NONAME ; #<TI>#
-	_ZTI32CDataRecognitionResultArrayEntry @ 353 NONAME ABSENT ; #<TI>#
-	_ZTV21CAsyncFileRecognition @ 354 NONAME ABSENT ; #<VT>#
-	_ZTV27CDataRecognitionResultArray @ 355 NONAME ; #<VT>#
-	_ZTV32CDataRecognitionResultArrayEntry @ 356 NONAME ABSENT ; #<VT>#
-	_ZNK13RApaLsSession16GetAppByDataTypeERK9TDataType4TUidRS3_ @ 357 NONAME
-	_ZN13RApaLsSession17DeleteDataMappingERK9TDataType4TUid @ 358 NONAME
-	_ZN13RApaLsSession17InsertDataMappingERK9TDataTypel4TUidS3_ @ 359 NONAME
-	_ZN13RApaLsSession29RegisterNonNativeApplicationLE4TUidRK10TDriveUnitR34CApaRegistrationResourceFileWriterP33CApaLocalisableResourceFileWriterPK5RFile @ 360 NONAME
-	_ZN13RApaLsSession31DeregisterNonNativeApplicationLE4TUid @ 361 NONAME
-	_ZN13RApaLsSession33RegisterNonNativeApplicationTypeLE4TUidRK7TDesC16 @ 362 NONAME
-	_ZN13RApaLsSession35DeregisterNonNativeApplicationTypeLE4TUid @ 363 NONAME
-	_ZN13RApaLsSession8StartAppERK15CApaCommandLineR9TThreadIdP14TRequestStatus @ 364 NONAME
-	_ZNK11CApaAppData10OpaqueDataEv @ 365 NONAME ABSENT
-	_ZNK11CApaAppData20RegistrationFileNameEv @ 366 NONAME ABSENT
-	_ZNK11CApaAppData27LocalisableResourceFileNameEv @ 367 NONAME ABSENT
-	_ZNK11CApaAppList17AppDataByFileNameERK7TDesC16 @ 368 NONAME ABSENT
-	_ZNK13RApaLsSession22GetDefaultScreenNumberERi4TUid @ 369 NONAME
-	_ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 370 NONAME ABSENT
-	_ZNK13RApaLsSession21MatchesSecurityPolicyERi4TUidRK15TSecurityPolicy @ 371 NONAME
-	_ZN33CApaLocalisableResourceFileWriterD1Ev @ 372 NONAME
-	_ZN33CApaLocalisableResourceFileWriterD2Ev @ 373 NONAME
-	_ZN34CApaRegistrationResourceFileWriter12AddDataTypeLEiRK6TDesC8 @ 374 NONAME
-	_ZN34CApaRegistrationResourceFileWriter13SetGroupNameLERK7TDesC16 @ 375 NONAME
-	_ZN34CApaRegistrationResourceFileWriter14SetOpaqueDataLERK6TDesC8 @ 376 NONAME
-	_ZN34CApaRegistrationResourceFileWriter15SetAppIsHiddenLEi @ 377 NONAME
-	_ZN34CApaRegistrationResourceFileWriter17SetEmbeddabilityLEN17TApaAppCapability14TEmbeddabilityE @ 378 NONAME
-	_ZN34CApaRegistrationResourceFileWriter19SetSupportsNewFileLEi @ 379 NONAME
-	_ZN34CApaRegistrationResourceFileWriter21AddFileOwnershipInfoLERK7TDesC16 @ 380 NONAME
-	_ZN34CApaRegistrationResourceFileWriter22SetLaunchInBackgroundLEi @ 381 NONAME
-	_ZN34CApaRegistrationResourceFileWriter23SetDefaultScreenNumberLEi @ 382 NONAME
-	_ZN34CApaRegistrationResourceFileWriter4NewLE4TUidRK7TDesC16j @ 383 NONAME
-	_ZN34CApaRegistrationResourceFileWriterD0Ev @ 384 NONAME
-	_ZN34CApaRegistrationResourceFileWriterD1Ev @ 385 NONAME
-	_ZN34CApaRegistrationResourceFileWriterD2Ev @ 386 NONAME
-	_ZNK11CApaAppData24NonNativeApplicationTypeEv @ 387 NONAME ABSENT
-	_ZTI33CApaLocalisableResourceFileWriter @ 388 NONAME ; #<TI>#
-	_ZTI34CApaRegistrationResourceFileWriter @ 389 NONAME ; #<TI>#
-	_ZTIN26CApaResourceFileWriterBase11RBufferSinkE @ 390 NONAME ; #<TI>#
-	_ZTV33CApaLocalisableResourceFileWriter @ 391 NONAME ; #<VT>#
-	_ZTV34CApaRegistrationResourceFileWriter @ 392 NONAME ; #<VT>#
-	_ZTVN26CApaResourceFileWriterBase11RBufferSinkE @ 393 NONAME ; #<VT>#
-	_ZN33CApaLocalisableResourceFileWriter4NewLERK7TDesC16S2_iS2_ @ 394 NONAME
-	_ZN33CApaLocalisableResourceFileWriterD0Ev @ 395 NONAME
-	_ZN13RApaLsSession12CancelNotifyEv @ 396 NONAME
-	_ZN13RApaLsSession9SetNotifyEiR14TRequestStatus @ 397 NONAME
-	_ZNK11CApaAppList17AppScanInProgressEv @ 398 NONAME ABSENT
-	_ZN13RApaLsSession25NotifyOnDataMappingChangeER14TRequestStatus @ 399 NONAME
-	_ZN13RApaLsSession31CancelNotifyOnDataMappingChangeEv @ 400 NONAME
-	_ZNK13RApaLsSession10GetAppTypeER4TUidS0_ @ 401 NONAME
-	_ZN13RApaLsSession35CommitNonNativeApplicationsUpdatesLEv @ 402 NONAME
-	_ZN13RApaLsSession36PrepareNonNativeApplicationsUpdatesLEv @ 403 NONAME
-	_ZN13RApaLsSession36RollbackNonNativeApplicationsUpdatesEv @ 404 NONAME
-	_ZN11CApaAppList15UpdatedAppsListEv @ 405 NONAME ABSENT
-	_ZN11CApaAppList18SetUpdatedAppsListEP16CUpdatedAppsList @ 406 NONAME ABSENT
-	_ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 407 NONAME ABSENT
-	_ZN11CApaAppDataD0Ev @ 408 NONAME ABSENT
-	_ZN11CApaAppDataD1Ev @ 409 NONAME ABSENT
-	_ZN11CApaAppDataD2Ev @ 410 NONAME ABSENT
-	_ZN11CApaAppList24ShareProtectedFileServerEv @ 411 NONAME ABSENT
-	_ZN11CApaAppList4SelfEv @ 412 NONAME ABSENT
-	X @ 413 NONAME ABSENT
-	X @ 414 NONAME ABSENT
-	X @ 415 NONAME ABSENT
-	X @ 416 NONAME ABSENT
-	_ZN13RApaLsSession18SetAppShortCaptionERK7TDesC169TLanguage4TUid @ 417 NONAME
-	_ZN11CApaAppData16SetShortCaptionLERK7TDesC16 @ 418 NONAME ABSENT
-	_ZN11CApaAppList14CompareStringsERK7HBufC16S2_ @ 419 NONAME ABSENT
-	_ZN11CApaAppList22AddForcedRegistrationLEP7HBufC16 @ 420 NONAME ABSENT
-	_ZN13RApaLsSession17ForceRegistrationERK13RPointerArrayI7TDesC16E @ 421 NONAME
-	_ZN11CApaAppList24ResetForcedRegistrationsEv @ 422 NONAME ABSENT
-	_ZN11CApaAppList12RestartScanLEv @ 423 NONAME ABSENT
-	_ZN11CApaAppList8StopScanEv @ 424 NONAME ABSENT
-	KMinApplicationStackSize @ 425 NONAME DATA 4
-	_Z23MinApplicationStackSizev @ 426 NONAME
-	_ZNK11CApaAppData9IsPendingEv @ 427 NONAME ABSENT
-	_ZNK11CApaAppList23IsLanguageChangePendingEv @ 428 NONAME ABSENT
-	_ZNK13RApaLsSession10GetAppIconE4TUidR5RFile @ 429 NONAME
-	_ZN17CApaSecurityUtils16CheckAppSecurityERK7TPtrC16RiS3_ @ 430 NONAME
-	X @ 431 NONAME ABSENT
-	X @ 432 NONAME ABSENT
-	_ZN13RApaLsSession40ForceCommitNonNativeApplicationsUpdatesLEv @ 433 NONAME
-	_ZNK13RApaLsSession13RecognizeDataERK6TDesC8R22TDataRecognitionResult @ 434 NONAME
-	_ZN13RApaLsSession14UpdateAppListLER6RArrayI17TApaAppUpdateInfoE @ 435 NONAME
-	_ZN17TApaAppUpdateInfo12InternalizeLER11RReadStream @ 436 NONAME
-	_ZN17TApaAppUpdateInfoC1Ev @ 437 NONAME
-	_ZN17TApaAppUpdateInfoC2Ev @ 438 NONAME
-	_ZNK17TApaAppUpdateInfo12ExternalizeLER12RWriteStream @ 439 NONAME
-	_ZN17TApaAppUpdateInfoC1E4TUidNS_13TApaAppActionE @ 440 NONAME
-	_ZN17TApaAppUpdateInfoC2E4TUidNS_13TApaAppActionE @ 441 NONAME
-	_ZN13RApaLsSession16UpdatedAppsInfoLER6RArrayI17TApaAppUpdateInfoE @ 442 NONAME
-	_ZN13RApaLsSession17ForceRegistrationERK13RPointerArrayIN4Usif28CApplicationRegistrationDataEE @ 443 NONAME
-
--- a/appfw/apparchitecture/eabi/APSERVU.DEF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-EXPORTS
-	_Z23NameApaServServerThreadv @ 1 NONAME
-	_Z25NameApaServStartSemaphorev @ 2 NONAME
-	_ZN13CApaFsMonitor10SetBlockedEi @ 3 NONAME
-	_ZN13CApaFsMonitor4NewLER3RFsRK7TDesC169TCallBack @ 4 NONAME
-	_ZN13CApaFsMonitor5StartE11TNotifyType @ 5 NONAME
-	_ZN13CApaFsMonitorD0Ev @ 6 NONAME
-	_ZN13CApaFsMonitorD1Ev @ 7 NONAME
-	_ZN13CApaFsMonitorD2Ev @ 8 NONAME
-	_ZN16CApaAppArcServer4NewLEP11CApaAppListP18CApaFileRecognizer @ 9 NONAME ABSENT
-	_ZN16CApaAppArcServer4NewLEv @ 10 NONAME
-	_ZN16CApaAppArcServerD0Ev @ 11 NONAME
-	_ZN16CApaAppArcServerD1Ev @ 12 NONAME
-	_ZN16CApaAppArcServerD2Ev @ 13 NONAME
-	_ZNK13CApaFsMonitor10NotifyTypeEv @ 14 NONAME
-	_ZTI13CApaFsMonitor @ 15 NONAME ; #<TI>#
-	_ZTI15CApaEComMonitor @ 16 NONAME ; #<TI>#
-	_ZTI16CApaAppArcServer @ 17 NONAME ; #<TI>#
-	_ZTI20TDesCArrayItemWriter @ 18 NONAME ABSENT ; #<TI>#
-	_ZTI20TSizeArrayItemWriter @ 19 NONAME ABSENT ; #<TI>#
-	_ZTI22CApaAppListServSession @ 20 NONAME ; #<TI>#
-	_ZTI24TViewDataArrayItemWriter @ 21 NONAME ABSENT ; #<TI>#
-	_ZTV13CApaFsMonitor @ 22 NONAME ; #<VT>#
-	_ZTV15CApaEComMonitor @ 23 NONAME ; #<VT>#
-	_ZTV16CApaAppArcServer @ 24 NONAME ; #<VT>#
-	_ZTV20TDesCArrayItemWriter @ 25 NONAME ABSENT ; #<VT>#
-	_ZTV20TSizeArrayItemWriter @ 26 NONAME ABSENT ; #<VT>#
-	_ZTV22CApaAppListServSession @ 27 NONAME ; #<VT>#
-	_ZTV24TViewDataArrayItemWriter @ 28 NONAME ABSENT ; #<VT>#
-	_ZN13CApaFsMonitor12AddLocationLERK7TDesC16 @ 29 NONAME
-	_ZTIN13CApaFsMonitor14CApaFsNotifierE @ 30 NONAME ; #<TI>#
-	_ZTVN13CApaFsMonitor14CApaFsNotifierE @ 31 NONAME ; #<VT>#
-	_ZN16CApaAppArcServer4SelfEv @ 32 NONAME
-	_ZN13CApaFsMonitor6CancelEv @ 33 NONAME
-	_Z18ApaServThreadStartPv @ 34 NONAME
-	_ZTI18CRecognitionResult @ 35 NONAME ABSENT ; #<TI>#
-	_ZTI20CApsRecognitionCache @ 36 NONAME ; #<TI>#
-	_ZTI20CCacheDirectoryEntry @ 37 NONAME ; #<TI>#
-	_ZTI23CFileRecognitionUtility @ 38 NONAME ABSENT ; #<TI>#
-	_ZTI25CRecognitionResultHashMap @ 39 NONAME ; #<TI>#
-	_ZTI27CDirectoryRecognitionResult @ 40 NONAME ABSENT ; #<TI>#
-	_ZTI30CRecognitionResultHashMapEntry @ 41 NONAME ; #<TI>#
-	_ZTV18CRecognitionResult @ 42 NONAME ABSENT ; #<VT>#
-	_ZTV20CApsRecognitionCache @ 43 NONAME ; #<VT>#
-	_ZTV20CCacheDirectoryEntry @ 44 NONAME ; #<VT>#
-	_ZTV23CFileRecognitionUtility @ 45 NONAME ABSENT ; #<VT>#
-	_ZTV25CRecognitionResultHashMap @ 46 NONAME ; #<VT>#
-	_ZTV27CDirectoryRecognitionResult @ 47 NONAME ABSENT ; #<VT>#
-	_ZTV30CRecognitionResultHashMapEntry @ 48 NONAME ; #<VT>#
-	_ZN16CUpdatedAppsList28CloseAndDeletePermanentStoreEv @ 49 NONAME ABSENT
-	_ZN16CUpdatedAppsListD0Ev @ 50 NONAME ABSENT
-	_ZN16CUpdatedAppsListD1Ev @ 51 NONAME ABSENT
-	_ZN16CUpdatedAppsListD2Ev @ 52 NONAME ABSENT
-	_ZTI16CUpdatedAppsList @ 53 NONAME ABSENT ; #<TI>#
-	_ZTV16CUpdatedAppsList @ 54 NONAME ABSENT ; #<VT>#
-	_ZNK16CUpdatedAppsList8IsInListERK7TDesC16 @ 55 NONAME ABSENT
-	_ZTIN16CUpdatedAppsList15CUpdatedAppInfoE @ 56 NONAME ABSENT ; #<TI>#
-	_ZTVN16CUpdatedAppsList15CUpdatedAppInfoE @ 57 NONAME ABSENT ; #<VT>#
-	_ZN16CApaAppArcServer14RescanCallBackEv @ 58 NONAME ABSENT
-	_ZTI18CCustomAppInfoData @ 59 NONAME ABSENT ; #<TI>#
-	_ZTV18CCustomAppInfoData @ 60 NONAME ABSENT ; #<VT>#
-	KApaLoadDataRecognizersOnDemand @ 61 NONAME DATA 4
-	KApaUnloadRecognizersTimeout @ 62 NONAME DATA 4
-	_ZN16CApaAppArcServer27HandleInstallationEndEventLEv @ 63 NONAME ABSENT
-	_ZN16CApaAppArcServer28HandleInstallationStartEventEv @ 64 NONAME ABSENT
-	KApaDrivesToMonitor @ 65 NONAME DATA 4
-	KApaLoadMbmIconsOnDemand @ 66 NONAME DATA 4
-	_ZTI21CApaAppArcServSession @ 67 NONAME
-	_ZTV21CApaAppArcServSession @ 68 NONAME
-
--- a/appfw/apparchitecture/eabi/TICONFORLEAKSu.DEF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,433 +0,0 @@
-EXPORTS
-	KMinApplicationStackSize @ 1 NONAME DATA 4
-	_Z16StartupApaServerR14MApaAppStarter @ 2 NONAME ABSENT
-	_Z23MinApplicationStackSizev @ 3 NONAME
-	_Z23StartupApaServerProcessv @ 4 NONAME
-	_ZN11CApaAppData16CanUseScreenModeEi @ 5 NONAME
-	_ZN11CApaAppData16SetShortCaptionLERK7TDesC16 @ 6 NONAME
-	_ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 7 NONAME ABSENT
-	_ZN11CApaAppDataD0Ev @ 8 NONAME
-	_ZN11CApaAppDataD1Ev @ 9 NONAME
-	_ZN11CApaAppDataD2Ev @ 10 NONAME
-	_ZN11CApaAppList12RestartScanLEv @ 11 NONAME ABSENT
-	_ZN11CApaAppList14CompareStringsERK7HBufC16S2_ @ 12 NONAME ABSENT
-	_ZN11CApaAppList15UpdatedAppsListEv @ 13 NONAME ABSENT
-	_ZN11CApaAppList16StartIdleUpdateLEP19MApaAppListObserver @ 14 NONAME
-	_ZN11CApaAppList16StartIdleUpdateLEv @ 15 NONAME
-	_ZN11CApaAppList18SetUpdatedAppsListEP16CUpdatedAppsList @ 16 NONAME ABSENT
-	_ZN11CApaAppList22AddForcedRegistrationLEP7HBufC16 @ 17 NONAME ABSENT
-	_ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 18 NONAME ABSENT
-	_ZN11CApaAppList24ResetForcedRegistrationsEv @ 19 NONAME ABSENT
-	_ZN11CApaAppList4NewLER3RFsP16CApaAppRegFinderii @ 20 NONAME ABSENT
-	_ZN11CApaAppList4SelfEv @ 21 NONAME
-	_ZN11CApaAppList6PurgeLEv @ 22 NONAME ABSENT
-	_ZN11CApaAppList8StopScanEi @ 23 NONAME ABSENT
-	_ZN11CApaAppList9InitListLEP19MApaAppListObserver @ 24 NONAME
-	_ZN11CApaAppListD0Ev @ 25 NONAME
-	_ZN11CApaAppListD1Ev @ 26 NONAME
-	_ZN11CApaAppListD2Ev @ 27 NONAME
-	_ZN12TApaTaskList10CycleTasksE4TUidNS_15TCycleDirectionE @ 28 NONAME
-	_ZN12TApaTaskList7FindAppE4TUid @ 29 NONAME
-	_ZN12TApaTaskList7FindAppERK7TDesC16 @ 30 NONAME
-	_ZN12TApaTaskList7FindDocERK7TDesC16 @ 31 NONAME
-	_ZN12TApaTaskList9FindByPosEi @ 32 NONAME
-	_ZN12TApaTaskListC1ER10RWsSession @ 33 NONAME
-	_ZN12TApaTaskListC2ER10RWsSession @ 34 NONAME
-	_ZN13RApaLsSession12CancelNotifyEv @ 35 NONAME
-	_ZN13RApaLsSession13SetFsSessionLER3RFs @ 36 NONAME
-	_ZN13RApaLsSession13StartDocumentER5RFile4TUidR9TThreadIdP14TRequestStatus @ 37 NONAME
-	_ZN13RApaLsSession13StartDocumentER5RFileR9TThreadIdP14TRequestStatus @ 38 NONAME
-	_ZN13RApaLsSession13StartDocumentER5RFileRK9TDataTypeR9TThreadIdP14TRequestStatus @ 39 NONAME
-	_ZN13RApaLsSession13StartDocumentERK7TDesC164TUidR9TThreadIdNS_11TLaunchTypeE @ 40 NONAME
-	_ZN13RApaLsSession13StartDocumentERK7TDesC16R9TThreadIdNS_11TLaunchTypeE @ 41 NONAME
-	_ZN13RApaLsSession13StartDocumentERK7TDesC16RK9TDataTypeR9TThreadIdNS_11TLaunchTypeE @ 42 NONAME
-	_ZN13RApaLsSession14ClearFsSessionEv @ 43 NONAME
-	_ZN13RApaLsSession14CreateDocumentERK7TDesC164TUidR9TThreadIdNS_11TLaunchTypeE @ 44 NONAME
-	_ZN13RApaLsSession15RecognizeFilesLERK7TDesC16R27CDataRecognitionResultArrayR14TRequestStatus @ 45 NONAME
-	_ZN13RApaLsSession15RecognizeFilesLERK7TDesC16RK6TDesC8R27CDataRecognitionResultArrayR14TRequestStatus @ 46 NONAME
-	_ZN13RApaLsSession17DeleteDataMappingERK9TDataType @ 47 NONAME
-	_ZN13RApaLsSession17DeleteDataMappingERK9TDataType4TUid @ 48 NONAME
-	_ZN13RApaLsSession17ForceRegistrationERK13RPointerArrayI7TDesC16E @ 49 NONAME
-	_ZN13RApaLsSession17InsertDataMappingERK9TDataTypel4TUid @ 50 NONAME
-	_ZN13RApaLsSession17InsertDataMappingERK9TDataTypel4TUidS3_ @ 51 NONAME
-	_ZN13RApaLsSession17SetMaxDataBufSizeEi @ 52 NONAME
-	_ZN13RApaLsSession18SetAppShortCaptionERK7TDesC169TLanguage4TUid @ 53 NONAME
-	_ZN13RApaLsSession20CancelRecognizeFilesEv @ 54 NONAME
-	_ZN13RApaLsSession21SetAcceptedConfidenceEi @ 55 NONAME
-	_ZN13RApaLsSession23RApaLsSession_Reserved1Ev @ 56 NONAME
-	_ZN13RApaLsSession23RApaLsSession_Reserved2Ev @ 57 NONAME
-	_ZN13RApaLsSession25InsertDataMappingIfHigherERK9TDataTypel4TUidRi @ 58 NONAME
-	_ZN13RApaLsSession25NotifyOnDataMappingChangeER14TRequestStatus @ 59 NONAME
-	_ZN13RApaLsSession29RegisterNonNativeApplicationLE4TUidRK10TDriveUnitR34CApaRegistrationResourceFileWriterP33CApaLocalisableResourceFileWriterPK5RFile @ 60 NONAME
-	_ZN13RApaLsSession31CancelNotifyOnDataMappingChangeEv @ 61 NONAME
-	_ZN13RApaLsSession31DeregisterNonNativeApplicationLE4TUid @ 62 NONAME
-	_ZN13RApaLsSession33RegisterNonNativeApplicationTypeLE4TUidRK7TDesC16 @ 63 NONAME
-	_ZN13RApaLsSession35CommitNonNativeApplicationsUpdatesLEv @ 64 NONAME
-	_ZN13RApaLsSession35DeregisterNonNativeApplicationTypeLE4TUid @ 65 NONAME
-	_ZN13RApaLsSession36PrepareNonNativeApplicationsUpdatesLEv @ 66 NONAME
-	_ZN13RApaLsSession36RollbackNonNativeApplicationsUpdatesEv @ 67 NONAME
-	_ZN13RApaLsSession5CloseEv @ 68 NONAME
-	_ZN13RApaLsSession7ConnectEv @ 69 NONAME
-	_ZN13RApaLsSession8StartAppERK15CApaCommandLine @ 70 NONAME
-	_ZN13RApaLsSession8StartAppERK15CApaCommandLineR9TThreadId @ 71 NONAME
-	_ZN13RApaLsSession8StartAppERK15CApaCommandLineR9TThreadIdP14TRequestStatus @ 72 NONAME
-	_ZN13RApaLsSession9FsSessionEv @ 73 NONAME
-	_ZN13RApaLsSession9SetNotifyEiR14TRequestStatus @ 74 NONAME
-	_ZN13RApaLsSessionC1Ev @ 75 NONAME
-	_ZN13RApaLsSessionC2Ev @ 76 NONAME
-	_ZN16CApaMaskedBitmap12InternalizeLER11RReadStream @ 77 NONAME
-	_ZN16CApaMaskedBitmap13SetMaskBitmapEP10CFbsBitmap @ 78 NONAME
-	_ZN16CApaMaskedBitmap4NewLEPKS_ @ 79 NONAME
-	_ZN16CApaMaskedBitmap5NewLCEv @ 80 NONAME
-	_ZN16CApaMaskedBitmapD0Ev @ 81 NONAME
-	_ZN16CApaMaskedBitmapD1Ev @ 82 NONAME
-	_ZN16CApaMaskedBitmapD2Ev @ 83 NONAME
-	_ZN17CApaSystemControl7CreateLEv @ 84 NONAME
-	_ZN18TApaPictureFactoryC1EP11CApaProcess @ 85 NONAME
-	_ZN18TApaPictureFactoryC1Ev @ 86 NONAME
-	_ZN18TApaPictureFactoryC2EP11CApaProcess @ 87 NONAME
-	_ZN18TApaPictureFactoryC2Ev @ 88 NONAME
-	_ZN19CApaAppListNotifier4NewLEP23MApaAppListServObserverN7CActive9TPriorityE @ 89 NONAME
-	_ZN19CApaAppListNotifierD0Ev @ 90 NONAME
-	_ZN19CApaAppListNotifierD1Ev @ 91 NONAME
-	_ZN19CApaAppListNotifierD2Ev @ 92 NONAME
-	_ZN19CApaWindowGroupName11SetAppReadyEi @ 93 NONAME
-	_ZN19CApaWindowGroupName11SetCaptionLERK7TDesC16 @ 94 NONAME
-	_ZN19CApaWindowGroupName11SetDocNameLERK7TDesC16 @ 95 NONAME
-	_ZN19CApaWindowGroupName12FindByAppUidE4TUidR10RWsSessionRi @ 96 NONAME
-	_ZN19CApaWindowGroupName13FindByCaptionERK7TDesC16R10RWsSessionRi @ 97 NONAME
-	_ZN19CApaWindowGroupName13FindByDocNameERK7TDesC16R10RWsSessionRi @ 98 NONAME
-	_ZN19CApaWindowGroupName17SetDocNameIsAFileEi @ 99 NONAME
-	_ZN19CApaWindowGroupName18ConstructFromWgIdLEi @ 100 NONAME
-	_ZN19CApaWindowGroupName18SetWindowGroupNameEP7HBufC16 @ 101 NONAME
-	_ZN19CApaWindowGroupName19SetWindowGroupNameLERK7TDesC16 @ 102 NONAME
-	_ZN19CApaWindowGroupName26SetRespondsToShutdownEventEi @ 103 NONAME
-	_ZN19CApaWindowGroupName29SetRespondsToSwitchFilesEventEi @ 104 NONAME
-	_ZN19CApaWindowGroupName3NewERK10RWsSessionP7HBufC16 @ 105 NONAME
-	_ZN19CApaWindowGroupName4NewLERK10RWsSession @ 106 NONAME
-	_ZN19CApaWindowGroupName4NewLERK10RWsSessionRK7TDesC16 @ 107 NONAME
-	_ZN19CApaWindowGroupName4NewLERK10RWsSessioni @ 108 NONAME
-	_ZN19CApaWindowGroupName5NewLCERK10RWsSession @ 109 NONAME
-	_ZN19CApaWindowGroupName5NewLCERK10RWsSessionRK7TDesC16 @ 110 NONAME
-	_ZN19CApaWindowGroupName5NewLCERK10RWsSessioni @ 111 NONAME
-	_ZN19CApaWindowGroupName7SetBusyEi @ 112 NONAME
-	_ZN19CApaWindowGroupName9SetAppUidE4TUid @ 113 NONAME
-	_ZN19CApaWindowGroupName9SetHiddenEi @ 114 NONAME
-	_ZN19CApaWindowGroupName9SetSystemEi @ 115 NONAME
-	_ZN19CApaWindowGroupNameD0Ev @ 116 NONAME
-	_ZN19CApaWindowGroupNameD1Ev @ 117 NONAME
-	_ZN19CApaWindowGroupNameD2Ev @ 118 NONAME
-	_ZN21CApaAppInfoFileWriter11AddCaptionLE9TLanguageRK7TDesC16 @ 119 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter12AddDataTypeLERK21TDataTypeWithPriority @ 120 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter13SetCapabilityERK6TDesC8 @ 121 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter6StoreLEv @ 122 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriter8AddIconLER16CApaMaskedBitmap @ 123 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriterD0Ev @ 124 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriterD1Ev @ 125 NONAME ABSENT
-	_ZN21CApaAppInfoFileWriterD2Ev @ 126 NONAME ABSENT
-	_ZN21CApaSystemControlList4NewLER3RFs @ 127 NONAME
-	_ZN21CApaSystemControlList7UpdateLEv @ 128 NONAME
-	_ZN21CApaSystemControlListD0Ev @ 129 NONAME
-	_ZN21CApaSystemControlListD1Ev @ 130 NONAME
-	_ZN21CApaSystemControlListD2Ev @ 131 NONAME
-	_ZN22ForJavaMIDletInstaller18GetJavaMIDletInfoLER3RFsRK7TDesC16RmS5_ @ 132 NONAME ABSENT
-	_ZN22ForJavaMIDletInstaller28NewInterimFormatFileWriterLCER3RFsRK7TDesC164TUidmi @ 133 NONAME ABSENT
-	_ZN22ForJavaMIDletInstaller33CheckInterimFormatFileNotCorruptLER5RFile @ 134 NONAME ABSENT
-	_ZN23MApaAppListServObserver33MApaAppListServObserver_Reserved1Ev @ 135 NONAME
-	_ZN23MApaAppListServObserver33MApaAppListServObserver_Reserved2Ev @ 136 NONAME
-	_ZN23MApaAppListServObserverC2Ev @ 137 NONAME
-	_ZN27CDataRecognitionResultArrayC1Ev @ 138 NONAME
-	_ZN27CDataRecognitionResultArrayC2Ev @ 139 NONAME
-	_ZN27CDataRecognitionResultArrayD0Ev @ 140 NONAME
-	_ZN27CDataRecognitionResultArrayD1Ev @ 141 NONAME
-	_ZN27CDataRecognitionResultArrayD2Ev @ 142 NONAME
-	_ZN31TIconLoaderAndIconArrayForLeaks27TestIconLoaderAndIconArrayLEv @ 143 NONAME
-	_ZN33CApaLocalisableResourceFileWriter4NewLERK7TDesC16S2_iS2_ @ 144 NONAME
-	_ZN33CApaLocalisableResourceFileWriterD0Ev @ 145 NONAME
-	_ZN33CApaLocalisableResourceFileWriterD1Ev @ 146 NONAME
-	_ZN33CApaLocalisableResourceFileWriterD2Ev @ 147 NONAME
-	_ZN34CApaRegistrationResourceFileWriter12AddDataTypeLEiRK6TDesC8 @ 148 NONAME
-	_ZN34CApaRegistrationResourceFileWriter13SetGroupNameLERK7TDesC16 @ 149 NONAME
-	_ZN34CApaRegistrationResourceFileWriter14SetOpaqueDataLERK6TDesC8 @ 150 NONAME
-	_ZN34CApaRegistrationResourceFileWriter15SetAppIsHiddenLEi @ 151 NONAME
-	_ZN34CApaRegistrationResourceFileWriter17SetEmbeddabilityLEN17TApaAppCapability14TEmbeddabilityE @ 152 NONAME
-	_ZN34CApaRegistrationResourceFileWriter19SetSupportsNewFileLEi @ 153 NONAME
-	_ZN34CApaRegistrationResourceFileWriter21AddFileOwnershipInfoLERK7TDesC16 @ 154 NONAME
-	_ZN34CApaRegistrationResourceFileWriter22SetLaunchInBackgroundLEi @ 155 NONAME
-	_ZN34CApaRegistrationResourceFileWriter23SetDefaultScreenNumberLEi @ 156 NONAME
-	_ZN34CApaRegistrationResourceFileWriter4NewLE4TUidRK7TDesC16j @ 157 NONAME
-	_ZN34CApaRegistrationResourceFileWriterD0Ev @ 158 NONAME
-	_ZN34CApaRegistrationResourceFileWriterD1Ev @ 159 NONAME
-	_ZN34CApaRegistrationResourceFileWriterD2Ev @ 160 NONAME
-	_ZN8ApaUtils24HandleAsRegistrationFileERK8TUidType @ 161 NONAME ABSENT
-	_ZN8CApaDoor16SetFormatToIconLEv @ 162 NONAME
-	_ZN8CApaDoor17SetFormatToGlassLEv @ 163 NONAME
-	_ZN8CApaDoor25SetFormatToTemporaryIconLEi @ 164 NONAME
-	_ZN8CApaDoor4NewLER3RFsR12CApaDocumentRK5TSize @ 165 NONAME
-	_ZN8CApaDoor4NewLER3RFsRK12CStreamStore9TStreamIdR11CApaProcess @ 166 NONAME
-	_ZN8CApaDoor5NewLCER3RFsR12CApaDocumentRK5TSize @ 167 NONAME
-	_ZN8CApaDoor8RestoreLERK12CStreamStore9TStreamId @ 168 NONAME
-	_ZN8CApaDoor9DocumentLEi @ 169 NONAME
-	_ZN8CApaDoorD0Ev @ 170 NONAME
-	_ZN8CApaDoorD1Ev @ 171 NONAME
-	_ZN8CApaDoorD2Ev @ 172 NONAME
-	_ZN8TApaTask11SendMessageE4TUidRK6TDesC8 @ 173 NONAME
-	_ZN8TApaTask14SwitchOpenFileERK7TDesC16 @ 174 NONAME
-	_ZN8TApaTask15SendSystemEventE15TApaSystemEvent @ 175 NONAME
-	_ZN8TApaTask16SendToBackgroundEv @ 176 NONAME
-	_ZN8TApaTask16SwitchCreateFileERK7TDesC16 @ 177 NONAME
-	_ZN8TApaTask17BringToForegroundEv @ 178 NONAME
-	_ZN8TApaTask7EndTaskEv @ 179 NONAME
-	_ZN8TApaTask7SendKeyERK9TKeyEvent @ 180 NONAME
-	_ZN8TApaTask7SendKeyEii @ 181 NONAME
-	_ZN8TApaTask7SetWgIdEi @ 182 NONAME
-	_ZN8TApaTask8KillTaskEv @ 183 NONAME
-	_ZN8TApaTaskC1ER10RWsSession @ 184 NONAME
-	_ZN8TApaTaskC2ER10RWsSession @ 185 NONAME
-	_ZNK11CApaAppData10CapabilityER5TDes8 @ 186 NONAME
-	_ZNK11CApaAppData10IconSizesLEv @ 187 NONAME
-	_ZNK11CApaAppData10OpaqueDataEv @ 188 NONAME
-	_ZNK11CApaAppData10OwnedFilesEv @ 189 NONAME
-	_ZNK11CApaAppData11GetIconInfoERiS0_ @ 190 NONAME
-	_ZNK11CApaAppData12IconFileNameEv @ 191 NONAME
-	_ZNK11CApaAppData14NonMbmIconFileEv @ 192 NONAME
-	_ZNK11CApaAppData17ImplementsServiceE4TUid @ 193 NONAME
-	_ZNK11CApaAppData19ApplicationLanguageEv @ 194 NONAME
-	_ZNK11CApaAppData19DefaultScreenNumberEv @ 195 NONAME
-	_ZNK11CApaAppData20RegistrationFileNameEv @ 196 NONAME ABSENT
-	_ZNK11CApaAppData20RegistrationFileUsedEv @ 197 NONAME ABSENT
-	_ZNK11CApaAppData24NonNativeApplicationTypeEv @ 198 NONAME
-	_ZNK11CApaAppData27LocalisableResourceFileNameEv @ 199 NONAME ABSENT
-	_ZNK11CApaAppData4IconE5TSize @ 200 NONAME
-	_ZNK11CApaAppData4IconEi @ 201 NONAME
-	_ZNK11CApaAppData5ViewsEv @ 202 NONAME
-	_ZNK11CApaAppData8AppEntryEv @ 203 NONAME
-	_ZNK11CApaAppData8DataTypeERK9TDataType @ 204 NONAME
-	_ZNK11CApaAppData9IsPendingEv @ 205 NONAME ABSENT
-	_ZNK11CApaAppList12AppDataByUidE4TUid @ 206 NONAME
-	_ZNK11CApaAppList17AppDataByFileNameERK7TDesC16 @ 207 NONAME
-	_ZNK11CApaAppList17AppScanInProgressEv @ 208 NONAME
-	_ZNK11CApaAppList17ServiceUidBufferLE4TUid @ 209 NONAME
-	_ZNK11CApaAppList19IsFirstScanCompleteEv @ 210 NONAME
-	_ZNK11CApaAppList19ServiceArrayBufferLE4TUid @ 211 NONAME
-	_ZNK11CApaAppList20IsIdleUpdateCompleteEv @ 212 NONAME
-	_ZNK11CApaAppList21PreferredDataHandlerLERK9TDataType @ 213 NONAME
-	_ZNK11CApaAppList21PreferredDataHandlerLERK9TDataTypePK4TUidRi @ 214 NONAME
-	_ZNK11CApaAppList23IsLanguageChangePendingEv @ 215 NONAME
-	_ZNK11CApaAppList23ServiceImplArrayBufferLE4TUid @ 216 NONAME
-	_ZNK11CApaAppList23ServiceImplArrayBufferLE4TUidRK9TDataType @ 217 NONAME
-	_ZNK11CApaAppList24ServiceOpaqueDataBufferLE4TUidS0_ @ 218 NONAME
-	_ZNK11CApaAppList5CountEv @ 219 NONAME
-	_ZNK11CApaAppList7NextAppEPK11CApaAppData @ 220 NONAME
-	_ZNK11CApaAppList7NextAppEPK11CApaAppDatai @ 221 NONAME
-	_ZNK11CApaAppList8FirstAppEi @ 222 NONAME
-	_ZNK11CApaAppList8FirstAppEv @ 223 NONAME
-	_ZNK13RApaLsSession10GetAllAppsEi @ 224 NONAME
-	_ZNK13RApaLsSession10GetAllAppsEv @ 225 NONAME
-	_ZNK13RApaLsSession10GetAppIconE4TUid5TSizeR16CApaMaskedBitmap @ 226 NONAME
-	_ZNK13RApaLsSession10GetAppIconE4TUidR5RFile @ 227 NONAME
-	_ZNK13RApaLsSession10GetAppIconE4TUidRP7HBufC16 @ 228 NONAME
-	_ZNK13RApaLsSession10GetAppIconE4TUidiR16CApaMaskedBitmap @ 229 NONAME
-	_ZNK13RApaLsSession10GetAppInfoER11TApaAppInfo4TUid @ 230 NONAME
-	_ZNK13RApaLsSession10GetAppTypeER4TUidS0_ @ 231 NONAME
-	_ZNK13RApaLsSession10GetNextAppER11TApaAppInfo @ 232 NONAME
-	_ZNK13RApaLsSession10GetNextAppER11TApaAppInfoi @ 233 NONAME
-	_ZNK13RApaLsSession11GetAppViewsER13CArrayFixFlatI15TApaAppViewInfoE4TUid @ 234 NONAME
-	_ZNK13RApaLsSession13GetServerAppsE4TUid @ 235 NONAME
-	_ZNK13RApaLsSession13GetServerAppsE4TUidi @ 236 NONAME
-	_ZNK13RApaLsSession13RecognizeDataERK5RFileR22TDataRecognitionResult @ 237 NONAME
-	_ZNK13RApaLsSession13RecognizeDataERK7TDesC16RK6TDesC8R22TDataRecognitionResult @ 238 NONAME
-	_ZNK13RApaLsSession14AppForDataTypeERK9TDataTypeR4TUid @ 239 NONAME
-	_ZNK13RApaLsSession14AppForDocumentERK5RFileR4TUidR9TDataType @ 240 NONAME
-	_ZNK13RApaLsSession14AppForDocumentERK7TDesC16R4TUidR9TDataType @ 241 NONAME
-	_ZNK13RApaLsSession14GetAppViewIconE4TUidS0_RK5TSizeR16CApaMaskedBitmap @ 242 NONAME
-	_ZNK13RApaLsSession14GetAppViewIconE4TUidS0_RP7HBufC16 @ 243 NONAME
-	_ZNK13RApaLsSession15GetAppIconSizesE4TUidR13CArrayFixFlatI5TSizeE @ 244 NONAME
-	_ZNK13RApaLsSession15GetAppServicesLE4TUidR13CArrayFixFlatIS0_E @ 245 NONAME
-	_ZNK13RApaLsSession15GetFilteredAppsERK23TApaEmbeddabilityFilter @ 246 NONAME
-	_ZNK13RApaLsSession15GetFilteredAppsERK23TApaEmbeddabilityFilteri @ 247 NONAME
-	_ZNK13RApaLsSession15GetFilteredAppsEjj @ 248 NONAME
-	_ZNK13RApaLsSession15GetFilteredAppsEjji @ 249 NONAME
-	_ZNK13RApaLsSession15RecognizeFilesLERK7TDesC16R27CDataRecognitionResultArray @ 250 NONAME
-	_ZNK13RApaLsSession15RecognizeFilesLERK7TDesC16RK6TDesC8R27CDataRecognitionResultArray @ 251 NONAME
-	_ZNK13RApaLsSession16GetAppByDataTypeERK9TDataType4TUidRS3_ @ 252 NONAME
-	_ZNK13RApaLsSession16GetAppCapabilityER5TDes84TUid @ 253 NONAME
-	_ZNK13RApaLsSession16GetAppOwnedFilesER12CDesC16Array4TUid @ 254 NONAME
-	_ZNK13RApaLsSession16GetAppServicesLCE4TUid @ 255 NONAME
-	_ZNK13RApaLsSession17GetEmbeddableAppsEi @ 256 NONAME
-	_ZNK13RApaLsSession17GetEmbeddableAppsEv @ 257 NONAME
-	_ZNK13RApaLsSession17GetMaxDataBufSizeERi @ 258 NONAME
-	_ZNK13RApaLsSession18EmbeddableAppCountERi @ 259 NONAME
-	_ZNK13RApaLsSession19ApplicationLanguageE4TUidR9TLanguage @ 260 NONAME
-	_ZNK13RApaLsSession19GetPreferredBufSizeERi @ 261 NONAME
-	_ZNK13RApaLsSession21GetAcceptedConfidenceERi @ 262 NONAME
-	_ZNK13RApaLsSession21MatchesSecurityPolicyERi4TUidRK15TSecurityPolicy @ 263 NONAME
-	_ZNK13RApaLsSession21RecognizeSpecificDataERK5RFileRK9TDataTypeRi @ 264 NONAME
-	_ZNK13RApaLsSession21RecognizeSpecificDataERK7TDesC16RK6TDesC8RK9TDataTypeRi @ 265 NONAME
-	_ZNK13RApaLsSession22GetDefaultScreenNumberERi4TUid @ 266 NONAME
-	_ZNK13RApaLsSession22GetSupportedDataTypesLER13CArrayFixFlatI9TDataTypeE @ 267 NONAME
-	_ZNK13RApaLsSession23NumberOfOwnDefinedIconsE4TUidRi @ 268 NONAME
-	_ZNK13RApaLsSession24AppForDataTypeAndServiceERK9TDataType4TUidRS3_ @ 269 NONAME
-	_ZNK13RApaLsSession24AppForDocumentAndServiceERK5RFile4TUidRS3_R9TDataType @ 270 NONAME
-	_ZNK13RApaLsSession24AppForDocumentAndServiceERK7TDesC164TUidRS3_R9TDataType @ 271 NONAME
-	_ZNK13RApaLsSession25GetAppServiceOpaqueDataLCE4TUidS0_ @ 272 NONAME
-	_ZNK13RApaLsSession27GetServiceImplementationsLCE4TUid @ 273 NONAME
-	_ZNK13RApaLsSession27GetServiceImplementationsLCE4TUidRK9TDataType @ 274 NONAME
-	_ZNK13RApaLsSession36CancelListPopulationCompleteObserverEv @ 275 NONAME
-	_ZNK13RApaLsSession38RegisterListPopulationCompleteObserverER14TRequestStatus @ 276 NONAME
-	_ZNK13RApaLsSession7VersionEv @ 277 NONAME
-	_ZNK13RApaLsSession8AppCountERi @ 278 NONAME
-	_ZNK13RApaLsSession9IsProgramERK7TDesC16Ri @ 279 NONAME
-	_ZNK15CApaAppViewData10IconSizesLEv @ 280 NONAME
-	_ZNK15CApaAppViewData10ScreenModeEv @ 281 NONAME
-	_ZNK15CApaAppViewData12IconFileNameEv @ 282 NONAME
-	_ZNK15CApaAppViewData14NonMbmIconFileEv @ 283 NONAME
-	_ZNK15CApaAppViewData3UidEv @ 284 NONAME
-	_ZNK15CApaAppViewData4IconERK5TSize @ 285 NONAME
-	_ZNK16CApaMaskedBitmap12ExternalizeLER12RWriteStream @ 286 NONAME
-	_ZNK16CApaMaskedBitmap4MaskEv @ 287 NONAME
-	_ZNK17CApaSystemControl12ShortCaptionEv @ 288 NONAME
-	_ZNK17CApaSystemControl4IconEv @ 289 NONAME
-	_ZNK17CApaSystemControl4TypeEv @ 290 NONAME
-	_ZNK17CApaSystemControl7CaptionEv @ 291 NONAME
-	_ZNK17CApaSystemControl8FileNameEv @ 292 NONAME
-	_ZNK18TApaAppServiceInfo10OpaqueDataEv @ 293 NONAME
-	_ZNK18TApaAppServiceInfo3UidEv @ 294 NONAME
-	_ZNK18TApaAppServiceInfo9DataTypesEv @ 295 NONAME
-	_ZNK18TApaPictureFactory11NewPictureLER14TPictureHeaderRK12CStreamStore @ 296 NONAME
-	_ZNK19CApaWindowGroupName10IsAppReadyEv @ 297 NONAME
-	_ZNK19CApaWindowGroupName14DocNameIsAFileEv @ 298 NONAME
-	_ZNK19CApaWindowGroupName15WindowGroupNameEv @ 299 NONAME
-	_ZNK19CApaWindowGroupName18SetWindowGroupNameER12RWindowGroup @ 300 NONAME
-	_ZNK19CApaWindowGroupName23RespondsToShutdownEventEv @ 301 NONAME
-	_ZNK19CApaWindowGroupName26RespondsToSwitchFilesEventEv @ 302 NONAME
-	_ZNK19CApaWindowGroupName6AppUidEv @ 303 NONAME
-	_ZNK19CApaWindowGroupName6HiddenEv @ 304 NONAME
-	_ZNK19CApaWindowGroupName6IsBusyEv @ 305 NONAME
-	_ZNK19CApaWindowGroupName7CaptionEv @ 306 NONAME
-	_ZNK19CApaWindowGroupName7DocNameEv @ 307 NONAME
-	_ZNK19CApaWindowGroupName8IsSystemEv @ 308 NONAME
-	_ZNK21CApaSystemControlList5CountEv @ 309 NONAME
-	_ZNK21CApaSystemControlList5IndexE4TUid @ 310 NONAME
-	_ZNK21CApaSystemControlList7ControlE4TUid @ 311 NONAME
-	_ZNK21CApaSystemControlList7ControlEi @ 312 NONAME
-	_ZNK27CDataRecognitionResultArray12GetFileNameLER4TBufILi256EEj @ 313 NONAME
-	_ZNK27CDataRecognitionResultArray25GetDataRecognitionResultLER22TDataRecognitionResultj @ 314 NONAME
-	_ZNK27CDataRecognitionResultArray4PathEv @ 315 NONAME
-	_ZNK27CDataRecognitionResultArray5CountEv @ 316 NONAME
-	_ZNK8CApaDoor7AppUidLEv @ 317 NONAME
-	_ZNK8TApaTask4WgIdEv @ 318 NONAME
-	_ZNK8TApaTask6ExistsEv @ 319 NONAME
-	_ZNK8TApaTask8ThreadIdEv @ 320 NONAME
-	_ZN17CApaSecurityUtils16CheckAppSecurityERK7TPtrC16RiS3_ @ 321 NONAME
-	_ZN11CApaAppList22AddForcedRegistrationLERK7TDesC16 @ 322 NONAME ABSENT
-	_ZN11CApaAppList23AddCustomAppInfoInListLE4TUid9TLanguageRK7TDesC16 @ 323 NONAME
-	_ZN11CApaAppList28UpdateAppListByShortCaptionLEv @ 324 NONAME
-	_ZN11CApaAppList4NewLER3RFsii @ 325 NONAME
-	_ZN11TApaAppInfo12InternalizeLER11RReadStream @ 326 NONAME
-	_ZN11TApaAppInfoC1E4TUidRK4TBufILi256EES4_ @ 327 NONAME
-	_ZN11TApaAppInfoC1E4TUidRK4TBufILi256EES4_S4_ @ 328 NONAME
-	_ZN11TApaAppInfoC1Ev @ 329 NONAME
-	_ZN11TApaAppInfoC2E4TUidRK4TBufILi256EES4_ @ 330 NONAME
-	_ZN11TApaAppInfoC2E4TUidRK4TBufILi256EES4_S4_ @ 331 NONAME
-	_ZN11TApaAppInfoC2Ev @ 332 NONAME
-	_ZN12TApaAppEntryC1Ev @ 333 NONAME
-	_ZN12TApaAppEntryC2Ev @ 334 NONAME
-	_ZN15TApaAppViewInfo12InternalizeLER11RReadStream @ 335 NONAME
-	_ZN15TApaAppViewInfoC1E4TUidRK4TBufILi256EEi @ 336 NONAME
-	_ZN15TApaAppViewInfoC1Ev @ 337 NONAME
-	_ZN15TApaAppViewInfoC2E4TUidRK4TBufILi256EEi @ 338 NONAME
-	_ZN15TApaAppViewInfoC2Ev @ 339 NONAME
-	_ZN17TApaAppCapability12InternalizeLER11RReadStream @ 340 NONAME
-	_ZN17TApaAppCapability14CopyCapabilityER5TDes8RK6TDesC8 @ 341 NONAME
-	_ZN17TApaAppIdentifier12InternalizeLER11RReadStream @ 342 NONAME
-	_ZN17TApaAppIdentifierC1E4TUidRK4TBufILi256EE @ 343 NONAME
-	_ZN17TApaAppIdentifierC1Ev @ 344 NONAME
-	_ZN17TApaAppIdentifierC2E4TUidRK4TBufILi256EE @ 345 NONAME
-	_ZN17TApaAppIdentifierC2Ev @ 346 NONAME
-	_ZN18TApaAppServiceInfo12InternalizeLER11RReadStream @ 347 NONAME
-	_ZN18TApaAppServiceInfo7ReleaseEv @ 348 NONAME
-	_ZN18TApaAppServiceInfo9DataTypesEv @ 349 NONAME
-	_ZN18TApaAppServiceInfoC1E4TUidP13CArrayFixFlatI21TDataTypeWithPriorityEP6HBufC8 @ 350 NONAME
-	_ZN18TApaAppServiceInfoC1Ev @ 351 NONAME
-	_ZN18TApaAppServiceInfoC2E4TUidP13CArrayFixFlatI21TDataTypeWithPriorityEP6HBufC8 @ 352 NONAME
-	_ZN18TApaAppServiceInfoC2Ev @ 353 NONAME
-	_ZN23CApaAppServiceInfoArray33CApaAppServiceInfoArray_Reserved1Ev @ 354 NONAME
-	_ZN23CApaAppServiceInfoArray33CApaAppServiceInfoArray_Reserved2Ev @ 355 NONAME
-	_ZN23CApaAppServiceInfoArrayC2Ev @ 356 NONAME
-	_ZN23TApaEmbeddabilityFilter16AddEmbeddabilityEN17TApaAppCapability14TEmbeddabilityE @ 357 NONAME
-	_ZN23TApaEmbeddabilityFilterC1Ev @ 358 NONAME
-	_ZN23TApaEmbeddabilityFilterC2Ev @ 359 NONAME
-	_ZNK11TApaAppInfo12ExternalizeLER12RWriteStream @ 360 NONAME
-	_ZNK15TApaAppViewInfo12ExternalizeLER12RWriteStream @ 361 NONAME
-	_ZNK17TApaAppCapability12ExternalizeLER12RWriteStream @ 362 NONAME
-	_ZNK17TApaAppIdentifier12ExternalizeLER12RWriteStream @ 363 NONAME
-	_ZNK18TApaAppServiceInfo12ExternalizeLER12RWriteStream @ 364 NONAME
-	_ZNK23TApaEmbeddabilityFilter20MatchesEmbeddabilityEN17TApaAppCapability14TEmbeddabilityE @ 365 NONAME
-	_ZTI11CApaAppData @ 366 NONAME
-	_ZTI11CApaAppList @ 367 NONAME
-	_ZTI12CApaAppEntry @ 368 NONAME
-	_ZTI13RApaLsSession @ 369 NONAME
-	_ZTI15CApaAppViewData @ 370 NONAME
-	_ZTI15CApaIconPicture @ 371 NONAME
-	_ZTI16CApaMaskedBitmap @ 372 NONAME
-	_ZTI17CApaAppInfoReader @ 373 NONAME
-	_ZTI17CApaSystemControl @ 374 NONAME
-	_ZTI18TApaPictureFactory @ 375 NONAME
-	_ZTI19CApaAppListNotifier @ 376 NONAME
-	_ZTI19CApaWindowGroupName @ 377 NONAME
-	_ZTI21CApaSystemControlList @ 378 NONAME
-	_ZTI23CApaAppServiceInfoArray @ 379 NONAME
-	_ZTI23MApaAppListServObserver @ 380 NONAME
-	_ZTI27CDataRecognitionResultArray @ 381 NONAME
-	_ZTI33CApaLocalisableResourceFileWriter @ 382 NONAME
-	_ZTI34CApaRegistrationResourceFileWriter @ 383 NONAME
-	_ZTI7HBufBuf @ 384 NONAME
-	_ZTI8CApaDoor @ 385 NONAME
-	_ZTIN26CApaResourceFileWriterBase11RBufferSinkE @ 386 NONAME
-	_ZTV11CApaAppData @ 387 NONAME
-	_ZTV11CApaAppList @ 388 NONAME
-	_ZTV12CApaAppEntry @ 389 NONAME
-	_ZTV13RApaLsSession @ 390 NONAME
-	_ZTV15CApaAppViewData @ 391 NONAME
-	_ZTV15CApaIconPicture @ 392 NONAME
-	_ZTV16CApaMaskedBitmap @ 393 NONAME
-	_ZTV17CApaAppInfoReader @ 394 NONAME
-	_ZTV17CApaSystemControl @ 395 NONAME
-	_ZTV18TApaPictureFactory @ 396 NONAME
-	_ZTV19CApaAppListNotifier @ 397 NONAME
-	_ZTV19CApaWindowGroupName @ 398 NONAME
-	_ZTV21CApaSystemControlList @ 399 NONAME
-	_ZTV23CApaAppServiceInfoArray @ 400 NONAME
-	_ZTV23MApaAppListServObserver @ 401 NONAME
-	_ZTV27CDataRecognitionResultArray @ 402 NONAME
-	_ZTV33CApaLocalisableResourceFileWriter @ 403 NONAME
-	_ZTV34CApaRegistrationResourceFileWriter @ 404 NONAME
-	_ZTV7HBufBuf @ 405 NONAME
-	_ZTV8CApaDoor @ 406 NONAME
-	_ZTVN26CApaResourceFileWriterBase11RBufferSinkE @ 407 NONAME
-	_ZN11CApaAppData11SetCaptionLERK7TDesC16 @ 408 NONAME
-	_ZN11CApaAppData9SetIconsLERK7TDesC16i @ 409 NONAME
-	_ZN11CApaAppList36UpdateAppListByIconCaptionOverridesLEv @ 410 NONAME
-	_ZN13RApaLsSession40ForceCommitNonNativeApplicationsUpdatesLEv @ 411 NONAME
-	_ZN31TIconLoaderAndIconArrayForLeaks25TestIconCaptionOverridesLEv @ 412 NONAME
-	_ZN11CApaAppList20AppListUpdatePendingEv @ 413 NONAME ABSENT
-	_ZNK13RApaLsSession13RecognizeDataERK6TDesC8R22TDataRecognitionResult @ 414 NONAME
-	_ZN11CApaAppList19UninstalledAppArrayEv @ 415 NONAME
-	_ZN11CApaAppData4NewLERKN4Usif28CApplicationRegistrationDataER3RFsRKNS0_26RSoftwareComponentRegistryE @ 416 NONAME
-	_ZN11CApaAppList18InitializeApplistLEP19MApaAppListObserver @ 417 NONAME
-	_ZN11CApaAppList22FindAndAddSpecificAppLE4TUid @ 418 NONAME
-	_ZN13RApaLsSession14UpdateAppListLER6RArrayI17TApaAppUpdateInfoE @ 419 NONAME
-		_ZN17TApaAppUpdateInfo12InternalizeLER11RReadStream @ 420 NONAME
-	_ZN17TApaAppUpdateInfoC1Ev @ 421 NONAME
-	_ZN17TApaAppUpdateInfoC2Ev @ 422 NONAME
-	_ZNK17TApaAppUpdateInfo12ExternalizeLER12RWriteStream @ 423 NONAME
-	_ZN17TApaAppUpdateInfoC1E4TUidNS_13TApaAppActionE @ 424 NONAME
-	_ZN17TApaAppUpdateInfoC2E4TUidNS_13TApaAppActionE @ 425 NONAME
-	_ZN11CApaAppData19IsLangChangePendingEv @ 426 NONAME
-	_ZN11CApaAppList14UpdateApplistLEP19MApaAppListObserverP6RArrayI17TApaAppUpdateInfoE4TUid @ 427 NONAME
-	_ZN11CApaAppList15UpdatedAppsInfoEv @ 428 NONAME
-	_ZN11CApaAppList28UpdateApplistByForceRegAppsLER13RPointerArrayIN4Usif28CApplicationRegistrationDataEE @ 429 NONAME
-	_ZN13RApaLsSession16UpdatedAppsInfoLER6RArrayI17TApaAppUpdateInfoE @ 430 NONAME
-	_ZN13RApaLsSession17ForceRegistrationERK13RPointerArrayIN4Usif28CApplicationRegistrationDataEE @ 431 NONAME
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/eabi/apfileu.def	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,115 @@
+EXPORTS
+	_ZN19CApaAppLocatorProxy16GetAppEntryByUidER12TApaAppEntry4TUid @ 1 NONAME ABSENT
+	_ZN19CApaAppLocatorProxy21GetAppCapabilityByUidER5TDes84TUid @ 2 NONAME ABSENT
+	_ZN19CApaAppLocatorProxy4NewLER3RFs @ 3 NONAME ABSENT
+	_ZN19CApaAppLocatorProxyD0Ev @ 4 NONAME ABSENT
+	_ZN19CApaAppLocatorProxyD1Ev @ 5 NONAME ABSENT
+	_ZN19CApaAppLocatorProxyD2Ev @ 6 NONAME ABSENT
+	_ZN21CApaScanningAppFinder12FindAllAppsLEv @ 7 NONAME ABSENT
+	_ZN21CApaScanningAppFinder4NewLERK3RFs @ 8 NONAME ABSENT
+	_ZN21CApaScanningAppFinder5NewLCERK3RFs @ 9 NONAME ABSENT
+	_ZN21CApaScanningAppFinder5NextLER12TApaAppEntry @ 10 NONAME ABSENT
+	_ZN21CApaScanningAppFinder8FindAppLERK7TDesC164TUid @ 11 NONAME ABSENT
+	_ZN21CApaScanningAppFinderD0Ev @ 12 NONAME ABSENT
+	_ZN21CApaScanningAppFinderD1Ev @ 13 NONAME ABSENT
+	_ZN21CApaScanningAppFinderD2Ev @ 14 NONAME ABSENT
+	_ZN25CApaScanningControlFinder12FindAllAppsLEv @ 15 NONAME ABSENT
+	_ZN25CApaScanningControlFinder4NewLERK3RFs @ 16 NONAME ABSENT
+	_ZN25CApaScanningControlFinder5NewLCERK3RFs @ 17 NONAME ABSENT
+	_ZN25CApaScanningControlFinder5NextLER12TApaAppEntry @ 18 NONAME ABSENT
+	_ZN25CApaScanningControlFinder8FindAppLERK7TDesC164TUid @ 19 NONAME ABSENT
+	_ZN25CApaScanningControlFinderD0Ev @ 20 NONAME ABSENT
+	_ZN25CApaScanningControlFinderD1Ev @ 21 NONAME ABSENT
+	_ZN25CApaScanningControlFinderD2Ev @ 22 NONAME ABSENT
+	_ZN26CApaScanningFileRecognizer10ConstructLEv @ 23 NONAME ABSENT
+	_ZN26CApaScanningFileRecognizer14SetRecognizerLERKNS_11TRecognizerE @ 24 NONAME ABSENT
+	_ZN26CApaScanningFileRecognizer15RecognizerCountEv @ 25 NONAME ABSENT
+	_ZN26CApaScanningFileRecognizer19ScanForRecognizersLEv @ 26 NONAME ABSENT
+	_ZN26CApaScanningFileRecognizer23SetRecognizersFromListLERK13CArrayFixFlatINS_11TRecognizerEE @ 27 NONAME ABSENT
+	_ZN26CApaScanningFileRecognizer4NewLER3RFsP14MApaAppStarter @ 28 NONAME ABSENT
+	_ZN26CApaScanningFileRecognizerC1ER3RFsP14MApaAppStarter @ 29 NONAME ABSENT
+	_ZN26CApaScanningFileRecognizerC2ER3RFsP14MApaAppStarter @ 30 NONAME ABSENT
+	_ZN26CApaScanningFileRecognizerD0Ev @ 31 NONAME ABSENT
+	_ZN26CApaScanningFileRecognizerD1Ev @ 32 NONAME ABSENT
+	_ZN26CApaScanningFileRecognizerD2Ev @ 33 NONAME ABSENT
+	_ZN6Apfile8TempPathEv @ 34 NONAME ABSENT
+	_ZNK21CApaScanningAppFinder22DefaultAppInfoFileNameEv @ 35 NONAME ABSENT
+	_ZNK21CApaScanningAppFinder8TempPathEv @ 36 NONAME ABSENT
+	_ZNK25CApaScanningControlFinder22DefaultAppInfoFileNameEv @ 37 NONAME ABSENT
+	_ZNK25CApaScanningControlFinder8TempPathEv @ 38 NONAME ABSENT
+	_ZNK26CApaScanningFileRecognizer13UpdateCounterEv @ 39 NONAME ABSENT
+	_ZNK26CApaScanningFileRecognizer16RecognizerListLCEv @ 40 NONAME ABSENT
+	_ZNK26CApaScanningFileRecognizerixEi @ 41 NONAME ABSENT
+	_ZTI26CApaScanningFileRecognizer @ 42 NONAME ABSENT ; #<TI>#
+	_ZTV26CApaScanningFileRecognizer @ 43 NONAME ABSENT ; #<VT>#
+	_ZN26CApaScanningFileRecognizer18SetEcomRecognizerLERKNS_11TRecognizerE @ 44 NONAME ABSENT
+	_ZN26CApaScanningFileRecognizer27SetEcomRecognizersFromListLERK13CArrayFixFlatINS_11TRecognizerEE @ 45 NONAME ABSENT
+	_ZTI17CApaRecognizerDll @ 46 NONAME ABSENT ; #<TI>#
+	_ZTI19CApaAppLocatorProxy @ 47 NONAME ABSENT ; #<TI>#
+	_ZTI21CApaScanningAppFinder @ 48 NONAME ABSENT ; #<TI>#
+	_ZTI25CApaScanningControlFinder @ 49 NONAME ABSENT ; #<TI>#
+	_ZTIN26CApaScanningFileRecognizer27CApaBackupOperationObserverE @ 50 NONAME ABSENT ; #<TI>#
+	_ZTV17CApaRecognizerDll @ 51 NONAME ABSENT ; #<VT>#
+	_ZTV19CApaAppLocatorProxy @ 52 NONAME ABSENT ; #<VT>#
+	_ZTV21CApaScanningAppFinder @ 53 NONAME ABSENT ; #<VT>#
+	_ZTV25CApaScanningControlFinder @ 54 NONAME ABSENT ; #<VT>#
+	_ZTVN26CApaScanningFileRecognizer27CApaBackupOperationObserverE @ 55 NONAME ABSENT ; #<VT>#
+	_ZN16CApaAppRegFinder12FindAllAppsLEv @ 56 NONAME ABSENT
+	_ZN16CApaAppRegFinder4NewLERK3RFs @ 57 NONAME ABSENT
+	_ZN16CApaAppRegFinder5NewLCERK3RFs @ 58 NONAME ABSENT
+	_ZN16CApaAppRegFinder5NextLER12TApaAppEntry @ 59 NONAME ABSENT
+	_ZN16CApaAppRegFinder5NextLER12TApaAppEntryRK13RPointerArrayI7HBufC16E @ 60 NONAME ABSENT
+	_ZNK16CApaAppRegFinder8TempPathEv @ 61 NONAME ABSENT
+	_ZTI16CApaAppRegFinder @ 62 NONAME ABSENT ; #<TI>#
+	_ZTV16CApaAppRegFinder @ 63 NONAME ABSENT ; #<VT>#
+	_ZN17CAppLaunchChecker10Reserved_1Ev @ 64 NONAME
+	_ZN17CAppLaunchChecker10Reserved_2Ev @ 65 NONAME
+	_ZN17CAppLaunchChecker10Reserved_3Ev @ 66 NONAME
+	_ZN17CAppLaunchCheckerD0Ev @ 67 NONAME
+	_ZN17CAppLaunchCheckerD1Ev @ 68 NONAME
+	_ZN17CAppLaunchCheckerD2Ev @ 69 NONAME
+	_ZN28CApaScanningRuleBasedPlugIns4NewLEv @ 70 NONAME
+	_ZNK28CApaScanningRuleBasedPlugInsixEi @ 71 NONAME
+	_ZTI16CApaRuleBasedDll @ 72 NONAME ; #<TI>#
+	_ZTI17CAppLaunchChecker @ 73 NONAME ; #<TI>#
+	_ZTV16CApaRuleBasedDll @ 74 NONAME ; #<VT>#
+	_ZTV17CAppLaunchChecker @ 75 NONAME ; #<VT>#
+	_ZN28CApaScanningRuleBasedPlugInsD0Ev @ 76 NONAME
+	_ZN28CApaScanningRuleBasedPlugInsD1Ev @ 77 NONAME
+	_ZN28CApaScanningRuleBasedPlugInsD2Ev @ 78 NONAME
+	_ZTI28CApaScanningRuleBasedPlugIns @ 79 NONAME ; #<TI>#
+	_ZTV28CApaScanningRuleBasedPlugIns @ 80 NONAME ; #<VT>#
+	_ZN28CApaScanningRuleBasedPlugIns24ScanForRuleBasedPlugInsLEv @ 81 NONAME
+	_ZNK28CApaScanningRuleBasedPlugIns19ImplementationCountEv @ 82 NONAME
+	_ZN14CAppSidChecker18SetRescanCallBackLERK9TCallBack @ 83 NONAME ABSENT
+	_ZN14CAppSidChecker9reserved1Ev @ 84 NONAME ABSENT
+	_ZN14CAppSidChecker9reserved2Ev @ 85 NONAME ABSENT
+	_ZN14CAppSidChecker9reserved3Ev @ 86 NONAME ABSENT
+	_ZN14CAppSidCheckerD0Ev @ 87 NONAME ABSENT
+	_ZN14CAppSidCheckerD1Ev @ 88 NONAME ABSENT
+	_ZN14CAppSidCheckerD2Ev @ 89 NONAME ABSENT
+	_ZTI14CAppSidChecker @ 90 NONAME ABSENT ; #<TI>#
+	_ZTV14CAppSidChecker @ 91 NONAME ABSENT ; #<VT>#
+	_ZNK16CApaAppRegFinder9DriveListEv @ 92 NONAME ABSENT
+	_ZN16CApaAppRegFinder26FindAllRemovableMediaAppsLEv @ 93 NONAME ABSENT
+	_ZN26CApaAppInstallationMonitor4NewLEP16CApaAppArcServer @ 94 NONAME ABSENT
+	_ZN26CApaAppInstallationMonitor5StartEv @ 95 NONAME ABSENT
+	_ZN26CApaAppInstallationMonitorD0Ev @ 96 NONAME ABSENT
+	_ZN26CApaAppInstallationMonitorD1Ev @ 97 NONAME ABSENT
+	_ZN26CApaAppInstallationMonitorD2Ev @ 98 NONAME ABSENT
+	_ZN21CApfMimeContentPolicy12IsClosedTypeERK7TDesC16 @ 99 NONAME
+	_ZN21CApfMimeContentPolicy13IsClosedFileLER5RFile @ 100 NONAME
+	_ZN21CApfMimeContentPolicy13IsClosedFileLERK7TDesC16 @ 101 NONAME
+	_ZN21CApfMimeContentPolicy14IsDRMEnvelopeLER5RFile @ 102 NONAME
+	_ZN21CApfMimeContentPolicy14IsDRMEnvelopeLERK7TDesC16 @ 103 NONAME
+	_ZN21CApfMimeContentPolicy17IsClosedExtensionERK7TDesC16 @ 104 NONAME
+	_ZN21CApfMimeContentPolicy4NewLER3RFs @ 105 NONAME
+	_ZN21CApfMimeContentPolicy4NewLEv @ 106 NONAME
+	_ZN21CApfMimeContentPolicy5NewLCER3RFs @ 107 NONAME
+	_ZN21CApfMimeContentPolicy5NewLCEv @ 108 NONAME
+	_ZN21CApfMimeContentPolicyD0Ev @ 109 NONAME
+	_ZN21CApfMimeContentPolicyD1Ev @ 110 NONAME
+	_ZN21CApfMimeContentPolicyD2Ev @ 111 NONAME
+	_ZTI21CApfMimeContentPolicy @ 112 NONAME
+	_ZTV21CApfMimeContentPolicy @ 113 NONAME
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/eabi/apgrfxu.def	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,445 @@
+EXPORTS
+	_ZNK11CApaAppData11GetIconInfoERiS0_ @ 1 NONAME ABSENT
+	_ZN11CApaAppData16CanUseScreenModeEi @ 2 NONAME ABSENT
+	_ZN11CApaAppList16StartIdleUpdateLEP19MApaAppListObserver @ 3 NONAME ABSENT
+	_ZN11CApaAppList16StartIdleUpdateLEv @ 4 NONAME ABSENT
+	_ZN11CApaAppList4NewLER3RFsP16CApaAppRegFinderii @ 5 NONAME ABSENT
+	_ZN11CApaAppList6PurgeLEv @ 6 NONAME ABSENT
+	_ZN11CApaAppList7UpdateLEv @ 7 NONAME ABSENT
+	_ZN11CApaAppList9InitListLEP19MApaAppListObserver @ 8 NONAME ABSENT
+	_ZN11CApaAppListD0Ev @ 9 NONAME ABSENT
+	_ZN11CApaAppListD1Ev @ 10 NONAME ABSENT
+	_ZN11CApaAppListD2Ev @ 11 NONAME ABSENT
+	_ZN12TApaTaskList10CycleTasksE4TUidNS_15TCycleDirectionE @ 12 NONAME
+	_ZN12TApaTaskList7FindAppE4TUid @ 13 NONAME
+	_ZN12TApaTaskList7FindAppERK7TDesC16 @ 14 NONAME
+	_ZN12TApaTaskList7FindDocERK7TDesC16 @ 15 NONAME
+	_ZN12TApaTaskList9FindByPosEi @ 16 NONAME
+	_ZN12TApaTaskListC1ER10RWsSession @ 17 NONAME
+	_ZN12TApaTaskListC2ER10RWsSession @ 18 NONAME
+	_ZN13RApaLsSession13StartDocumentERK7TDesC164TUidR9TThreadIdNS_11TLaunchTypeE @ 19 NONAME
+	_ZN13RApaLsSession13StartDocumentERK7TDesC16R9TThreadIdNS_11TLaunchTypeE @ 20 NONAME
+	_ZN13RApaLsSession13StartDocumentERK7TDesC16RK9TDataTypeR9TThreadIdNS_11TLaunchTypeE @ 21 NONAME
+	_ZN13RApaLsSession14CreateDocumentERK7TDesC164TUidR9TThreadIdNS_11TLaunchTypeE @ 22 NONAME
+	_ZN13RApaLsSession17SetMaxDataBufSizeEi @ 23 NONAME
+	_ZN13RApaLsSession21SetAcceptedConfidenceEi @ 24 NONAME
+	_ZN13RApaLsSession7ConnectEv @ 25 NONAME
+	_ZN13RApaLsSession8StartAppERK15CApaCommandLine @ 26 NONAME
+	_ZN13RApaLsSession8StartAppERK15CApaCommandLineR9TThreadId @ 27 NONAME
+	_ZN13RApaLsSessionC1Ev @ 28 NONAME
+	_ZN13RApaLsSessionC2Ev @ 29 NONAME
+	_ZN16AppInfoFileUtils14GetAifFileNameERK3RFsR6TDes16 @ 30 NONAME ABSENT
+	_ZN16CApaMaskedBitmap12InternalizeLER11RReadStream @ 31 NONAME
+	_ZN16CApaMaskedBitmap13SetMaskBitmapEP10CFbsBitmap @ 32 NONAME
+	_ZN16CApaMaskedBitmap4NewLEPKS_ @ 33 NONAME
+	_ZN16CApaMaskedBitmap5NewLCEv @ 34 NONAME
+	_ZN16CApaMaskedBitmapD0Ev @ 35 NONAME
+	_ZN16CApaMaskedBitmapD1Ev @ 36 NONAME
+	_ZN16CApaMaskedBitmapD2Ev @ 37 NONAME
+	_ZN17CApaSystemControl7CreateLEv @ 38 NONAME
+	_ZN18TApaPictureFactoryC1EP11CApaProcess @ 39 NONAME
+	_ZN18TApaPictureFactoryC2EP11CApaProcess @ 40 NONAME
+	_ZN19CApaAppListNotifier4NewLEP23MApaAppListServObserverN7CActive9TPriorityE @ 41 NONAME
+	_ZN19CApaAppListNotifierD0Ev @ 42 NONAME
+	_ZN19CApaAppListNotifierD1Ev @ 43 NONAME
+	_ZN19CApaAppListNotifierD2Ev @ 44 NONAME
+	_ZN19CApaWindowGroupName11SetAppReadyEi @ 45 NONAME
+	_ZN19CApaWindowGroupName11SetCaptionLERK7TDesC16 @ 46 NONAME
+	_ZN19CApaWindowGroupName11SetDocNameLERK7TDesC16 @ 47 NONAME
+	_ZN19CApaWindowGroupName12FindByAppUidE4TUidR10RWsSessionRi @ 48 NONAME
+	_ZN19CApaWindowGroupName13FindByCaptionERK7TDesC16R10RWsSessionRi @ 49 NONAME
+	_ZN19CApaWindowGroupName13FindByDocNameERK7TDesC16R10RWsSessionRi @ 50 NONAME
+	_ZN19CApaWindowGroupName17SetDocNameIsAFileEi @ 51 NONAME
+	_ZN19CApaWindowGroupName18ConstructFromWgIdLEi @ 52 NONAME
+	_ZN19CApaWindowGroupName18SetWindowGroupNameEP7HBufC16 @ 53 NONAME
+	_ZN19CApaWindowGroupName19SetWindowGroupNameLERK7TDesC16 @ 54 NONAME
+	_ZN19CApaWindowGroupName26SetRespondsToShutdownEventEi @ 55 NONAME
+	_ZN19CApaWindowGroupName29SetRespondsToSwitchFilesEventEi @ 56 NONAME
+	_ZN19CApaWindowGroupName3NewERK10RWsSessionP7HBufC16 @ 57 NONAME
+	_ZN19CApaWindowGroupName4NewLERK10RWsSession @ 58 NONAME
+	_ZN19CApaWindowGroupName4NewLERK10RWsSessionRK7TDesC16 @ 59 NONAME
+	_ZN19CApaWindowGroupName4NewLERK10RWsSessioni @ 60 NONAME
+	_ZN19CApaWindowGroupName5NewLCERK10RWsSession @ 61 NONAME
+	_ZN19CApaWindowGroupName5NewLCERK10RWsSessionRK7TDesC16 @ 62 NONAME
+	_ZN19CApaWindowGroupName5NewLCERK10RWsSessioni @ 63 NONAME
+	_ZNK19CApaWindowGroupName6HiddenEv @ 64 NONAME
+	_ZN19CApaWindowGroupName7SetBusyEi @ 65 NONAME
+	_ZN19CApaWindowGroupName9SetAppUidE4TUid @ 66 NONAME
+	_ZN19CApaWindowGroupName9SetHiddenEi @ 67 NONAME
+	_ZN19CApaWindowGroupName9SetSystemEi @ 68 NONAME
+	_ZN19CApaWindowGroupNameD0Ev @ 69 NONAME
+	_ZN19CApaWindowGroupNameD1Ev @ 70 NONAME
+	_ZN19CApaWindowGroupNameD2Ev @ 71 NONAME
+	_ZN21CApaAppInfoFileReader12StretchDrawLEP10CFbsBitmapS1_5TSize @ 72 NONAME ABSENT
+	_ZN21CApaAppInfoFileReader19CreateMaskedBitmapLEi @ 73 NONAME ABSENT
+	_ZN21CApaAppInfoFileReader4NewLER3RFsRK7TDesC164TUid @ 74 NONAME ABSENT
+	_ZN21CApaAppInfoFileReader5NewLCER3RFsRK7TDesC164TUid @ 75 NONAME ABSENT
+	_ZN21CApaAppInfoFileReader8CaptionLE9TLanguage @ 76 NONAME ABSENT
+	_ZN21CApaAppInfoFileReaderD0Ev @ 77 NONAME ABSENT
+	_ZN21CApaAppInfoFileReaderD1Ev @ 78 NONAME ABSENT
+	_ZN21CApaAppInfoFileReaderD2Ev @ 79 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter10StoreViewLE4TUid @ 80 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter11AddCaptionLE9TLanguageRK7TDesC16 @ 81 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter12AddDataTypeLERK21TDataTypeWithPriority @ 82 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter12AddViewIconLER16CApaMaskedBitmap4TUid @ 83 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter13AddOwnedFileLERK7TDesC16 @ 84 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter13SetCapabilityERK6TDesC8 @ 85 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter15AddViewCaptionLE9TLanguageRK7TDesC164TUid @ 86 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter5NewLCER3RFsRK7TDesC164TUid @ 87 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter6StoreLEv @ 88 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter8AddIconLER16CApaMaskedBitmap @ 89 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter8AddIconLERK7TDesC16 @ 90 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter8AddViewLE4TUid @ 91 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter8AddViewLE4TUidi @ 92 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriterD0Ev @ 93 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriterD1Ev @ 94 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriterD2Ev @ 95 NONAME ABSENT
+	_ZN21CApaSystemControlList4NewLER3RFsR13CApaAppFinderRK7TDesC16 @ 96 NONAME ABSENT
+	_ZN21CApaSystemControlList7UpdateLEv @ 97 NONAME
+	_ZN21CApaSystemControlListD0Ev @ 98 NONAME
+	_ZN21CApaSystemControlListD1Ev @ 99 NONAME
+	_ZN21CApaSystemControlListD2Ev @ 100 NONAME
+	_ZN8CApaDoor16SetFormatToIconLEv @ 101 NONAME
+	_ZN8CApaDoor17SetFormatToGlassLEv @ 102 NONAME
+	_ZN8CApaDoor25SetFormatToTemporaryIconLEi @ 103 NONAME
+	_ZN8CApaDoor4NewLER3RFsR12CApaDocumentRK5TSize @ 104 NONAME
+	_ZN8CApaDoor4NewLER3RFsRK12CStreamStore9TStreamIdR11CApaProcess @ 105 NONAME
+	_ZN8CApaDoor5NewLCER3RFsR12CApaDocumentRK5TSize @ 106 NONAME
+	_ZN8CApaDoor8RestoreLERK12CStreamStore9TStreamId @ 107 NONAME
+	_ZN8CApaDoor9DocumentLEi @ 108 NONAME
+	_ZN8CApaDoorD0Ev @ 109 NONAME
+	_ZN8CApaDoorD1Ev @ 110 NONAME
+	_ZN8CApaDoorD2Ev @ 111 NONAME
+	_ZN8TApaTask11SendMessageE4TUidRK6TDesC8 @ 112 NONAME
+	_ZN8TApaTask14SwitchOpenFileERK7TDesC16 @ 113 NONAME
+	_ZN8TApaTask15SendSystemEventE15TApaSystemEvent @ 114 NONAME
+	_ZN8TApaTask16SendToBackgroundEv @ 115 NONAME
+	_ZN8TApaTask16SwitchCreateFileERK7TDesC16 @ 116 NONAME
+	_ZN8TApaTask17BringToForegroundEv @ 117 NONAME
+	_ZN8TApaTask7EndTaskEv @ 118 NONAME
+	_ZN8TApaTask7SendKeyERK9TKeyEvent @ 119 NONAME
+	_ZN8TApaTask7SendKeyEii @ 120 NONAME
+	_ZN8TApaTask7SetWgIdEi @ 121 NONAME
+	_ZN8TApaTask8KillTaskEv @ 122 NONAME
+	_ZN8TApaTaskC1ER10RWsSession @ 123 NONAME
+	_ZN8TApaTaskC2ER10RWsSession @ 124 NONAME
+	_ZNK11CApaAppData10CapabilityER5TDes8 @ 125 NONAME ABSENT
+	_ZNK11CApaAppData10IconSizesLEv @ 126 NONAME ABSENT
+	_ZNK11CApaAppData10OwnedFilesEv @ 127 NONAME ABSENT
+	_ZNK11CApaAppData4IconE5TSize @ 128 NONAME ABSENT
+	_ZNK11CApaAppData4IconEi @ 129 NONAME ABSENT
+	_ZNK11CApaAppData5ViewsEv @ 130 NONAME ABSENT
+	_ZNK11CApaAppData8AppEntryEv @ 131 NONAME ABSENT
+	_ZNK11CApaAppData8DataTypeERK9TDataType @ 132 NONAME ABSENT
+	_ZNK11CApaAppList12AppDataByUidE4TUid @ 133 NONAME ABSENT
+	_ZNK11CApaAppList13UpdateCounterEv @ 134 NONAME ABSENT
+	_ZNK11CApaAppList19IsFirstScanCompleteEv @ 135 NONAME ABSENT
+	_ZNK11CApaAppList20IsIdleUpdateCompleteEv @ 136 NONAME ABSENT
+	_ZNK11CApaAppList21PreferredDataHandlerLERK9TDataType @ 137 NONAME ABSENT
+	_ZNK11CApaAppList5CountEv @ 138 NONAME ABSENT
+	_ZNK11CApaAppList7NextAppEPK11CApaAppData @ 139 NONAME ABSENT
+	_ZNK11CApaAppList7NextAppEPK11CApaAppDatai @ 140 NONAME ABSENT
+	_ZNK11CApaAppList8FirstAppEi @ 141 NONAME ABSENT
+	_ZNK11CApaAppList8FirstAppEv @ 142 NONAME ABSENT
+	_ZNK13RApaLsSession10GetAllAppsEi @ 143 NONAME
+	_ZNK13RApaLsSession10GetAllAppsEv @ 144 NONAME
+	_ZNK13RApaLsSession10GetAppIconE4TUid5TSizeR16CApaMaskedBitmap @ 145 NONAME
+	_ZNK13RApaLsSession10GetAppIconE4TUidiR16CApaMaskedBitmap @ 146 NONAME
+	_ZNK13RApaLsSession10GetAppInfoER11TApaAppInfo4TUid @ 147 NONAME
+	_ZNK13RApaLsSession10GetNextAppER11TApaAppInfo @ 148 NONAME
+	_ZNK13RApaLsSession10GetNextAppER11TApaAppInfoi @ 149 NONAME
+	_ZNK13RApaLsSession11GetAppViewsER13CArrayFixFlatI15TApaAppViewInfoE4TUid @ 150 NONAME
+	_ZNK13RApaLsSession13RecognizeDataERK7TDesC16RK6TDesC8R22TDataRecognitionResult @ 151 NONAME
+	_ZNK13RApaLsSession14AppForDataTypeERK9TDataTypeR4TUid @ 152 NONAME
+	_ZNK13RApaLsSession14AppForDocumentERK7TDesC16R4TUidR9TDataType @ 153 NONAME
+	_ZNK13RApaLsSession14GetAppInfo_7_0ER15TApaAppInfo_7_04TUid @ 154 NONAME ABSENT
+	_ZNK13RApaLsSession14GetAppViewIconE4TUidS0_RK5TSizeR16CApaMaskedBitmap @ 155 NONAME
+	_ZNK13RApaLsSession14GetNextApp_7_0ER15TApaAppInfo_7_0 @ 156 NONAME ABSENT
+	_ZNK13RApaLsSession14GetNextApp_7_0ER15TApaAppInfo_7_0i @ 157 NONAME ABSENT
+	_ZNK13RApaLsSession15GetAppIconSizesE4TUidR13CArrayFixFlatI5TSizeE @ 158 NONAME
+	_ZNK13RApaLsSession15GetFilteredAppsERK23TApaEmbeddabilityFilter @ 159 NONAME
+	_ZNK13RApaLsSession15GetFilteredAppsERK23TApaEmbeddabilityFilteri @ 160 NONAME
+	_ZNK13RApaLsSession16GetAppCapabilityER5TDes84TUid @ 161 NONAME
+	_ZNK13RApaLsSession16GetAppOwnedFilesER12CDesC16Array4TUid @ 162 NONAME
+	_ZNK13RApaLsSession17GetEmbeddableAppsEi @ 163 NONAME
+	_ZNK13RApaLsSession17GetEmbeddableAppsEv @ 164 NONAME
+	_ZNK13RApaLsSession17GetMaxDataBufSizeERi @ 165 NONAME
+	_ZNK13RApaLsSession18EmbeddableAppCountERi @ 166 NONAME
+	_ZNK13RApaLsSession21GetAcceptedConfidenceERi @ 167 NONAME
+	_ZNK13RApaLsSession21RecognizeSpecificDataERK7TDesC16RK6TDesC8RK9TDataTypeRi @ 168 NONAME
+	_ZNK13RApaLsSession22GetSupportedDataTypesLER13CArrayFixFlatI9TDataTypeE @ 169 NONAME
+	_ZNK13RApaLsSession23NumberOfOwnDefinedIconsE4TUidRi @ 170 NONAME
+	_ZNK13RApaLsSession7VersionEv @ 171 NONAME
+	_ZNK13RApaLsSession8AppCountERi @ 172 NONAME
+	_ZNK13RApaLsSession9IsProgramERK7TDesC16Ri @ 173 NONAME
+	_ZNK15CApaAIFViewData10ScreenModeEv @ 174 NONAME ABSENT
+	_ZNK15CApaAIFViewData12IconByIndexLEi @ 175 NONAME ABSENT
+	_ZNK15CApaAIFViewData13NumberOfIconsEv @ 176 NONAME ABSENT
+	_ZNK15CApaAIFViewData7ViewUidEv @ 177 NONAME ABSENT
+	_ZNK15CApaAIFViewData8CaptionLE9TLanguage @ 178 NONAME ABSENT
+	_ZNK15CApaAppViewData10IconSizesLEv @ 179 NONAME ABSENT
+	_ZNK15CApaAppViewData10ScreenModeEv @ 180 NONAME ABSENT
+	_ZNK15CApaAppViewData3UidEv @ 181 NONAME ABSENT
+	_ZNK15CApaAppViewData4IconERK5TSize @ 182 NONAME ABSENT
+	_ZNK16CApaMaskedBitmap12ExternalizeLER12RWriteStream @ 183 NONAME
+	_ZNK16CApaMaskedBitmap4MaskEv @ 184 NONAME
+	_ZNK17CApaSystemControl12ShortCaptionEv @ 185 NONAME
+	_ZNK17CApaSystemControl4IconEv @ 186 NONAME
+	_ZNK17CApaSystemControl4TypeEv @ 187 NONAME
+	_ZNK17CApaSystemControl7CaptionEv @ 188 NONAME
+	_ZNK17CApaSystemControl8FileNameEv @ 189 NONAME
+	_ZNK18TApaPictureFactory11NewPictureLER14TPictureHeaderRK12CStreamStore @ 190 NONAME
+	_ZNK19CApaWindowGroupName10IsAppReadyEv @ 191 NONAME
+	_ZNK19CApaWindowGroupName14DocNameIsAFileEv @ 192 NONAME
+	_ZNK19CApaWindowGroupName15WindowGroupNameEv @ 193 NONAME
+	_ZNK19CApaWindowGroupName18SetWindowGroupNameER12RWindowGroup @ 194 NONAME
+	_ZNK19CApaWindowGroupName23RespondsToShutdownEventEv @ 195 NONAME
+	_ZNK19CApaWindowGroupName26RespondsToSwitchFilesEventEv @ 196 NONAME
+	_ZNK19CApaWindowGroupName6AppUidEv @ 197 NONAME
+	_ZNK19CApaWindowGroupName6IsBusyEv @ 198 NONAME
+	_ZNK19CApaWindowGroupName7CaptionEv @ 199 NONAME
+	_ZNK19CApaWindowGroupName7DocNameEv @ 200 NONAME
+	_ZNK19CApaWindowGroupName8IsSystemEv @ 201 NONAME
+	_ZNK21CApaAppInfoFileReader10CapabilityER5TDes8 @ 202 NONAME ABSENT
+	_ZNK21CApaAppInfoFileReader14GetOwnedFilesLER12CDesC16Array @ 203 NONAME ABSENT
+	_ZNK21CApaAppInfoFileReader15NumberOfBitmapsEv @ 204 NONAME ABSENT
+	_ZNK21CApaAppInfoFileReader19DataTypesSupportedLER9CArrayFixI21TDataTypeWithPriorityE @ 205 NONAME ABSENT
+	_ZNK21CApaAppInfoFileReader9GetViewsLER9CArrayPtrI15CApaAIFViewDataE @ 206 NONAME ABSENT
+	_ZNK21CApaSystemControlList5CountEv @ 207 NONAME
+	_ZNK21CApaSystemControlList5IndexE4TUid @ 208 NONAME
+	_ZNK21CApaSystemControlList7ControlE4TUid @ 209 NONAME
+	_ZNK21CApaSystemControlList7ControlEi @ 210 NONAME
+	_ZNK8CApaDoor7AppUidLEv @ 211 NONAME
+	_ZNK8TApaTask4WgIdEv @ 212 NONAME
+	_ZNK8TApaTask6ExistsEv @ 213 NONAME
+	_ZNK8TApaTask8ThreadIdEv @ 214 NONAME
+	_ZTI18TApaPictureFactory @ 215 NONAME ; #<TI>#
+	_ZTV18TApaPictureFactory @ 216 NONAME ; #<VT>#
+	_ZTI11CApaAppData @ 217 NONAME ABSENT ; #<TI>#
+	_ZTI11CApaAppList @ 218 NONAME ABSENT ; #<TI>#
+	_ZTI12CApaAppEntry @ 219 NONAME ABSENT ; #<TI>#
+	_ZTI14CApaAIFCaption @ 220 NONAME ABSENT ; #<TI>#
+	_ZTI15CApaAIFViewData @ 221 NONAME ABSENT ; #<TI>#
+	_ZTI15CApaAppInfoFile @ 222 NONAME ABSENT ; #<TI>#
+	_ZTI15CApaAppViewData @ 223 NONAME ABSENT ; #<TI>#
+	_ZTI15CApaIconPicture @ 224 NONAME ; #<TI>#
+	_ZTI16CApaMaskedBitmap @ 225 NONAME ; #<TI>#
+	_ZTI16TDesCArrayFiller @ 226 NONAME ABSENT ; #<TI>#
+	_ZTI16TSizeArrayFiller @ 227 NONAME ABSENT ; #<TI>#
+	_ZTI17CApaSystemControl @ 228 NONAME ; #<TI>#
+	_ZTI19CApaAppListNotifier @ 229 NONAME ; #<TI>#
+	_ZTI19CApaWindowGroupName @ 230 NONAME ; #<TI>#
+	_ZTI20TViewDataArrayFiller @ 231 NONAME ABSENT ; #<TI>#
+	_ZTI21CApaAppInfoFileReader @ 232 NONAME ABSENT ; #<TI>#
+	_ZTI21CApaAppInfoFileWriter @ 233 NONAME ABSENT ; #<TI>#
+	_ZTI21CApaSystemControlList @ 234 NONAME ; #<TI>#
+	_ZTI7HBufBuf @ 235 NONAME ; #<TI>#
+	_ZTI8CApaDoor @ 236 NONAME ; #<TI>#
+	_ZTV11CApaAppData @ 237 NONAME ABSENT ; #<VT>#
+	_ZTV11CApaAppList @ 238 NONAME ABSENT ; #<VT>#
+	_ZTV12CApaAppEntry @ 239 NONAME ABSENT ; #<VT>#
+	_ZTV14CApaAIFCaption @ 240 NONAME ABSENT ; #<VT>#
+	_ZTV15CApaAIFViewData @ 241 NONAME ABSENT ; #<VT>#
+	_ZTV15CApaAppInfoFile @ 242 NONAME ABSENT ; #<VT>#
+	_ZTV15CApaAppViewData @ 243 NONAME ABSENT ; #<VT>#
+	_ZTV15CApaIconPicture @ 244 NONAME ; #<VT>#
+	_ZTV16CApaMaskedBitmap @ 245 NONAME ; #<VT>#
+	_ZTV16TDesCArrayFiller @ 246 NONAME ABSENT ; #<VT>#
+	_ZTV16TSizeArrayFiller @ 247 NONAME ABSENT ; #<VT>#
+	_ZTV17CApaSystemControl @ 248 NONAME ; #<VT>#
+	_ZTV19CApaAppListNotifier @ 249 NONAME ; #<VT>#
+	_ZTV19CApaWindowGroupName @ 250 NONAME ; #<VT>#
+	_ZTV20TViewDataArrayFiller @ 251 NONAME ABSENT ; #<VT>#
+	_ZTV21CApaAppInfoFileReader @ 252 NONAME ABSENT ; #<VT>#
+	_ZTV21CApaAppInfoFileWriter @ 253 NONAME ABSENT ; #<VT>#
+	_ZTV21CApaSystemControlList @ 254 NONAME ; #<VT>#
+	_ZTV7HBufBuf @ 255 NONAME ; #<VT>#
+	_ZTV8CApaDoor @ 256 NONAME ; #<VT>#
+	_ZN11CApaAppList4NewLER3RFsP13CApaAppFinderP16CApaAppRegFinderi @ 257 NONAME ABSENT
+	_ZNK11CApaAppData12IconFileNameEv @ 258 NONAME ABSENT
+	_ZNK11CApaAppData14NonMbmIconFileEv @ 259 NONAME ABSENT
+	_ZNK11CApaAppData19DefaultScreenNumberEv @ 260 NONAME ABSENT
+	_ZNK11CApaAppData20RegistrationFileUsedEv @ 261 NONAME ABSENT
+	_ZNK13RApaLsSession10GetAppIconE4TUidRP7HBufC16 @ 262 NONAME
+	_ZNK13RApaLsSession14GetAppViewIconE4TUidS0_RP7HBufC16 @ 263 NONAME
+	_ZNK13RApaLsSession15GetFilteredAppsEjj @ 264 NONAME
+	_ZNK13RApaLsSession15GetFilteredAppsEjji @ 265 NONAME
+	_ZNK15CApaAppViewData12IconFileNameEv @ 266 NONAME ABSENT
+	_ZNK15CApaAppViewData14NonMbmIconFileEv @ 267 NONAME ABSENT
+	_ZTI17CApaAppInfoReader @ 268 NONAME ABSENT ; #<TI>#
+	_ZTI19CApaAppInfoReaderV1 @ 269 NONAME ABSENT ; #<TI>#
+	_ZTI19CApaAppInfoReaderV2 @ 270 NONAME ABSENT ; #<TI>#
+	_ZTV17CApaAppInfoReader @ 271 NONAME ABSENT ; #<VT>#
+	_ZTV19CApaAppInfoReaderV1 @ 272 NONAME ABSENT ; #<VT>#
+	_ZTV19CApaAppInfoReaderV2 @ 273 NONAME ABSENT ; #<VT>#
+	_Z16StartupApaServerR14MApaAppStarter @ 274 NONAME ABSENT
+	_Z23StartupApaServerProcessv @ 275 NONAME
+	_ZN13RApaLsSession17DeleteDataMappingERK9TDataType @ 276 NONAME
+	_ZN13RApaLsSession17InsertDataMappingERK9TDataTypel4TUid @ 277 NONAME
+	_ZN13RApaLsSession25InsertDataMappingIfHigherERK9TDataTypel4TUidRi @ 278 NONAME
+	_ZNK11CApaAppData19ApplicationLanguageEv @ 279 NONAME ABSENT
+	_ZNK13RApaLsSession19ApplicationLanguageE4TUidR9TLanguage @ 280 NONAME
+	_ZN21CApaSystemControlList4NewLER3RFs @ 281 NONAME
+	_ZNK11CApaAppData17ImplementsServiceE4TUid @ 282 NONAME ABSENT
+	_ZNK11CApaAppList17ServiceUidBufferLE4TUid @ 283 NONAME ABSENT
+	_ZNK11CApaAppList19ServiceArrayBufferLE4TUid @ 284 NONAME ABSENT
+	_ZNK11CApaAppList21PreferredDataHandlerLERK9TDataTypePK4TUidRi @ 285 NONAME ABSENT
+	_ZNK11CApaAppList23ServiceImplArrayBufferLE4TUid @ 286 NONAME ABSENT
+	_ZNK11CApaAppList24ServiceOpaqueDataBufferLE4TUidS0_ @ 287 NONAME ABSENT
+	_ZNK13RApaLsSession13GetServerAppsE4TUid @ 288 NONAME
+	_ZNK13RApaLsSession13GetServerAppsE4TUidi @ 289 NONAME
+	_ZNK13RApaLsSession15GetAppServicesLE4TUidR13CArrayFixFlatIS0_E @ 290 NONAME
+	_ZNK13RApaLsSession16GetAppServicesLCE4TUid @ 291 NONAME
+	_ZNK13RApaLsSession24AppForDataTypeAndServiceERK9TDataType4TUidRS3_ @ 292 NONAME
+	_ZNK13RApaLsSession24AppForDocumentAndServiceERK5RFile4TUidRS3_R9TDataType @ 293 NONAME
+	_ZNK13RApaLsSession24AppForDocumentAndServiceERK7TDesC164TUidRS3_R9TDataType @ 294 NONAME
+	_ZNK13RApaLsSession25GetAppServiceOpaqueDataLCE4TUidS0_ @ 295 NONAME
+	_ZNK13RApaLsSession27GetServiceImplementationsLCE4TUid @ 296 NONAME
+	_ZNK18TApaAppServiceInfo10OpaqueDataEv @ 297 NONAME ABSENT
+	_ZNK18TApaAppServiceInfo3UidEv @ 298 NONAME ABSENT
+	_ZTI30CApaAppServiceInfoArrayWrapper @ 299 NONAME ABSENT ; #<TI>#
+	_ZTV30CApaAppServiceInfoArrayWrapper @ 300 NONAME ABSENT ; #<VT>#
+	_ZN13RApaLsSession13StartDocumentER5RFileR9TThreadIdP14TRequestStatus @ 301 NONAME
+	_ZN21CApaAppInfoFileReader27CreateMaskedBitmapByIndexLCEi @ 302 NONAME ABSENT
+	_ZNK13RApaLsSession36CancelListPopulationCompleteObserverEv @ 303 NONAME
+	_ZNK13RApaLsSession38RegisterListPopulationCompleteObserverER14TRequestStatus @ 304 NONAME
+	_ZN8ApaUtils24HandleAsRegistrationFileERK8TUidType @ 305 NONAME ABSENT
+	_ZN13RApaLsSession33RegisterJavaMIDletViaIterimFormatERK7TDesC16R5RFile @ 306 NONAME ABSENT
+	_ZN22ForJavaMIDletInstaller33CheckInterimFormatFileNotCorruptLER5RFile @ 307 NONAME ABSENT
+	_ZN13RApaLsSession20DeregisterJavaMIDletERK7TDesC16 @ 308 NONAME ABSENT
+	_ZN13RApaLsSession13SetFsSessionLER3RFs @ 309 NONAME
+	_ZN13RApaLsSession13StartDocumentER5RFile4TUidR9TThreadIdP14TRequestStatus @ 310 NONAME
+	_ZN13RApaLsSession13StartDocumentER5RFileRK9TDataTypeR9TThreadIdP14TRequestStatus @ 311 NONAME
+	_ZN13RApaLsSession14ClearFsSessionEv @ 312 NONAME
+	_ZN13RApaLsSession9FsSessionEv @ 313 NONAME
+	_ZNK13RApaLsSession13RecognizeDataERK5RFileR22TDataRecognitionResult @ 314 NONAME
+	_ZNK13RApaLsSession14AppForDocumentERK5RFileR4TUidR9TDataType @ 315 NONAME
+	_ZNK13RApaLsSession21RecognizeSpecificDataERK5RFileRK9TDataTypeRi @ 316 NONAME
+	_ZNK13RApaLsSession19GetPreferredBufSizeERi @ 317 NONAME
+	_ZN22ForJavaMIDletInstaller18GetJavaMIDletInfoLER3RFsRK7TDesC16RmS5_ @ 318 NONAME ABSENT
+	_ZN22ForJavaMIDletInstaller28NewInterimFormatFileWriterLCER3RFsRK7TDesC164TUidmi @ 319 NONAME ABSENT
+	_ZNK18TApaAppServiceInfo9DataTypesEv @ 320 NONAME ABSENT
+	_ZNK11CApaAppList23ServiceImplArrayBufferLE4TUidRK9TDataType @ 321 NONAME ABSENT
+	_ZNK13RApaLsSession27GetServiceImplementationsLCE4TUidRK9TDataType @ 322 NONAME
+	_ZN13RApaLsSession5CloseEv @ 323 NONAME
+	_ZTI22CApaLsSessionExtension @ 324 NONAME ABSENT ; #<TI>#
+	_ZTV22CApaLsSessionExtension @ 325 NONAME ABSENT ; #<VT>#
+	_ZN13RApaLsSession23RApaLsSession_Reserved1Ev @ 326 NONAME
+	_ZN13RApaLsSession23RApaLsSession_Reserved2Ev @ 327 NONAME
+	_ZN18TApaPictureFactoryC1Ev @ 328 NONAME
+	_ZN18TApaPictureFactoryC2Ev @ 329 NONAME
+	_ZN23MApaAppListServObserver33MApaAppListServObserver_Reserved1Ev @ 330 NONAME
+	_ZN23MApaAppListServObserver33MApaAppListServObserver_Reserved2Ev @ 331 NONAME
+	_ZN23MApaAppListServObserverC2Ev @ 332 NONAME
+	_ZTI13RApaLsSession @ 333 NONAME ; #<TI>#
+	_ZTI23MApaAppListServObserver @ 334 NONAME ; #<TI>#
+	_ZTV13RApaLsSession @ 335 NONAME ; #<VT>#
+	_ZTV23MApaAppListServObserver @ 336 NONAME ; #<VT>#
+	_ZNK13RApaLsSession15RecognizeFilesLERK7TDesC16R27CDataRecognitionResultArray @ 337 NONAME
+	_ZN13RApaLsSession15RecognizeFilesLERK7TDesC16R27CDataRecognitionResultArrayR14TRequestStatus @ 338 NONAME
+	_ZNK13RApaLsSession15RecognizeFilesLERK7TDesC16RK6TDesC8R27CDataRecognitionResultArray @ 339 NONAME
+	_ZN13RApaLsSession15RecognizeFilesLERK7TDesC16RK6TDesC8R27CDataRecognitionResultArrayR14TRequestStatus @ 340 NONAME
+	_ZN13RApaLsSession20CancelRecognizeFilesEv @ 341 NONAME
+	_ZN27CDataRecognitionResultArrayC1Ev @ 342 NONAME
+	_ZN27CDataRecognitionResultArrayC2Ev @ 343 NONAME
+	_ZN27CDataRecognitionResultArrayD0Ev @ 344 NONAME
+	_ZN27CDataRecognitionResultArrayD1Ev @ 345 NONAME
+	_ZN27CDataRecognitionResultArrayD2Ev @ 346 NONAME
+	_ZNK27CDataRecognitionResultArray12GetFileNameLER4TBufILi256EEj @ 347 NONAME
+	_ZNK27CDataRecognitionResultArray25GetDataRecognitionResultLER22TDataRecognitionResultj @ 348 NONAME
+	_ZNK27CDataRecognitionResultArray4PathEv @ 349 NONAME
+	_ZNK27CDataRecognitionResultArray5CountEv @ 350 NONAME
+	_ZTI21CAsyncFileRecognition @ 351 NONAME ABSENT ; #<TI>#
+	_ZTI27CDataRecognitionResultArray @ 352 NONAME ; #<TI>#
+	_ZTI32CDataRecognitionResultArrayEntry @ 353 NONAME ABSENT ; #<TI>#
+	_ZTV21CAsyncFileRecognition @ 354 NONAME ABSENT ; #<VT>#
+	_ZTV27CDataRecognitionResultArray @ 355 NONAME ; #<VT>#
+	_ZTV32CDataRecognitionResultArrayEntry @ 356 NONAME ABSENT ; #<VT>#
+	_ZNK13RApaLsSession16GetAppByDataTypeERK9TDataType4TUidRS3_ @ 357 NONAME
+	_ZN13RApaLsSession17DeleteDataMappingERK9TDataType4TUid @ 358 NONAME
+	_ZN13RApaLsSession17InsertDataMappingERK9TDataTypel4TUidS3_ @ 359 NONAME
+	_ZN13RApaLsSession29RegisterNonNativeApplicationLE4TUidRK10TDriveUnitR34CApaRegistrationResourceFileWriterP33CApaLocalisableResourceFileWriterPK5RFile @ 360 NONAME
+	_ZN13RApaLsSession31DeregisterNonNativeApplicationLE4TUid @ 361 NONAME
+	_ZN13RApaLsSession33RegisterNonNativeApplicationTypeLE4TUidRK7TDesC16 @ 362 NONAME
+	_ZN13RApaLsSession35DeregisterNonNativeApplicationTypeLE4TUid @ 363 NONAME
+	_ZN13RApaLsSession8StartAppERK15CApaCommandLineR9TThreadIdP14TRequestStatus @ 364 NONAME
+	_ZNK11CApaAppData10OpaqueDataEv @ 365 NONAME ABSENT
+	_ZNK11CApaAppData20RegistrationFileNameEv @ 366 NONAME ABSENT
+	_ZNK11CApaAppData27LocalisableResourceFileNameEv @ 367 NONAME ABSENT
+	_ZNK11CApaAppList17AppDataByFileNameERK7TDesC16 @ 368 NONAME ABSENT
+	_ZNK13RApaLsSession22GetDefaultScreenNumberERi4TUid @ 369 NONAME
+	_ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 370 NONAME ABSENT
+	_ZNK13RApaLsSession21MatchesSecurityPolicyERi4TUidRK15TSecurityPolicy @ 371 NONAME
+	_ZN33CApaLocalisableResourceFileWriterD1Ev @ 372 NONAME
+	_ZN33CApaLocalisableResourceFileWriterD2Ev @ 373 NONAME
+	_ZN34CApaRegistrationResourceFileWriter12AddDataTypeLEiRK6TDesC8 @ 374 NONAME
+	_ZN34CApaRegistrationResourceFileWriter13SetGroupNameLERK7TDesC16 @ 375 NONAME
+	_ZN34CApaRegistrationResourceFileWriter14SetOpaqueDataLERK6TDesC8 @ 376 NONAME
+	_ZN34CApaRegistrationResourceFileWriter15SetAppIsHiddenLEi @ 377 NONAME
+	_ZN34CApaRegistrationResourceFileWriter17SetEmbeddabilityLEN17TApaAppCapability14TEmbeddabilityE @ 378 NONAME
+	_ZN34CApaRegistrationResourceFileWriter19SetSupportsNewFileLEi @ 379 NONAME
+	_ZN34CApaRegistrationResourceFileWriter21AddFileOwnershipInfoLERK7TDesC16 @ 380 NONAME
+	_ZN34CApaRegistrationResourceFileWriter22SetLaunchInBackgroundLEi @ 381 NONAME
+	_ZN34CApaRegistrationResourceFileWriter23SetDefaultScreenNumberLEi @ 382 NONAME
+	_ZN34CApaRegistrationResourceFileWriter4NewLE4TUidRK7TDesC16j @ 383 NONAME
+	_ZN34CApaRegistrationResourceFileWriterD0Ev @ 384 NONAME
+	_ZN34CApaRegistrationResourceFileWriterD1Ev @ 385 NONAME
+	_ZN34CApaRegistrationResourceFileWriterD2Ev @ 386 NONAME
+	_ZNK11CApaAppData24NonNativeApplicationTypeEv @ 387 NONAME ABSENT
+	_ZTI33CApaLocalisableResourceFileWriter @ 388 NONAME ; #<TI>#
+	_ZTI34CApaRegistrationResourceFileWriter @ 389 NONAME ; #<TI>#
+	_ZTIN26CApaResourceFileWriterBase11RBufferSinkE @ 390 NONAME ; #<TI>#
+	_ZTV33CApaLocalisableResourceFileWriter @ 391 NONAME ; #<VT>#
+	_ZTV34CApaRegistrationResourceFileWriter @ 392 NONAME ; #<VT>#
+	_ZTVN26CApaResourceFileWriterBase11RBufferSinkE @ 393 NONAME ; #<VT>#
+	_ZN33CApaLocalisableResourceFileWriter4NewLERK7TDesC16S2_iS2_ @ 394 NONAME
+	_ZN33CApaLocalisableResourceFileWriterD0Ev @ 395 NONAME
+	_ZN13RApaLsSession12CancelNotifyEv @ 396 NONAME
+	_ZN13RApaLsSession9SetNotifyEiR14TRequestStatus @ 397 NONAME
+	_ZNK11CApaAppList17AppScanInProgressEv @ 398 NONAME ABSENT
+	_ZN13RApaLsSession25NotifyOnDataMappingChangeER14TRequestStatus @ 399 NONAME
+	_ZN13RApaLsSession31CancelNotifyOnDataMappingChangeEv @ 400 NONAME
+	_ZNK13RApaLsSession10GetAppTypeER4TUidS0_ @ 401 NONAME
+	_ZN13RApaLsSession35CommitNonNativeApplicationsUpdatesLEv @ 402 NONAME
+	_ZN13RApaLsSession36PrepareNonNativeApplicationsUpdatesLEv @ 403 NONAME
+	_ZN13RApaLsSession36RollbackNonNativeApplicationsUpdatesEv @ 404 NONAME
+	_ZN11CApaAppList15UpdatedAppsListEv @ 405 NONAME ABSENT
+	_ZN11CApaAppList18SetUpdatedAppsListEP16CUpdatedAppsList @ 406 NONAME ABSENT
+	_ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 407 NONAME ABSENT
+	_ZN11CApaAppDataD0Ev @ 408 NONAME ABSENT
+	_ZN11CApaAppDataD1Ev @ 409 NONAME ABSENT
+	_ZN11CApaAppDataD2Ev @ 410 NONAME ABSENT
+	_ZN11CApaAppList24ShareProtectedFileServerEv @ 411 NONAME ABSENT
+	_ZN11CApaAppList4SelfEv @ 412 NONAME ABSENT
+	X @ 413 NONAME ABSENT
+	X @ 414 NONAME ABSENT
+	X @ 415 NONAME ABSENT
+	X @ 416 NONAME ABSENT
+	_ZN13RApaLsSession18SetAppShortCaptionERK7TDesC169TLanguage4TUid @ 417 NONAME
+	_ZN11CApaAppData16SetShortCaptionLERK7TDesC16 @ 418 NONAME ABSENT
+	_ZN11CApaAppList14CompareStringsERK7HBufC16S2_ @ 419 NONAME ABSENT
+	_ZN11CApaAppList22AddForcedRegistrationLEP7HBufC16 @ 420 NONAME ABSENT
+	_ZN13RApaLsSession17ForceRegistrationERK13RPointerArrayI7TDesC16E @ 421 NONAME
+	_ZN11CApaAppList24ResetForcedRegistrationsEv @ 422 NONAME ABSENT
+	_ZN11CApaAppList12RestartScanLEv @ 423 NONAME ABSENT
+	_ZN11CApaAppList8StopScanEv @ 424 NONAME ABSENT
+	KMinApplicationStackSize @ 425 NONAME DATA 4
+	_Z23MinApplicationStackSizev @ 426 NONAME
+	_ZNK11CApaAppData9IsPendingEv @ 427 NONAME ABSENT
+	_ZNK11CApaAppList23IsLanguageChangePendingEv @ 428 NONAME ABSENT
+	_ZNK13RApaLsSession10GetAppIconE4TUidR5RFile @ 429 NONAME
+	_ZN17CApaSecurityUtils16CheckAppSecurityERK7TPtrC16RiS3_ @ 430 NONAME
+	X @ 431 NONAME ABSENT
+	X @ 432 NONAME ABSENT
+	_ZN13RApaLsSession40ForceCommitNonNativeApplicationsUpdatesLEv @ 433 NONAME
+	_ZNK13RApaLsSession13RecognizeDataERK6TDesC8R22TDataRecognitionResult @ 434 NONAME
+	_ZN13RApaLsSession14UpdateAppListLER6RArrayI17TApaAppUpdateInfoE @ 435 NONAME
+	_ZN17TApaAppUpdateInfo12InternalizeLER11RReadStream @ 436 NONAME
+	_ZN17TApaAppUpdateInfoC1Ev @ 437 NONAME
+	_ZN17TApaAppUpdateInfoC2Ev @ 438 NONAME
+	_ZNK17TApaAppUpdateInfo12ExternalizeLER12RWriteStream @ 439 NONAME
+	_ZN17TApaAppUpdateInfoC1E4TUidNS_13TApaAppActionE @ 440 NONAME
+	_ZN17TApaAppUpdateInfoC2E4TUidNS_13TApaAppActionE @ 441 NONAME
+	_ZN13RApaLsSession16UpdatedAppsInfoLER6RArrayI17TApaAppUpdateInfoE @ 442 NONAME
+	_ZN13RApaLsSession17ForceRegistrationERK13RPointerArrayIN4Usif28CApplicationRegistrationDataEE @ 443 NONAME
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/eabi/apservu.def	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,70 @@
+EXPORTS
+	_Z23NameApaServServerThreadv @ 1 NONAME
+	_Z25NameApaServStartSemaphorev @ 2 NONAME
+	_ZN13CApaFsMonitor10SetBlockedEi @ 3 NONAME
+	_ZN13CApaFsMonitor4NewLER3RFsRK7TDesC169TCallBack @ 4 NONAME
+	_ZN13CApaFsMonitor5StartE11TNotifyType @ 5 NONAME
+	_ZN13CApaFsMonitorD0Ev @ 6 NONAME
+	_ZN13CApaFsMonitorD1Ev @ 7 NONAME
+	_ZN13CApaFsMonitorD2Ev @ 8 NONAME
+	_ZN16CApaAppArcServer4NewLEP11CApaAppListP18CApaFileRecognizer @ 9 NONAME ABSENT
+	_ZN16CApaAppArcServer4NewLEv @ 10 NONAME
+	_ZN16CApaAppArcServerD0Ev @ 11 NONAME
+	_ZN16CApaAppArcServerD1Ev @ 12 NONAME
+	_ZN16CApaAppArcServerD2Ev @ 13 NONAME
+	_ZNK13CApaFsMonitor10NotifyTypeEv @ 14 NONAME
+	_ZTI13CApaFsMonitor @ 15 NONAME ; #<TI>#
+	_ZTI15CApaEComMonitor @ 16 NONAME ; #<TI>#
+	_ZTI16CApaAppArcServer @ 17 NONAME ; #<TI>#
+	_ZTI20TDesCArrayItemWriter @ 18 NONAME ABSENT ; #<TI>#
+	_ZTI20TSizeArrayItemWriter @ 19 NONAME ABSENT ; #<TI>#
+	_ZTI22CApaAppListServSession @ 20 NONAME ; #<TI>#
+	_ZTI24TViewDataArrayItemWriter @ 21 NONAME ABSENT ; #<TI>#
+	_ZTV13CApaFsMonitor @ 22 NONAME ; #<VT>#
+	_ZTV15CApaEComMonitor @ 23 NONAME ; #<VT>#
+	_ZTV16CApaAppArcServer @ 24 NONAME ; #<VT>#
+	_ZTV20TDesCArrayItemWriter @ 25 NONAME ABSENT ; #<VT>#
+	_ZTV20TSizeArrayItemWriter @ 26 NONAME ABSENT ; #<VT>#
+	_ZTV22CApaAppListServSession @ 27 NONAME ; #<VT>#
+	_ZTV24TViewDataArrayItemWriter @ 28 NONAME ABSENT ; #<VT>#
+	_ZN13CApaFsMonitor12AddLocationLERK7TDesC16 @ 29 NONAME
+	_ZTIN13CApaFsMonitor14CApaFsNotifierE @ 30 NONAME ; #<TI>#
+	_ZTVN13CApaFsMonitor14CApaFsNotifierE @ 31 NONAME ; #<VT>#
+	_ZN16CApaAppArcServer4SelfEv @ 32 NONAME
+	_ZN13CApaFsMonitor6CancelEv @ 33 NONAME
+	_Z18ApaServThreadStartPv @ 34 NONAME
+	_ZTI18CRecognitionResult @ 35 NONAME ABSENT ; #<TI>#
+	_ZTI20CApsRecognitionCache @ 36 NONAME ; #<TI>#
+	_ZTI20CCacheDirectoryEntry @ 37 NONAME ; #<TI>#
+	_ZTI23CFileRecognitionUtility @ 38 NONAME ABSENT ; #<TI>#
+	_ZTI25CRecognitionResultHashMap @ 39 NONAME ; #<TI>#
+	_ZTI27CDirectoryRecognitionResult @ 40 NONAME ABSENT ; #<TI>#
+	_ZTI30CRecognitionResultHashMapEntry @ 41 NONAME ; #<TI>#
+	_ZTV18CRecognitionResult @ 42 NONAME ABSENT ; #<VT>#
+	_ZTV20CApsRecognitionCache @ 43 NONAME ; #<VT>#
+	_ZTV20CCacheDirectoryEntry @ 44 NONAME ; #<VT>#
+	_ZTV23CFileRecognitionUtility @ 45 NONAME ABSENT ; #<VT>#
+	_ZTV25CRecognitionResultHashMap @ 46 NONAME ; #<VT>#
+	_ZTV27CDirectoryRecognitionResult @ 47 NONAME ABSENT ; #<VT>#
+	_ZTV30CRecognitionResultHashMapEntry @ 48 NONAME ; #<VT>#
+	_ZN16CUpdatedAppsList28CloseAndDeletePermanentStoreEv @ 49 NONAME ABSENT
+	_ZN16CUpdatedAppsListD0Ev @ 50 NONAME ABSENT
+	_ZN16CUpdatedAppsListD1Ev @ 51 NONAME ABSENT
+	_ZN16CUpdatedAppsListD2Ev @ 52 NONAME ABSENT
+	_ZTI16CUpdatedAppsList @ 53 NONAME ABSENT ; #<TI>#
+	_ZTV16CUpdatedAppsList @ 54 NONAME ABSENT ; #<VT>#
+	_ZNK16CUpdatedAppsList8IsInListERK7TDesC16 @ 55 NONAME ABSENT
+	_ZTIN16CUpdatedAppsList15CUpdatedAppInfoE @ 56 NONAME ABSENT ; #<TI>#
+	_ZTVN16CUpdatedAppsList15CUpdatedAppInfoE @ 57 NONAME ABSENT ; #<VT>#
+	_ZN16CApaAppArcServer14RescanCallBackEv @ 58 NONAME ABSENT
+	_ZTI18CCustomAppInfoData @ 59 NONAME ABSENT ; #<TI>#
+	_ZTV18CCustomAppInfoData @ 60 NONAME ABSENT ; #<VT>#
+	KApaLoadDataRecognizersOnDemand @ 61 NONAME DATA 4
+	KApaUnloadRecognizersTimeout @ 62 NONAME DATA 4
+	_ZN16CApaAppArcServer27HandleInstallationEndEventLEv @ 63 NONAME ABSENT
+	_ZN16CApaAppArcServer28HandleInstallationStartEventEv @ 64 NONAME ABSENT
+	KApaDrivesToMonitor @ 65 NONAME DATA 4
+	KApaLoadMbmIconsOnDemand @ 66 NONAME DATA 4
+	_ZTI21CApaAppArcServSession @ 67 NONAME
+	_ZTV21CApaAppArcServSession @ 68 NONAME
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/eabi/ticonforleaksu.def	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,433 @@
+EXPORTS
+	KMinApplicationStackSize @ 1 NONAME DATA 4
+	_Z16StartupApaServerR14MApaAppStarter @ 2 NONAME ABSENT
+	_Z23MinApplicationStackSizev @ 3 NONAME
+	_Z23StartupApaServerProcessv @ 4 NONAME
+	_ZN11CApaAppData16CanUseScreenModeEi @ 5 NONAME
+	_ZN11CApaAppData16SetShortCaptionLERK7TDesC16 @ 6 NONAME
+	_ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 7 NONAME ABSENT
+	_ZN11CApaAppDataD0Ev @ 8 NONAME
+	_ZN11CApaAppDataD1Ev @ 9 NONAME
+	_ZN11CApaAppDataD2Ev @ 10 NONAME
+	_ZN11CApaAppList12RestartScanLEv @ 11 NONAME ABSENT
+	_ZN11CApaAppList14CompareStringsERK7HBufC16S2_ @ 12 NONAME ABSENT
+	_ZN11CApaAppList15UpdatedAppsListEv @ 13 NONAME ABSENT
+	_ZN11CApaAppList16StartIdleUpdateLEP19MApaAppListObserver @ 14 NONAME
+	_ZN11CApaAppList16StartIdleUpdateLEv @ 15 NONAME
+	_ZN11CApaAppList18SetUpdatedAppsListEP16CUpdatedAppsList @ 16 NONAME ABSENT
+	_ZN11CApaAppList22AddForcedRegistrationLEP7HBufC16 @ 17 NONAME ABSENT
+	_ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 18 NONAME ABSENT
+	_ZN11CApaAppList24ResetForcedRegistrationsEv @ 19 NONAME ABSENT
+	_ZN11CApaAppList4NewLER3RFsP16CApaAppRegFinderii @ 20 NONAME ABSENT
+	_ZN11CApaAppList4SelfEv @ 21 NONAME
+	_ZN11CApaAppList6PurgeLEv @ 22 NONAME ABSENT
+	_ZN11CApaAppList8StopScanEi @ 23 NONAME ABSENT
+	_ZN11CApaAppList9InitListLEP19MApaAppListObserver @ 24 NONAME
+	_ZN11CApaAppListD0Ev @ 25 NONAME
+	_ZN11CApaAppListD1Ev @ 26 NONAME
+	_ZN11CApaAppListD2Ev @ 27 NONAME
+	_ZN12TApaTaskList10CycleTasksE4TUidNS_15TCycleDirectionE @ 28 NONAME
+	_ZN12TApaTaskList7FindAppE4TUid @ 29 NONAME
+	_ZN12TApaTaskList7FindAppERK7TDesC16 @ 30 NONAME
+	_ZN12TApaTaskList7FindDocERK7TDesC16 @ 31 NONAME
+	_ZN12TApaTaskList9FindByPosEi @ 32 NONAME
+	_ZN12TApaTaskListC1ER10RWsSession @ 33 NONAME
+	_ZN12TApaTaskListC2ER10RWsSession @ 34 NONAME
+	_ZN13RApaLsSession12CancelNotifyEv @ 35 NONAME
+	_ZN13RApaLsSession13SetFsSessionLER3RFs @ 36 NONAME
+	_ZN13RApaLsSession13StartDocumentER5RFile4TUidR9TThreadIdP14TRequestStatus @ 37 NONAME
+	_ZN13RApaLsSession13StartDocumentER5RFileR9TThreadIdP14TRequestStatus @ 38 NONAME
+	_ZN13RApaLsSession13StartDocumentER5RFileRK9TDataTypeR9TThreadIdP14TRequestStatus @ 39 NONAME
+	_ZN13RApaLsSession13StartDocumentERK7TDesC164TUidR9TThreadIdNS_11TLaunchTypeE @ 40 NONAME
+	_ZN13RApaLsSession13StartDocumentERK7TDesC16R9TThreadIdNS_11TLaunchTypeE @ 41 NONAME
+	_ZN13RApaLsSession13StartDocumentERK7TDesC16RK9TDataTypeR9TThreadIdNS_11TLaunchTypeE @ 42 NONAME
+	_ZN13RApaLsSession14ClearFsSessionEv @ 43 NONAME
+	_ZN13RApaLsSession14CreateDocumentERK7TDesC164TUidR9TThreadIdNS_11TLaunchTypeE @ 44 NONAME
+	_ZN13RApaLsSession15RecognizeFilesLERK7TDesC16R27CDataRecognitionResultArrayR14TRequestStatus @ 45 NONAME
+	_ZN13RApaLsSession15RecognizeFilesLERK7TDesC16RK6TDesC8R27CDataRecognitionResultArrayR14TRequestStatus @ 46 NONAME
+	_ZN13RApaLsSession17DeleteDataMappingERK9TDataType @ 47 NONAME
+	_ZN13RApaLsSession17DeleteDataMappingERK9TDataType4TUid @ 48 NONAME
+	_ZN13RApaLsSession17ForceRegistrationERK13RPointerArrayI7TDesC16E @ 49 NONAME
+	_ZN13RApaLsSession17InsertDataMappingERK9TDataTypel4TUid @ 50 NONAME
+	_ZN13RApaLsSession17InsertDataMappingERK9TDataTypel4TUidS3_ @ 51 NONAME
+	_ZN13RApaLsSession17SetMaxDataBufSizeEi @ 52 NONAME
+	_ZN13RApaLsSession18SetAppShortCaptionERK7TDesC169TLanguage4TUid @ 53 NONAME
+	_ZN13RApaLsSession20CancelRecognizeFilesEv @ 54 NONAME
+	_ZN13RApaLsSession21SetAcceptedConfidenceEi @ 55 NONAME
+	_ZN13RApaLsSession23RApaLsSession_Reserved1Ev @ 56 NONAME
+	_ZN13RApaLsSession23RApaLsSession_Reserved2Ev @ 57 NONAME
+	_ZN13RApaLsSession25InsertDataMappingIfHigherERK9TDataTypel4TUidRi @ 58 NONAME
+	_ZN13RApaLsSession25NotifyOnDataMappingChangeER14TRequestStatus @ 59 NONAME
+	_ZN13RApaLsSession29RegisterNonNativeApplicationLE4TUidRK10TDriveUnitR34CApaRegistrationResourceFileWriterP33CApaLocalisableResourceFileWriterPK5RFile @ 60 NONAME
+	_ZN13RApaLsSession31CancelNotifyOnDataMappingChangeEv @ 61 NONAME
+	_ZN13RApaLsSession31DeregisterNonNativeApplicationLE4TUid @ 62 NONAME
+	_ZN13RApaLsSession33RegisterNonNativeApplicationTypeLE4TUidRK7TDesC16 @ 63 NONAME
+	_ZN13RApaLsSession35CommitNonNativeApplicationsUpdatesLEv @ 64 NONAME
+	_ZN13RApaLsSession35DeregisterNonNativeApplicationTypeLE4TUid @ 65 NONAME
+	_ZN13RApaLsSession36PrepareNonNativeApplicationsUpdatesLEv @ 66 NONAME
+	_ZN13RApaLsSession36RollbackNonNativeApplicationsUpdatesEv @ 67 NONAME
+	_ZN13RApaLsSession5CloseEv @ 68 NONAME
+	_ZN13RApaLsSession7ConnectEv @ 69 NONAME
+	_ZN13RApaLsSession8StartAppERK15CApaCommandLine @ 70 NONAME
+	_ZN13RApaLsSession8StartAppERK15CApaCommandLineR9TThreadId @ 71 NONAME
+	_ZN13RApaLsSession8StartAppERK15CApaCommandLineR9TThreadIdP14TRequestStatus @ 72 NONAME
+	_ZN13RApaLsSession9FsSessionEv @ 73 NONAME
+	_ZN13RApaLsSession9SetNotifyEiR14TRequestStatus @ 74 NONAME
+	_ZN13RApaLsSessionC1Ev @ 75 NONAME
+	_ZN13RApaLsSessionC2Ev @ 76 NONAME
+	_ZN16CApaMaskedBitmap12InternalizeLER11RReadStream @ 77 NONAME
+	_ZN16CApaMaskedBitmap13SetMaskBitmapEP10CFbsBitmap @ 78 NONAME
+	_ZN16CApaMaskedBitmap4NewLEPKS_ @ 79 NONAME
+	_ZN16CApaMaskedBitmap5NewLCEv @ 80 NONAME
+	_ZN16CApaMaskedBitmapD0Ev @ 81 NONAME
+	_ZN16CApaMaskedBitmapD1Ev @ 82 NONAME
+	_ZN16CApaMaskedBitmapD2Ev @ 83 NONAME
+	_ZN17CApaSystemControl7CreateLEv @ 84 NONAME
+	_ZN18TApaPictureFactoryC1EP11CApaProcess @ 85 NONAME
+	_ZN18TApaPictureFactoryC1Ev @ 86 NONAME
+	_ZN18TApaPictureFactoryC2EP11CApaProcess @ 87 NONAME
+	_ZN18TApaPictureFactoryC2Ev @ 88 NONAME
+	_ZN19CApaAppListNotifier4NewLEP23MApaAppListServObserverN7CActive9TPriorityE @ 89 NONAME
+	_ZN19CApaAppListNotifierD0Ev @ 90 NONAME
+	_ZN19CApaAppListNotifierD1Ev @ 91 NONAME
+	_ZN19CApaAppListNotifierD2Ev @ 92 NONAME
+	_ZN19CApaWindowGroupName11SetAppReadyEi @ 93 NONAME
+	_ZN19CApaWindowGroupName11SetCaptionLERK7TDesC16 @ 94 NONAME
+	_ZN19CApaWindowGroupName11SetDocNameLERK7TDesC16 @ 95 NONAME
+	_ZN19CApaWindowGroupName12FindByAppUidE4TUidR10RWsSessionRi @ 96 NONAME
+	_ZN19CApaWindowGroupName13FindByCaptionERK7TDesC16R10RWsSessionRi @ 97 NONAME
+	_ZN19CApaWindowGroupName13FindByDocNameERK7TDesC16R10RWsSessionRi @ 98 NONAME
+	_ZN19CApaWindowGroupName17SetDocNameIsAFileEi @ 99 NONAME
+	_ZN19CApaWindowGroupName18ConstructFromWgIdLEi @ 100 NONAME
+	_ZN19CApaWindowGroupName18SetWindowGroupNameEP7HBufC16 @ 101 NONAME
+	_ZN19CApaWindowGroupName19SetWindowGroupNameLERK7TDesC16 @ 102 NONAME
+	_ZN19CApaWindowGroupName26SetRespondsToShutdownEventEi @ 103 NONAME
+	_ZN19CApaWindowGroupName29SetRespondsToSwitchFilesEventEi @ 104 NONAME
+	_ZN19CApaWindowGroupName3NewERK10RWsSessionP7HBufC16 @ 105 NONAME
+	_ZN19CApaWindowGroupName4NewLERK10RWsSession @ 106 NONAME
+	_ZN19CApaWindowGroupName4NewLERK10RWsSessionRK7TDesC16 @ 107 NONAME
+	_ZN19CApaWindowGroupName4NewLERK10RWsSessioni @ 108 NONAME
+	_ZN19CApaWindowGroupName5NewLCERK10RWsSession @ 109 NONAME
+	_ZN19CApaWindowGroupName5NewLCERK10RWsSessionRK7TDesC16 @ 110 NONAME
+	_ZN19CApaWindowGroupName5NewLCERK10RWsSessioni @ 111 NONAME
+	_ZN19CApaWindowGroupName7SetBusyEi @ 112 NONAME
+	_ZN19CApaWindowGroupName9SetAppUidE4TUid @ 113 NONAME
+	_ZN19CApaWindowGroupName9SetHiddenEi @ 114 NONAME
+	_ZN19CApaWindowGroupName9SetSystemEi @ 115 NONAME
+	_ZN19CApaWindowGroupNameD0Ev @ 116 NONAME
+	_ZN19CApaWindowGroupNameD1Ev @ 117 NONAME
+	_ZN19CApaWindowGroupNameD2Ev @ 118 NONAME
+	_ZN21CApaAppInfoFileWriter11AddCaptionLE9TLanguageRK7TDesC16 @ 119 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter12AddDataTypeLERK21TDataTypeWithPriority @ 120 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter13SetCapabilityERK6TDesC8 @ 121 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter6StoreLEv @ 122 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriter8AddIconLER16CApaMaskedBitmap @ 123 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriterD0Ev @ 124 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriterD1Ev @ 125 NONAME ABSENT
+	_ZN21CApaAppInfoFileWriterD2Ev @ 126 NONAME ABSENT
+	_ZN21CApaSystemControlList4NewLER3RFs @ 127 NONAME
+	_ZN21CApaSystemControlList7UpdateLEv @ 128 NONAME
+	_ZN21CApaSystemControlListD0Ev @ 129 NONAME
+	_ZN21CApaSystemControlListD1Ev @ 130 NONAME
+	_ZN21CApaSystemControlListD2Ev @ 131 NONAME
+	_ZN22ForJavaMIDletInstaller18GetJavaMIDletInfoLER3RFsRK7TDesC16RmS5_ @ 132 NONAME ABSENT
+	_ZN22ForJavaMIDletInstaller28NewInterimFormatFileWriterLCER3RFsRK7TDesC164TUidmi @ 133 NONAME ABSENT
+	_ZN22ForJavaMIDletInstaller33CheckInterimFormatFileNotCorruptLER5RFile @ 134 NONAME ABSENT
+	_ZN23MApaAppListServObserver33MApaAppListServObserver_Reserved1Ev @ 135 NONAME
+	_ZN23MApaAppListServObserver33MApaAppListServObserver_Reserved2Ev @ 136 NONAME
+	_ZN23MApaAppListServObserverC2Ev @ 137 NONAME
+	_ZN27CDataRecognitionResultArrayC1Ev @ 138 NONAME
+	_ZN27CDataRecognitionResultArrayC2Ev @ 139 NONAME
+	_ZN27CDataRecognitionResultArrayD0Ev @ 140 NONAME
+	_ZN27CDataRecognitionResultArrayD1Ev @ 141 NONAME
+	_ZN27CDataRecognitionResultArrayD2Ev @ 142 NONAME
+	_ZN31TIconLoaderAndIconArrayForLeaks27TestIconLoaderAndIconArrayLEv @ 143 NONAME
+	_ZN33CApaLocalisableResourceFileWriter4NewLERK7TDesC16S2_iS2_ @ 144 NONAME
+	_ZN33CApaLocalisableResourceFileWriterD0Ev @ 145 NONAME
+	_ZN33CApaLocalisableResourceFileWriterD1Ev @ 146 NONAME
+	_ZN33CApaLocalisableResourceFileWriterD2Ev @ 147 NONAME
+	_ZN34CApaRegistrationResourceFileWriter12AddDataTypeLEiRK6TDesC8 @ 148 NONAME
+	_ZN34CApaRegistrationResourceFileWriter13SetGroupNameLERK7TDesC16 @ 149 NONAME
+	_ZN34CApaRegistrationResourceFileWriter14SetOpaqueDataLERK6TDesC8 @ 150 NONAME
+	_ZN34CApaRegistrationResourceFileWriter15SetAppIsHiddenLEi @ 151 NONAME
+	_ZN34CApaRegistrationResourceFileWriter17SetEmbeddabilityLEN17TApaAppCapability14TEmbeddabilityE @ 152 NONAME
+	_ZN34CApaRegistrationResourceFileWriter19SetSupportsNewFileLEi @ 153 NONAME
+	_ZN34CApaRegistrationResourceFileWriter21AddFileOwnershipInfoLERK7TDesC16 @ 154 NONAME
+	_ZN34CApaRegistrationResourceFileWriter22SetLaunchInBackgroundLEi @ 155 NONAME
+	_ZN34CApaRegistrationResourceFileWriter23SetDefaultScreenNumberLEi @ 156 NONAME
+	_ZN34CApaRegistrationResourceFileWriter4NewLE4TUidRK7TDesC16j @ 157 NONAME
+	_ZN34CApaRegistrationResourceFileWriterD0Ev @ 158 NONAME
+	_ZN34CApaRegistrationResourceFileWriterD1Ev @ 159 NONAME
+	_ZN34CApaRegistrationResourceFileWriterD2Ev @ 160 NONAME
+	_ZN8ApaUtils24HandleAsRegistrationFileERK8TUidType @ 161 NONAME ABSENT
+	_ZN8CApaDoor16SetFormatToIconLEv @ 162 NONAME
+	_ZN8CApaDoor17SetFormatToGlassLEv @ 163 NONAME
+	_ZN8CApaDoor25SetFormatToTemporaryIconLEi @ 164 NONAME
+	_ZN8CApaDoor4NewLER3RFsR12CApaDocumentRK5TSize @ 165 NONAME
+	_ZN8CApaDoor4NewLER3RFsRK12CStreamStore9TStreamIdR11CApaProcess @ 166 NONAME
+	_ZN8CApaDoor5NewLCER3RFsR12CApaDocumentRK5TSize @ 167 NONAME
+	_ZN8CApaDoor8RestoreLERK12CStreamStore9TStreamId @ 168 NONAME
+	_ZN8CApaDoor9DocumentLEi @ 169 NONAME
+	_ZN8CApaDoorD0Ev @ 170 NONAME
+	_ZN8CApaDoorD1Ev @ 171 NONAME
+	_ZN8CApaDoorD2Ev @ 172 NONAME
+	_ZN8TApaTask11SendMessageE4TUidRK6TDesC8 @ 173 NONAME
+	_ZN8TApaTask14SwitchOpenFileERK7TDesC16 @ 174 NONAME
+	_ZN8TApaTask15SendSystemEventE15TApaSystemEvent @ 175 NONAME
+	_ZN8TApaTask16SendToBackgroundEv @ 176 NONAME
+	_ZN8TApaTask16SwitchCreateFileERK7TDesC16 @ 177 NONAME
+	_ZN8TApaTask17BringToForegroundEv @ 178 NONAME
+	_ZN8TApaTask7EndTaskEv @ 179 NONAME
+	_ZN8TApaTask7SendKeyERK9TKeyEvent @ 180 NONAME
+	_ZN8TApaTask7SendKeyEii @ 181 NONAME
+	_ZN8TApaTask7SetWgIdEi @ 182 NONAME
+	_ZN8TApaTask8KillTaskEv @ 183 NONAME
+	_ZN8TApaTaskC1ER10RWsSession @ 184 NONAME
+	_ZN8TApaTaskC2ER10RWsSession @ 185 NONAME
+	_ZNK11CApaAppData10CapabilityER5TDes8 @ 186 NONAME
+	_ZNK11CApaAppData10IconSizesLEv @ 187 NONAME
+	_ZNK11CApaAppData10OpaqueDataEv @ 188 NONAME
+	_ZNK11CApaAppData10OwnedFilesEv @ 189 NONAME
+	_ZNK11CApaAppData11GetIconInfoERiS0_ @ 190 NONAME
+	_ZNK11CApaAppData12IconFileNameEv @ 191 NONAME
+	_ZNK11CApaAppData14NonMbmIconFileEv @ 192 NONAME
+	_ZNK11CApaAppData17ImplementsServiceE4TUid @ 193 NONAME
+	_ZNK11CApaAppData19ApplicationLanguageEv @ 194 NONAME
+	_ZNK11CApaAppData19DefaultScreenNumberEv @ 195 NONAME
+	_ZNK11CApaAppData20RegistrationFileNameEv @ 196 NONAME ABSENT
+	_ZNK11CApaAppData20RegistrationFileUsedEv @ 197 NONAME ABSENT
+	_ZNK11CApaAppData24NonNativeApplicationTypeEv @ 198 NONAME
+	_ZNK11CApaAppData27LocalisableResourceFileNameEv @ 199 NONAME ABSENT
+	_ZNK11CApaAppData4IconE5TSize @ 200 NONAME
+	_ZNK11CApaAppData4IconEi @ 201 NONAME
+	_ZNK11CApaAppData5ViewsEv @ 202 NONAME
+	_ZNK11CApaAppData8AppEntryEv @ 203 NONAME
+	_ZNK11CApaAppData8DataTypeERK9TDataType @ 204 NONAME
+	_ZNK11CApaAppData9IsPendingEv @ 205 NONAME ABSENT
+	_ZNK11CApaAppList12AppDataByUidE4TUid @ 206 NONAME
+	_ZNK11CApaAppList17AppDataByFileNameERK7TDesC16 @ 207 NONAME
+	_ZNK11CApaAppList17AppScanInProgressEv @ 208 NONAME
+	_ZNK11CApaAppList17ServiceUidBufferLE4TUid @ 209 NONAME
+	_ZNK11CApaAppList19IsFirstScanCompleteEv @ 210 NONAME
+	_ZNK11CApaAppList19ServiceArrayBufferLE4TUid @ 211 NONAME
+	_ZNK11CApaAppList20IsIdleUpdateCompleteEv @ 212 NONAME
+	_ZNK11CApaAppList21PreferredDataHandlerLERK9TDataType @ 213 NONAME
+	_ZNK11CApaAppList21PreferredDataHandlerLERK9TDataTypePK4TUidRi @ 214 NONAME
+	_ZNK11CApaAppList23IsLanguageChangePendingEv @ 215 NONAME
+	_ZNK11CApaAppList23ServiceImplArrayBufferLE4TUid @ 216 NONAME
+	_ZNK11CApaAppList23ServiceImplArrayBufferLE4TUidRK9TDataType @ 217 NONAME
+	_ZNK11CApaAppList24ServiceOpaqueDataBufferLE4TUidS0_ @ 218 NONAME
+	_ZNK11CApaAppList5CountEv @ 219 NONAME
+	_ZNK11CApaAppList7NextAppEPK11CApaAppData @ 220 NONAME
+	_ZNK11CApaAppList7NextAppEPK11CApaAppDatai @ 221 NONAME
+	_ZNK11CApaAppList8FirstAppEi @ 222 NONAME
+	_ZNK11CApaAppList8FirstAppEv @ 223 NONAME
+	_ZNK13RApaLsSession10GetAllAppsEi @ 224 NONAME
+	_ZNK13RApaLsSession10GetAllAppsEv @ 225 NONAME
+	_ZNK13RApaLsSession10GetAppIconE4TUid5TSizeR16CApaMaskedBitmap @ 226 NONAME
+	_ZNK13RApaLsSession10GetAppIconE4TUidR5RFile @ 227 NONAME
+	_ZNK13RApaLsSession10GetAppIconE4TUidRP7HBufC16 @ 228 NONAME
+	_ZNK13RApaLsSession10GetAppIconE4TUidiR16CApaMaskedBitmap @ 229 NONAME
+	_ZNK13RApaLsSession10GetAppInfoER11TApaAppInfo4TUid @ 230 NONAME
+	_ZNK13RApaLsSession10GetAppTypeER4TUidS0_ @ 231 NONAME
+	_ZNK13RApaLsSession10GetNextAppER11TApaAppInfo @ 232 NONAME
+	_ZNK13RApaLsSession10GetNextAppER11TApaAppInfoi @ 233 NONAME
+	_ZNK13RApaLsSession11GetAppViewsER13CArrayFixFlatI15TApaAppViewInfoE4TUid @ 234 NONAME
+	_ZNK13RApaLsSession13GetServerAppsE4TUid @ 235 NONAME
+	_ZNK13RApaLsSession13GetServerAppsE4TUidi @ 236 NONAME
+	_ZNK13RApaLsSession13RecognizeDataERK5RFileR22TDataRecognitionResult @ 237 NONAME
+	_ZNK13RApaLsSession13RecognizeDataERK7TDesC16RK6TDesC8R22TDataRecognitionResult @ 238 NONAME
+	_ZNK13RApaLsSession14AppForDataTypeERK9TDataTypeR4TUid @ 239 NONAME
+	_ZNK13RApaLsSession14AppForDocumentERK5RFileR4TUidR9TDataType @ 240 NONAME
+	_ZNK13RApaLsSession14AppForDocumentERK7TDesC16R4TUidR9TDataType @ 241 NONAME
+	_ZNK13RApaLsSession14GetAppViewIconE4TUidS0_RK5TSizeR16CApaMaskedBitmap @ 242 NONAME
+	_ZNK13RApaLsSession14GetAppViewIconE4TUidS0_RP7HBufC16 @ 243 NONAME
+	_ZNK13RApaLsSession15GetAppIconSizesE4TUidR13CArrayFixFlatI5TSizeE @ 244 NONAME
+	_ZNK13RApaLsSession15GetAppServicesLE4TUidR13CArrayFixFlatIS0_E @ 245 NONAME
+	_ZNK13RApaLsSession15GetFilteredAppsERK23TApaEmbeddabilityFilter @ 246 NONAME
+	_ZNK13RApaLsSession15GetFilteredAppsERK23TApaEmbeddabilityFilteri @ 247 NONAME
+	_ZNK13RApaLsSession15GetFilteredAppsEjj @ 248 NONAME
+	_ZNK13RApaLsSession15GetFilteredAppsEjji @ 249 NONAME
+	_ZNK13RApaLsSession15RecognizeFilesLERK7TDesC16R27CDataRecognitionResultArray @ 250 NONAME
+	_ZNK13RApaLsSession15RecognizeFilesLERK7TDesC16RK6TDesC8R27CDataRecognitionResultArray @ 251 NONAME
+	_ZNK13RApaLsSession16GetAppByDataTypeERK9TDataType4TUidRS3_ @ 252 NONAME
+	_ZNK13RApaLsSession16GetAppCapabilityER5TDes84TUid @ 253 NONAME
+	_ZNK13RApaLsSession16GetAppOwnedFilesER12CDesC16Array4TUid @ 254 NONAME
+	_ZNK13RApaLsSession16GetAppServicesLCE4TUid @ 255 NONAME
+	_ZNK13RApaLsSession17GetEmbeddableAppsEi @ 256 NONAME
+	_ZNK13RApaLsSession17GetEmbeddableAppsEv @ 257 NONAME
+	_ZNK13RApaLsSession17GetMaxDataBufSizeERi @ 258 NONAME
+	_ZNK13RApaLsSession18EmbeddableAppCountERi @ 259 NONAME
+	_ZNK13RApaLsSession19ApplicationLanguageE4TUidR9TLanguage @ 260 NONAME
+	_ZNK13RApaLsSession19GetPreferredBufSizeERi @ 261 NONAME
+	_ZNK13RApaLsSession21GetAcceptedConfidenceERi @ 262 NONAME
+	_ZNK13RApaLsSession21MatchesSecurityPolicyERi4TUidRK15TSecurityPolicy @ 263 NONAME
+	_ZNK13RApaLsSession21RecognizeSpecificDataERK5RFileRK9TDataTypeRi @ 264 NONAME
+	_ZNK13RApaLsSession21RecognizeSpecificDataERK7TDesC16RK6TDesC8RK9TDataTypeRi @ 265 NONAME
+	_ZNK13RApaLsSession22GetDefaultScreenNumberERi4TUid @ 266 NONAME
+	_ZNK13RApaLsSession22GetSupportedDataTypesLER13CArrayFixFlatI9TDataTypeE @ 267 NONAME
+	_ZNK13RApaLsSession23NumberOfOwnDefinedIconsE4TUidRi @ 268 NONAME
+	_ZNK13RApaLsSession24AppForDataTypeAndServiceERK9TDataType4TUidRS3_ @ 269 NONAME
+	_ZNK13RApaLsSession24AppForDocumentAndServiceERK5RFile4TUidRS3_R9TDataType @ 270 NONAME
+	_ZNK13RApaLsSession24AppForDocumentAndServiceERK7TDesC164TUidRS3_R9TDataType @ 271 NONAME
+	_ZNK13RApaLsSession25GetAppServiceOpaqueDataLCE4TUidS0_ @ 272 NONAME
+	_ZNK13RApaLsSession27GetServiceImplementationsLCE4TUid @ 273 NONAME
+	_ZNK13RApaLsSession27GetServiceImplementationsLCE4TUidRK9TDataType @ 274 NONAME
+	_ZNK13RApaLsSession36CancelListPopulationCompleteObserverEv @ 275 NONAME
+	_ZNK13RApaLsSession38RegisterListPopulationCompleteObserverER14TRequestStatus @ 276 NONAME
+	_ZNK13RApaLsSession7VersionEv @ 277 NONAME
+	_ZNK13RApaLsSession8AppCountERi @ 278 NONAME
+	_ZNK13RApaLsSession9IsProgramERK7TDesC16Ri @ 279 NONAME
+	_ZNK15CApaAppViewData10IconSizesLEv @ 280 NONAME
+	_ZNK15CApaAppViewData10ScreenModeEv @ 281 NONAME
+	_ZNK15CApaAppViewData12IconFileNameEv @ 282 NONAME
+	_ZNK15CApaAppViewData14NonMbmIconFileEv @ 283 NONAME
+	_ZNK15CApaAppViewData3UidEv @ 284 NONAME
+	_ZNK15CApaAppViewData4IconERK5TSize @ 285 NONAME
+	_ZNK16CApaMaskedBitmap12ExternalizeLER12RWriteStream @ 286 NONAME
+	_ZNK16CApaMaskedBitmap4MaskEv @ 287 NONAME
+	_ZNK17CApaSystemControl12ShortCaptionEv @ 288 NONAME
+	_ZNK17CApaSystemControl4IconEv @ 289 NONAME
+	_ZNK17CApaSystemControl4TypeEv @ 290 NONAME
+	_ZNK17CApaSystemControl7CaptionEv @ 291 NONAME
+	_ZNK17CApaSystemControl8FileNameEv @ 292 NONAME
+	_ZNK18TApaAppServiceInfo10OpaqueDataEv @ 293 NONAME
+	_ZNK18TApaAppServiceInfo3UidEv @ 294 NONAME
+	_ZNK18TApaAppServiceInfo9DataTypesEv @ 295 NONAME
+	_ZNK18TApaPictureFactory11NewPictureLER14TPictureHeaderRK12CStreamStore @ 296 NONAME
+	_ZNK19CApaWindowGroupName10IsAppReadyEv @ 297 NONAME
+	_ZNK19CApaWindowGroupName14DocNameIsAFileEv @ 298 NONAME
+	_ZNK19CApaWindowGroupName15WindowGroupNameEv @ 299 NONAME
+	_ZNK19CApaWindowGroupName18SetWindowGroupNameER12RWindowGroup @ 300 NONAME
+	_ZNK19CApaWindowGroupName23RespondsToShutdownEventEv @ 301 NONAME
+	_ZNK19CApaWindowGroupName26RespondsToSwitchFilesEventEv @ 302 NONAME
+	_ZNK19CApaWindowGroupName6AppUidEv @ 303 NONAME
+	_ZNK19CApaWindowGroupName6HiddenEv @ 304 NONAME
+	_ZNK19CApaWindowGroupName6IsBusyEv @ 305 NONAME
+	_ZNK19CApaWindowGroupName7CaptionEv @ 306 NONAME
+	_ZNK19CApaWindowGroupName7DocNameEv @ 307 NONAME
+	_ZNK19CApaWindowGroupName8IsSystemEv @ 308 NONAME
+	_ZNK21CApaSystemControlList5CountEv @ 309 NONAME
+	_ZNK21CApaSystemControlList5IndexE4TUid @ 310 NONAME
+	_ZNK21CApaSystemControlList7ControlE4TUid @ 311 NONAME
+	_ZNK21CApaSystemControlList7ControlEi @ 312 NONAME
+	_ZNK27CDataRecognitionResultArray12GetFileNameLER4TBufILi256EEj @ 313 NONAME
+	_ZNK27CDataRecognitionResultArray25GetDataRecognitionResultLER22TDataRecognitionResultj @ 314 NONAME
+	_ZNK27CDataRecognitionResultArray4PathEv @ 315 NONAME
+	_ZNK27CDataRecognitionResultArray5CountEv @ 316 NONAME
+	_ZNK8CApaDoor7AppUidLEv @ 317 NONAME
+	_ZNK8TApaTask4WgIdEv @ 318 NONAME
+	_ZNK8TApaTask6ExistsEv @ 319 NONAME
+	_ZNK8TApaTask8ThreadIdEv @ 320 NONAME
+	_ZN17CApaSecurityUtils16CheckAppSecurityERK7TPtrC16RiS3_ @ 321 NONAME
+	_ZN11CApaAppList22AddForcedRegistrationLERK7TDesC16 @ 322 NONAME ABSENT
+	_ZN11CApaAppList23AddCustomAppInfoInListLE4TUid9TLanguageRK7TDesC16 @ 323 NONAME
+	_ZN11CApaAppList28UpdateAppListByShortCaptionLEv @ 324 NONAME
+	_ZN11CApaAppList4NewLER3RFsii @ 325 NONAME
+	_ZN11TApaAppInfo12InternalizeLER11RReadStream @ 326 NONAME
+	_ZN11TApaAppInfoC1E4TUidRK4TBufILi256EES4_ @ 327 NONAME
+	_ZN11TApaAppInfoC1E4TUidRK4TBufILi256EES4_S4_ @ 328 NONAME
+	_ZN11TApaAppInfoC1Ev @ 329 NONAME
+	_ZN11TApaAppInfoC2E4TUidRK4TBufILi256EES4_ @ 330 NONAME
+	_ZN11TApaAppInfoC2E4TUidRK4TBufILi256EES4_S4_ @ 331 NONAME
+	_ZN11TApaAppInfoC2Ev @ 332 NONAME
+	_ZN12TApaAppEntryC1Ev @ 333 NONAME
+	_ZN12TApaAppEntryC2Ev @ 334 NONAME
+	_ZN15TApaAppViewInfo12InternalizeLER11RReadStream @ 335 NONAME
+	_ZN15TApaAppViewInfoC1E4TUidRK4TBufILi256EEi @ 336 NONAME
+	_ZN15TApaAppViewInfoC1Ev @ 337 NONAME
+	_ZN15TApaAppViewInfoC2E4TUidRK4TBufILi256EEi @ 338 NONAME
+	_ZN15TApaAppViewInfoC2Ev @ 339 NONAME
+	_ZN17TApaAppCapability12InternalizeLER11RReadStream @ 340 NONAME
+	_ZN17TApaAppCapability14CopyCapabilityER5TDes8RK6TDesC8 @ 341 NONAME
+	_ZN17TApaAppIdentifier12InternalizeLER11RReadStream @ 342 NONAME
+	_ZN17TApaAppIdentifierC1E4TUidRK4TBufILi256EE @ 343 NONAME
+	_ZN17TApaAppIdentifierC1Ev @ 344 NONAME
+	_ZN17TApaAppIdentifierC2E4TUidRK4TBufILi256EE @ 345 NONAME
+	_ZN17TApaAppIdentifierC2Ev @ 346 NONAME
+	_ZN18TApaAppServiceInfo12InternalizeLER11RReadStream @ 347 NONAME
+	_ZN18TApaAppServiceInfo7ReleaseEv @ 348 NONAME
+	_ZN18TApaAppServiceInfo9DataTypesEv @ 349 NONAME
+	_ZN18TApaAppServiceInfoC1E4TUidP13CArrayFixFlatI21TDataTypeWithPriorityEP6HBufC8 @ 350 NONAME
+	_ZN18TApaAppServiceInfoC1Ev @ 351 NONAME
+	_ZN18TApaAppServiceInfoC2E4TUidP13CArrayFixFlatI21TDataTypeWithPriorityEP6HBufC8 @ 352 NONAME
+	_ZN18TApaAppServiceInfoC2Ev @ 353 NONAME
+	_ZN23CApaAppServiceInfoArray33CApaAppServiceInfoArray_Reserved1Ev @ 354 NONAME
+	_ZN23CApaAppServiceInfoArray33CApaAppServiceInfoArray_Reserved2Ev @ 355 NONAME
+	_ZN23CApaAppServiceInfoArrayC2Ev @ 356 NONAME
+	_ZN23TApaEmbeddabilityFilter16AddEmbeddabilityEN17TApaAppCapability14TEmbeddabilityE @ 357 NONAME
+	_ZN23TApaEmbeddabilityFilterC1Ev @ 358 NONAME
+	_ZN23TApaEmbeddabilityFilterC2Ev @ 359 NONAME
+	_ZNK11TApaAppInfo12ExternalizeLER12RWriteStream @ 360 NONAME
+	_ZNK15TApaAppViewInfo12ExternalizeLER12RWriteStream @ 361 NONAME
+	_ZNK17TApaAppCapability12ExternalizeLER12RWriteStream @ 362 NONAME
+	_ZNK17TApaAppIdentifier12ExternalizeLER12RWriteStream @ 363 NONAME
+	_ZNK18TApaAppServiceInfo12ExternalizeLER12RWriteStream @ 364 NONAME
+	_ZNK23TApaEmbeddabilityFilter20MatchesEmbeddabilityEN17TApaAppCapability14TEmbeddabilityE @ 365 NONAME
+	_ZTI11CApaAppData @ 366 NONAME
+	_ZTI11CApaAppList @ 367 NONAME
+	_ZTI12CApaAppEntry @ 368 NONAME
+	_ZTI13RApaLsSession @ 369 NONAME
+	_ZTI15CApaAppViewData @ 370 NONAME
+	_ZTI15CApaIconPicture @ 371 NONAME
+	_ZTI16CApaMaskedBitmap @ 372 NONAME
+	_ZTI17CApaAppInfoReader @ 373 NONAME
+	_ZTI17CApaSystemControl @ 374 NONAME
+	_ZTI18TApaPictureFactory @ 375 NONAME
+	_ZTI19CApaAppListNotifier @ 376 NONAME
+	_ZTI19CApaWindowGroupName @ 377 NONAME
+	_ZTI21CApaSystemControlList @ 378 NONAME
+	_ZTI23CApaAppServiceInfoArray @ 379 NONAME
+	_ZTI23MApaAppListServObserver @ 380 NONAME
+	_ZTI27CDataRecognitionResultArray @ 381 NONAME
+	_ZTI33CApaLocalisableResourceFileWriter @ 382 NONAME
+	_ZTI34CApaRegistrationResourceFileWriter @ 383 NONAME
+	_ZTI7HBufBuf @ 384 NONAME
+	_ZTI8CApaDoor @ 385 NONAME
+	_ZTIN26CApaResourceFileWriterBase11RBufferSinkE @ 386 NONAME
+	_ZTV11CApaAppData @ 387 NONAME
+	_ZTV11CApaAppList @ 388 NONAME
+	_ZTV12CApaAppEntry @ 389 NONAME
+	_ZTV13RApaLsSession @ 390 NONAME
+	_ZTV15CApaAppViewData @ 391 NONAME
+	_ZTV15CApaIconPicture @ 392 NONAME
+	_ZTV16CApaMaskedBitmap @ 393 NONAME
+	_ZTV17CApaAppInfoReader @ 394 NONAME
+	_ZTV17CApaSystemControl @ 395 NONAME
+	_ZTV18TApaPictureFactory @ 396 NONAME
+	_ZTV19CApaAppListNotifier @ 397 NONAME
+	_ZTV19CApaWindowGroupName @ 398 NONAME
+	_ZTV21CApaSystemControlList @ 399 NONAME
+	_ZTV23CApaAppServiceInfoArray @ 400 NONAME
+	_ZTV23MApaAppListServObserver @ 401 NONAME
+	_ZTV27CDataRecognitionResultArray @ 402 NONAME
+	_ZTV33CApaLocalisableResourceFileWriter @ 403 NONAME
+	_ZTV34CApaRegistrationResourceFileWriter @ 404 NONAME
+	_ZTV7HBufBuf @ 405 NONAME
+	_ZTV8CApaDoor @ 406 NONAME
+	_ZTVN26CApaResourceFileWriterBase11RBufferSinkE @ 407 NONAME
+	_ZN11CApaAppData11SetCaptionLERK7TDesC16 @ 408 NONAME
+	_ZN11CApaAppData9SetIconsLERK7TDesC16i @ 409 NONAME
+	_ZN11CApaAppList36UpdateAppListByIconCaptionOverridesLEv @ 410 NONAME
+	_ZN13RApaLsSession40ForceCommitNonNativeApplicationsUpdatesLEv @ 411 NONAME
+	_ZN31TIconLoaderAndIconArrayForLeaks25TestIconCaptionOverridesLEv @ 412 NONAME
+	_ZN11CApaAppList20AppListUpdatePendingEv @ 413 NONAME ABSENT
+	_ZNK13RApaLsSession13RecognizeDataERK6TDesC8R22TDataRecognitionResult @ 414 NONAME
+	_ZN11CApaAppList19UninstalledAppArrayEv @ 415 NONAME
+	_ZN11CApaAppData4NewLERKN4Usif28CApplicationRegistrationDataER3RFsRKNS0_26RSoftwareComponentRegistryE @ 416 NONAME
+	_ZN11CApaAppList18InitializeApplistLEP19MApaAppListObserver @ 417 NONAME
+	_ZN11CApaAppList22FindAndAddSpecificAppLE4TUid @ 418 NONAME
+	_ZN13RApaLsSession14UpdateAppListLER6RArrayI17TApaAppUpdateInfoE @ 419 NONAME
+		_ZN17TApaAppUpdateInfo12InternalizeLER11RReadStream @ 420 NONAME
+	_ZN17TApaAppUpdateInfoC1Ev @ 421 NONAME
+	_ZN17TApaAppUpdateInfoC2Ev @ 422 NONAME
+	_ZNK17TApaAppUpdateInfo12ExternalizeLER12RWriteStream @ 423 NONAME
+	_ZN17TApaAppUpdateInfoC1E4TUidNS_13TApaAppActionE @ 424 NONAME
+	_ZN17TApaAppUpdateInfoC2E4TUidNS_13TApaAppActionE @ 425 NONAME
+	_ZN11CApaAppData19IsLangChangePendingEv @ 426 NONAME
+	_ZN11CApaAppList14UpdateApplistLEP19MApaAppListObserverP6RArrayI17TApaAppUpdateInfoE4TUid @ 427 NONAME
+	_ZN11CApaAppList15UpdatedAppsInfoEv @ 428 NONAME
+	_ZN11CApaAppList28UpdateApplistByForceRegAppsLER13RPointerArrayIN4Usif28CApplicationRegistrationDataEE @ 429 NONAME
+	_ZN13RApaLsSession16UpdatedAppsInfoLER6RArrayI17TApaAppUpdateInfoE @ 430 NONAME
+	_ZN13RApaLsSession17ForceRegistrationERK13RPointerArrayIN4Usif28CApplicationRegistrationDataEE @ 431 NONAME
+
--- a/appfw/apparchitecture/group/BLD.INF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,635 +0,0 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Application architecture
-// 
-//
-
-/**
- @file
- @test
-*/
-
-
-PRJ_PLATFORMS
-WINC DEFAULT
-
-
-PRJ_EXPORTS
-// specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-// If there's no destination then the source file will be copied
-// to the same name in \epoc32\include
-
-// Files from aincc.prj
-../inc/APACLN.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apacln.h)
-../inc/APACMDLN.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apacmdln.h)
-../inc/APADBASE.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apadbase.h)
-../inc/APADEF.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apadef.h)
-../inc/APAFLREC.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apaflrec.h)
-../inc/APAID.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apaid.h)
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-../inc/apaidpartner.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apaidpartner.h)
-#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
-../inc/APAMDR.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apamdr.h)
-../inc/APPARC.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apparc.h)
-../inc/apaapp.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apaapp.h)
-../inc/apadoc.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apadoc.h)
-../inc/apaproc.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apaproc.h)
-../inc/APASVST.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apasvst.h)
-../inc/ApaServerApp.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apaserverapp.h)
-
-// Files from fincc.prj
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/APFFNDR.H /epoc32/include/apffndr.h
-#endif
-../inc/APFREC.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apfrec.h)
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/APFDEF.H /epoc32/include/apfdef.h
-#endif
-../inc/APFCTLF.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apfctlf.h)
-../inc/APRuleBased.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(aprulebased.h)
-../inc/ApLaunchChecker.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(aplaunchchecker.h)
-
-../inc/ApSidChecker.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apsidchecker.h)
-
-// Files from gincc.prj
-../inc/APGAPLST.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apgaplst.h)
-../inc/APGCLI.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgcli.h)
-
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-../inc/apgupdate.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgupdate.h)
-#endif
-
-../inc/APGDOOR.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgdoor.h)
-../inc/APGICNFL.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgicnfl.h)
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-../inc/apgicnflpartner.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apgicnflpartner.h)
-#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
-../inc/APGTASK.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgtask.h)
-../inc/APGWGNAM.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgwgnam.h)
-../inc/APSSCAN.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apsscan.h)
-../inc/APGCTL.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgctl.h)
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-../inc/apgctllist.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apgctllist.h)
-#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
-../inc/apgnotif.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apgnotif.h)
-../inc/Apcaptionfile.rh SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apcaptionfile.rh)
-
-../inc/apfmimecontentpolicy.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apfmimecontentpolicy.h)
-
-// Service registry
-../inc/ServiceRegistry.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(serviceregistry.h)
-
-../inc/AppInfo.rh /epoc32/include/appinfo.rh
-
-../group/apparc.iby /epoc32/rom/include/apparc.iby
-
-// File from ..\inc (which is relocated from app-framework\aiftool\inc)
-../inc/AIFTOOL.RH /epoc32/include/aiftool.rh
-
-//Backup and restore exports
-../group/backup_registration.xml	/epoc32/data/z/private/10003a3f/backup_registration.xml
-../group/backup_registration.xml	/epoc32/release/winscw/urel/z/private/10003a3f/backup_registration.xml
-../group/backup_registration.xml	/epoc32/release/winscw/udeb/z/private/10003a3f/backup_registration.xml
-
-// ConfML files
-../conf/apparchitecture.confml          		MW_LAYER_EXPORTS_CONFML(apparchitecture.confml)
-../conf/apparchitecture_1028583d.crml   		MW_LAYER_EXPORTS_CRML(apparchitecture_1028583d.crml)
-../conf/apparchitecture_closedcontentextinfo.confml          		MW_LAYER_EXPORTS_CONFML(apparchitecture_closedcontentextinfo.confml)
-../conf/apparchitecture_closedcontentextinfo_10003a3f.crml   		MW_LAYER_EXPORTS_CRML(apparchitecture_closedcontentextinfo_10003a3f.crml)
-
-PRJ_MMPFILES
-
-../group/APPARC.MMP
-../group/APGRFX.MMP
-../group/APLIST.MMP
-../group/APFILE.MMP
-../group/APSERV.MMP
-../group/APSEXE.MMP
-../group/ServiceRegistry.mmp
-
-#ifndef SYMBIAN_SYSTEM_STATE_MANAGEMENT
-../apstart/apstart.mmp
-#endif //SYMBIAN_SYSTEM_STATE_MANAGEMENT
-
-
-PRJ_TESTMMPFILES
-// specify the .mmp files required for building any test programs here
-//
-// you can specify "manual" to denote that a test should be listed in a generated
-// batch file for running a group of tests which require user input during testing.
-// you can specify "support" to denote that a file is a test support file and shouldn't
-// be listed in a batch file for running a group of tests
-// By default, each test will be listed in a batch file for running a group of tests
-// which can be left to run without requiring watching over by the person running the tests,
-// i.e. tests where no user input is required.  The default will apply if neither "manual"
-// or "support" is specified.
-../tef/apparctestserver.MMP
-
-../tef/TAppInstall/TestAppInstall.mmp
-../tef/CustomiseDefaultIconApp.mmp	support
-../tef/TCtrlPnlApp.mmp	support
-../tef/T_DataPrioritySystem3.mmp	support
-../tef/T_groupname.mmp	support
-../tef/T_groupname_ver1.mmp	support
-../tef/T_groupname_ver2.mmp	support
-../tef/TestTrustedPriorityApp1.mmp	support
-../tef/TestTrustedPriorityApp2.mmp	support
-../tef/TestUnTrustedPriorityApp1.mmp support
-../tef/TestUnTrustedPriorityApp2.mmp support
-../tef/openservice1app.mmp	support
-../tef/openservice2app.mmp	support
-../tef/serverapp.mmp	support
-../tef/serverapp2.mmp	support
-../tef/serverapp3.mmp	support
-../tef/serverapp4.mmp	support
-../tef/serverapp6.mmp	support
-../tef/serverapp7.mmp	support
-../tef/SimpleApparcTestApp.mmp	support
-../tef/zerosizedicontestapp.mmp	support
-../tef/TAppNotEmbeddable_v2.mmp support
-../tef/TAppEmbeddable_embedded.mmp support
-../tef/TAppEmbeddable_standalone.mmp support
-../tef/TAppEmbeddableOnly_v2.mmp support
-../tef/TAppEmbeddableUiOrStandAlone_embedded.mmp support
-../tef/TAppEmbeddableUiOrStandalone_standalone.mmp support
-../tef/TAppEmbeddableUiNotStandAlone_v2.mmp support
-../tef/TStartDocApp_v2.mmp support
-../tef/t_winchainChild.mmp support
-../tef/t_winchainLaunch.mmp support
-../tef/TRApaLsSessionStartAppTestApp_v2.mmp support
-../tef/tRuleBasedApps/tRuleBasedApp1.mmp support
-../tef/tRuleBasedApps/tRuleBasedApp2.mmp support
-../tef/tRuleBasedApps/tRuleBasedApp3.mmp support
-../tef/tRuleBasedApps/tRuleBasedApp4.mmp support
-../tef/TApparcTestApp.mmp support
-../tef/app_CTRL.MMP
-../tef/T_EnvSlots/T_EnvSlots.MMP
-../tef/ParentProcess.mmp
-../tef/ChildI.mmp
-../tef/ChildII.mmp
-../tef/ChildIII.mmp
-../tef/T_DataPrioritySystem1/T_DataPrioritySystem1.MMP
-../tef/T_DataPrioritySystem2/T_DataPrioritySystem2.MMP
-../tef/TNonNative/TNNApp1.mmp
-../tef/TNonNative/TNNApp2.mmp
-
-#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-../tef/TSidChecker/TestSidChecker.mmp
-#endif
-
-../tef/TEndTaskTestApp/EndTaskTestApp.mmp
-../tef/tlargestack/tlargestackapp.mmp
-../tef/UnProctectedUidApp.mmp	support
-../tef/tupgradeiconapp/tupgradeiconapp.mmp
-../tef/tnotifydrivesapp/tnotifydrivesapp.mmp
-../tef/ticoncaptionoverride.mmp
-../tef/testapp/testforceregistrationapp1/testforceregistrationapp1.mmp
-
-// testupdregappuninstallation is used in t_serviceregistry test. If any changes done to
-// this application, uncomment testupdregappuninstallation.mmp file and build it.
-// Then comment it and copy the testupdregappuninstallation_reg.rsc file to ..\tdata folder.
-// Delete any testupdregappuninstallation* files from epoc32 directory.
-//../tef/testapp/testupdregappuninstallation/testupdregappuninstallation.mmp
-
-// testupgradeupdregappuninstallation is used in t_serviceregistry test. If any changes done to
-// this application, uncomment testupdregappuninstallation.mmp file and build it.
-// Then comment it and copy the testupgradeupdregappuninstallation_reg.rsc file to ..\tdata folder.
-// Delete any testupdregappuninstallation* files from epoc32 directory.
-//../tef/testapp/testupgradeupdregappuninstallation/testupgradeupdregappuninstallation.mmp
-
-
-//plugins
-../tef/TNonNativeAppLaunchChecker.mmp support
-../tef/TAppLaunchChecker.mmp support
-../tef/TAppLaunchChecker2.mmp support
-../tef/TESTREC/TESTREC.MMP
-../tef/TBufferOnlyRec/TBufferOnlyRec.mmp
-../tef/TMimeRec/recmime.MMP
-//  RecMime_1 binaries are used to install and uninstall the mime type recognizer during runtime in TRApaLsSessionTestStep.
-//../tef/TMimeRec1/RecMime_1.MMP
-
-
-../tef/m_ctrl_v2.mmp	support
-../tef/m_ctrl_v2_Stub.mmp
-../tef/TSTAPP_embedded.MMP 	support
-../tef/TCmdLineExe.mmp 	support
-../tef/app_CTRL2.MMP
-../tef/app_CTRL2_stub.MMP
-../tef/tssaac/tssaac.mmp
-../tef/tssaac/tssaac_tapp.mmp
-../tef/TEXE_V2.MMP 	support
-
-
-../tef/TSTAPP_standalone.MMP	support
-../tef/TSTAPP_standalone_Stub.MMP
-../tef/TNonNative/TNonNativeRec.mmp
-../tef/TLongUrlRecognizer_v2.mmp support
-../tef/TRApaLsSessionStartAppTestRecognizer_v2.mmp support
-
-../tef/TIconLoaderAndIconArrayForLeaks.mmp
-
-../tef/TRecUpgrade/recupgrade.mmp
-../tef/refnativeplugin/refnativeplugin.mmp
-
-//*****************************************************************************************************************************************************************************************************
-//recupgrade_1 plug-in is used to upgrade the mime type recognizer during runtime in T_RecUpgrade test.  
-//              It is build for armv5 and rename to recupgrade_armv5_rel.dll and copied to apparc\Tdata before actual code builds.  If you are making any change in recupgrade_1.cpp then uncomment 
-//              “recupgrade_1.MMP” , build , rename (.dll) and copy as mentioned above .
-//*****************************************************************************************************************************************************************************************************
-//../tef/TRecUpgrade_1/recupgrade_1.MMP
-
-
-// ***************************************************************************************************************************************************************************************************
-// recupgrade_2 plug-in is used to upgrade the mime type recognizer during runtime in T_RecUpgrade test.  
-//              It is build for armv5 and rename to recupgrade2_armv5_rel.dll and copied to apparc\Tdata before actual code builds.  If you are making any change in recupgrade_2.cpp then uncomment 
-//              “recupgrade_2.MMP” , build , rename (.dll) and copy as mentioned above .
-// ***************************************************************************************************************************************************************************************************
-//../tef/TRecUpgrade_2/recupgrade_2.MMP
-
-
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-../tef/forceregapps/forceregapp1.mmp
-../tef/forceregapps/forceregapp2.mmp
-../tef/forceregapps/TForceRegAppRec.mmp
-../tef/tnonnativeruntime/tnonnativeruntime.mmp
-#endif
-
-makefile ../tef/testpkg/preparesis.fil
-makefile ../tef/testpkg/preparesis_stub.fil
-
-PRJ_TESTEXPORTS
-
-#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-../group/apparcTest.iby /epoc32/rom/include/apparctest.iby
-#else
-../group/apparcTest_new.iby /epoc32/rom/include/apparctest.iby
-#endif
-
-
-../tef/scripts/hardware/apparctest_run.bat                  z:/apparctest/apparctest_run.bat
-../tef/scripts/emulator/apparctest_run.bat                  /epoc32/release/winscw/udeb/apparctest_run.bat
-../tef/scripts/emulator/apparctest_run.bat                  /epoc32/release/winscw/urel/apparctest_run.bat
-
-
-../tef/scripts/apparctest_T_AppList.script            		z:/apparctest/apparctest_t_applist.script
-../tef/scripts/apparctest_T_AppListFile_Boot1.script		z:/apparctest/apparctest_t_applistfile_boot1.script
-../tef/scripts/apparctest_T_AppListFile_Boot2.script		z:/apparctest/apparctest_t_applistfile_boot2.script
-../tef/scripts/apparctest_T_AppListFile_Boot3.script		z:/apparctest/apparctest_t_applistfile_boot3.script
-../tef/scripts/apparctest_T_AppListFileUpdate.script		z:/apparctest/apparctest_t_applistfileupdate.script
-../tef/scripts/apparctest_t_ApsScan.script            		z:/apparctest/apparctest_t_apsscan.script
-../tef/scripts/apparctest_T_AutoMMCReaderOpen.script  		z:/apparctest/apparctest_t_autommcreaderopen.script
-../tef/scripts/apparctest_T_Backup.script             		z:/apparctest/apparctest_t_backup.script
-../tef/scripts/apparctest_T_Capability1.script        		z:/apparctest/apparctest_t_capability1.script
-../tef/scripts/apparctest_T_Capability2.script        		z:/apparctest/apparctest_t_capability2.script
-../tef/scripts/apparctest_T_DataTypeMappingWithSid.script  z:/apparctest/apparctest_t_datatypemappingwithsid.script
-../tef/scripts/apparctest_T_Caption.script            		z:/apparctest/apparctest_t_caption.script
-../tef/scripts/apparctest_T_Cmdln.script              		z:/apparctest/apparctest_t_cmdln.script
-../tef/scripts/apparctest_T_ControlPanelTest.script   		z:/apparctest/apparctest_t_controlpaneltest.script
-../tef/scripts/apparctest_T_DataMappingPersistenceA.script	z:/apparctest/apparctest_t_datamappingpersistencea.script
-../tef/scripts/apparctest_T_DataMappingPersistenceB.script	z:/apparctest/apparctest_t_datamappingpersistenceb.script
-../tef/scripts/apparctest_T_DataMappingPersistenceC.script	z:/apparctest/apparctest_t_datamappingpersistencec.script
-../tef/scripts/apparctest_T_EndTask.script                	z:/apparctest/apparctest_t_endtask.script
-../tef/scripts/apparctest_T_Exe.script                		z:/apparctest/apparctest_t_exe.script
-../tef/scripts/apparctest_t_File2.script               		z:/apparctest/apparctest_t_file2.script
-../tef/scripts/apparctest_T_File3.script               		z:/apparctest/apparctest_t_file3.script
-../tef/scripts/apparctest_T_Foreground.script         		z:/apparctest/apparctest_t_foreground.script
-../tef/scripts/apparctest_T_GroupName.script          		z:/apparctest/apparctest_t_groupname.script
-../tef/scripts/apparctest_T_GroupName_ver1.script     		z:/apparctest/apparctest_t_groupname_ver1.script
-../tef/scripts/apparctest_T_GroupName_ver2.script     		z:/apparctest/apparctest_t_groupname_ver2.script
-../tef/scripts/apparctest_T_Locale.script             		z:/apparctest/apparctest_t_locale.script
-../tef/scripts/apparctest_T_Mdr.script                		z:/apparctest/apparctest_t_mdr.script
-../tef/scripts/apparctest_t_mimecontentpolicy.script		z:/apparctest/apparctest_t_mimecontentpolicy.script
-../tef/scripts/apparctest_T_Mru.script                		z:/apparctest/apparctest_t_mru.script
-../tef/scripts/apparctest_t_NonNativeApps.script  			z:/apparctest/apparctest_t_nonnativeapps.script
-../tef/scripts/apparctest_T_Notif.script              		z:/apparctest/apparctest_t_notif.script
-../tef/scripts/apparctest_T_OOM.script                		z:/apparctest/apparctest_t_oom.script
-../tef/scripts/apparctest_T_Pro.script                		z:/apparctest/apparctest_t_pro.script
-../tef/scripts/apparctest_T_Proc.script               		z:/apparctest/apparctest_t_proc.script
-../tef/scripts/apparctest_T_RApaLsSession.script      		z:/apparctest/apparctest_t_rapalssession.script
-../tef/scripts/apparctest_T_RuleBasedLaunching.script 		z:/apparctest/apparctest_t_rulebasedlaunching.script
-../tef/scripts/apparctest_T_Serv2.script              		z:/apparctest/apparctest_t_serv2.script
-../tef/scripts/apparctest_T_Serv3.script              		z:/apparctest/apparctest_t_serv3.script
-../tef/scripts/apparctest_T_ServiceRegistry.script    		z:/apparctest/apparctest_t_serviceregistry.script
-../tef/scripts/apparctest_T_Services.script           		z:/apparctest/apparctest_t_services.script
-../tef/scripts/apparctest_T_StartApp.script           		z:/apparctest/apparctest_t_startapp.script
-../tef/scripts/apparctest_T_StartDoc.script           		z:/apparctest/apparctest_t_startdoc.script
-../tef/scripts/apparctest_T_WindowChaining.script     		z:/apparctest/apparctest_t_windowchaining.script
-../tef/scripts/apparctest_T_Wgnam.script              		z:/apparctest/apparctest_t_wgnam.script
-../tef/scripts/apparctest_T_IntegritySupport.script			z:/apparctest/apparctest_t_integritysupport.script
-../tef/scripts/apparctest_T_IntegritySupportReboot1.script	z:/apparctest/apparctest_t_integritysupportreboot1.script
-../tef/scripts/apparctest_T_IntegritySupportReboot2.script	z:/apparctest/apparctest_t_integritysupportreboot2.script
-../tef/scripts/apparctest_t_largestack.script				z:/apparctest/apparctest_t_largestack.script
-../tef/scripts/apparctest_t_drivenotification.script		z:/apparctest/apparctest_t_drivenotification.script
-../tef/scripts/apparctest_t_servicebase.script				z:/apparctest/apparctest_t_servicebase.script
-../tef/scripts/apparctest_t_RecUpgrade.script         		z:/apparctest/apparctest_t_recupgrade.script
-
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-../tef/scripts/apparctest_t_UpdateAppList.script			z:/apparctest/apparctest_t_updateapplist.script
-../tef/scripts/apparctest_t_forcereg.script					z:/apparctest/apparctest_t_forcereg.script
-../tef/scripts/apparctest_t_clientnotif.script				z:/apparctest/apparctest_t_clientnotif.script
-../tef/scripts/apparctest_t_nonnativetest.script			z:/apparctest/apparctest_t_nonnativetest.script
-#endif
-
-//SysStart Apparc Scripts
-../tef/scripts/apparctest_T_TestStartApp1L.script			z:/apparctest/apparctest_t_teststartapp1l.script		
-../tef/scripts/apparctest_T_TestStartApp2L.script			z:/apparctest/apparctest_t_teststartapp2l.script		
-../tef/scripts/apparctest_T_TestStartApp3L.script			z:/apparctest/apparctest_t_teststartapp3l.script		
-../tef/scripts/apparctest_T_TestStartApp4L.script			z:/apparctest/apparctest_t_teststartapp4l.script		
-../tef/scripts/apparctest_T_TestStartApp5L.script			z:/apparctest/apparctest_t_teststartapp5l.script		
-../tef/scripts/apparctest_T_TestStartApp6L.script			z:/apparctest/apparctest_t_teststartapp6l.script		
-../tef/scripts/apparctest_T_TestGetAllApps.script     		z:/apparctest/apparctest_t_testgetallapps.script     	
-../tef/scripts/apparctest_T_TestInsertDataTypeL.script		z:/apparctest/apparctest_t_testinsertdatatypel.script	
-../tef/scripts/apparctest_T_TestAppForDataTypeL.script		z:/apparctest/apparctest_t_testappfordatatypel.script	
-../tef/scripts/apparctest_T_TestDeleteDataTypeL.script		z:/apparctest/apparctest_t_testdeletedatatypel.script	
-../tef/scripts/apparctest_T_TestServiceDiscovery.script		z:/apparctest/apparctest_t_testservicediscovery.script	
-../tef/scripts/apparctest_T_TestGetAppInfo.script     		z:/apparctest/apparctest_t_testgetappinfo.script     	
-../tef/scripts/apparctest_T_TestAppCount.script		        z:/apparctest/apparctest_t_testappcount.script		
-../tef/scripts/apparctest_T_TestCreateDoc.script      		z:/apparctest/apparctest_t_testcreatedoc.script      	
-../tef/scripts/apparctest_T_TestLocalisedCaptionL.script	z:/apparctest/apparctest_t_testlocalisedcaptionl.script
-
-
-
-
-// SysStart batch files for hardware test execution
-../tef/tssaac/scripts/hardware/sysstart_apparc_run.bat				/epoc32/data/z/apparctest/sysstart_apparc_run.bat
-../tef/tssaac/scripts/hardware/sysstart_apparc_buildrom.bat			/epoc32/data/z/apparctest/sysstart_apparc_buildrom.bat
-../tef/tssaac/scripts/hardware/sysstart_apparc_checkEpocWind.bat	/epoc32/data/z/apparctest/sysstart_apparc_checkepocwind.bat
-../tef/tssaac/scripts/hardware/sysstart_apparc_insertlog.pl			/epoc32/data/z/apparctest/sysstart_apparc_insertlog.pl
-// WINSCW UDEB
-../tef/tssaac/scripts/emulator/sysstart_apparc_run.bat				/epoc32/release/winscw/udeb/sysstart_apparc_run.bat 
-../tef/tssaac/scripts/emulator/sysstart_apparc_setup.bat			/epoc32/release/winscw/udeb/z/apparctest/sysstart_apparc_setup.bat
-../tef/tssaac/scripts/emulator/sysstart_apparc_checkEpocWind.bat	/epoc32/release/winscw/udeb/z/apparctest/sysstart_apparc_checkepocwind.bat
-// WINSCW UREL
-../tef/tssaac/scripts/emulator/sysstart_apparc_run.bat				/epoc32/release/winscw/urel/sysstart_apparc_run.bat 
-../tef/tssaac/scripts/emulator/sysstart_apparc_setup.bat			/epoc32/release/winscw/urel/z/apparctest/sysstart_apparc_setup.bat
-../tef/tssaac/scripts/emulator/sysstart_apparc_checkEpocWind.bat	/epoc32/release/winscw/urel/z/apparctest/sysstart_apparc_checkepocwind.bat
-
-../tef/tupgradeiconapp/tupgradeiconapp.mbm					/epoc32/release/winscw/udeb/z/apparctestregfiles/tupgradeiconapp.mbm
-
-// epoc32\data
-
-// export certificates for creating sis files
-../tef/testpkg/Nokia_RnDCert_02.der							/epoc32/tools/Nokia_RnDCert_02.der
-../tef/testpkg/Nokia_RnDCert_02.key							/epoc32/tools/Nokia_RnDCert_02.key
-../tef/testpkg/swicertstore.dat								/epoc32/release/winscw/udeb/z/resource/swicertstore.dat
-
-
-#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-../tef/tstnnapp.mbm											/epoc32/data/z/resource/apps/tstnnapp.mbm
-../tdata/AAA_reg.Rsc 										/epoc32/data/z/apparctest/aaa_reg.rsc
-#endif
-
-../tdata/forcegtestapp1.frg1								/epoc32/data/z/apparctest/forcegtestapp1.frg1
-../tdata/forcegtestapp2.frg2								/epoc32/data/z/apparctest/forcegtestapp2.frg2
-../tdata/scr_test.db										/epoc32/data/z/apparctest/scr_test.db
-
-../tef/tstappviewneg.mbm									/epoc32/data/z/resource/apps/tstappviewneg.mbm
-../tef/App_ctrl.MBM											/epoc32/release/winscw/udeb/z/apparctestregfiles/app_ctrl.mbm
-../tef/svg_icon.svg											/epoc32/release/winscw/udeb/z/apparctestregfiles/svg_icon.svg
-../tef/zerosizedicon.mbm									/epoc32/release/winscw/udeb/z/apparctestregfiles/zerosizedicon.mbm
-../tdata/Corrupted_reg.RSC									/epoc32/data/z/apparctest/corrupted_reg.rsc
-
-../tdata/testfile4.txt 										/epoc32/data/z/system/data/testpath/filtertests/testfile4.txt
-../tef/tstappviewneg.xyz									/epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.xyz
-../tef/tstappviewneg.xyz									/epoc32/data/z/resource/apps/tstappviewneg.xyz
-../tdata/GIF.NNA1 											/epoc32/data/z/private/101f289c/gif.nna1
-../tdata/HTML.NNA2 											/epoc32/data/z/private/101f289c/html.nna2
-../tdata/CONTACT.NNA3 										/epoc32/data/z/private/101f289c/contact.nna3
-../tdata/TXT.NNA4 											/epoc32/data/z/private/101f289c/txt.nna4
-../tdata/TSTAPPU.DOC 										/epoc32/data/z/system/data/tstapp.doc
-../tdata/zero_len.txt 										/epoc32/data/z/system/data/zero_len.txt
-../tdata/one_byte.txt 										/epoc32/data/z/system/data/one_byte.txt
-../tdata/TRApaLsSessionStartAppTest.tst 					/epoc32/data/z/system/data/trapalssessionstartapptest.tst
-../tdata/file1.txt 											/epoc32/data/z/system/data/testpath/file1.txt
-../tdata/file2.txt 											/epoc32/data/z/system/data/testpath/file2.txt
-../tdata/testfile1.txt 										/epoc32/data/z/system/data/testpath/filtertests/testfile1.txt
-../tdata/testfile2.txt 										/epoc32/data/z/system/data/testpath/filtertests/testfile2.txt
-../tdata/testfile3.txt 										/epoc32/data/z/system/data/testpath/filtertests/testfile3.txt
-../tdata/FileWithUnknownMimeType.UnrecognisableExtention	/epoc32/data/z/system/data/filewithunknownmimetype.unrecognisableextention
-../tdata/TApsRecogAppTest.mmr								/epoc32/data/z/system/data/tapsrecogapptest.mmr
-
-../tdata/TApsRecogUpgradeTest.upg				/epoc32/data/z/system/data/tapsrecogupgradetest.upg
-../tdata/TApsRecogUpgradeTest.upr				/epoc32/data/z/system/data/tapsrecogupgradetest.upr
-../tdata/mimecontentpolicy/sd_goo.dcf			/epoc32/data/z/system/data/sd_goo.dcf
-../tdata/mimecontentpolicy/fl_goo.dm			/epoc32/data/z/system/data/fl_goo.dm
-../tdata/mimecontentpolicy/jpeg_wes.dm			/epoc32/data/z/system/data/jpeg_wes.dm
-../tdata/mimecontentpolicy/gif_wallpaper.gif	/epoc32/data/z/system/data/gif_wallpaper.gif
-../tdata/mimecontentpolicy/propelli.jpg	 		/epoc32/data/z/system/data/propelli.jpg
-../tdata/mimecontentpolicy/type-r.jpg			/epoc32/data/z/system/data/type-r.jpg
-../tdata/1028583d.txt 							/epoc32/data/z/private/10202be9/1028583d.txt //test Central Repository initialisation file
-../tdata/10003a3f.txt 							/epoc32/data/z/private/10202be9/10003a3f.txt //Test repository file contains closed content and extension information
-
-
-// WINSCW UDEB
-// exporting db & certstore for winscw
-../tdata/scr.db										/epoc32/release/winscw/udeb/z/sys/install/scr/provisioned/scr.db
-
-#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-../tef/tstnnapp.mbm									/epoc32/release/winscw/udeb/z/resource/apps/tstnnapp.mbm
-../tef/App_ctrl.MBM											/epoc32/release/winscw/udeb/z/resource/apps/app_ctrl.mbm
-../tef/svg_icon.svg											/epoc32/release/winscw/udeb/z/resource/apps/svg_icon.svg
-../tdata/AAA_reg.Rsc 										/epoc32/release/winscw/udeb/z/apparctest/aaa_reg.rsc 
-../tdata/102081cf_reg.rsc									/epoc32/release/winscw/udeb/z/system/data/102081cf_reg.rsc
-../tdata/102081ce_reg.rsc									/epoc32/release/winscw/udeb/z/system/data/102081ce_reg.rsc
-../tdata/testupdregappuninstallation_reg.rsc			/epoc32/release/winscw/udeb/z/system/data/testupdregappuninstallation_reg.rsc
-../tdata/testupgradeupdregappuninstallation_reg.rsc			/epoc32/release/winscw/udeb/z/system/data/testupgradeupdregappuninstallation_reg.rsc
-../tef/zerosizedicon.mbm									/epoc32/release/winscw/udeb/z/apparctestregfiles/zerosizedicon.mbm
-../tef/tstappviewneg.xyz									/epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.xyz
-#endif
-
-../tdata/scr_test.db										/epoc32/release/winscw/udeb/z/apparctest/scr_test.db
-../tef/tstappviewneg.xyz									/epoc32/release/winscw/udeb/z/resource/apps/tstappviewneg.xyz
-../tef/tstappviewneg.mbm									/epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.mbm
-../tef/tstappviewneg.mbm									/epoc32/release/winscw/udeb/z/resource/apps/tstappviewneg.mbm
-../tdata/Corrupted_reg.RSC									/epoc32/release/winscw/udeb/z/apparctest/corrupted_reg.rsc
-
-../tdata/GIF.NNA1 											/epoc32/release/winscw/udeb/z/private/101f289c/gif.nna1
-../tdata/HTML.NNA2 											/epoc32/release/winscw/udeb/z/private/101f289c/html.nna2
-../tdata/CONTACT.NNA3 										/epoc32/release/winscw/udeb/z/private/101f289c/contact.nna3
-../tdata/TXT.NNA4 											/epoc32/release/winscw/udeb/z/private/101f289c/txt.nna4
-../tdata/TSTAPPU.DOC 										/epoc32/release/winscw/udeb/z/system/data/tstapp.doc
-../tdata/zero_len.txt 										/epoc32/release/winscw/udeb/z/system/data/zero_len.txt
-../tdata/one_byte.txt 										/epoc32/release/winscw/udeb/z/system/data/one_byte.txt
-../tdata/TRApaLsSessionStartAppTest.tst 					/epoc32/release/winscw/udeb/z/system/data/trapalssessionstartapptest.tst
-../tdata/file1.txt 											/epoc32/release/winscw/udeb/z/system/data/testpath/file1.txt
-../tdata/file2.txt 											/epoc32/release/winscw/udeb/z/system/data/testpath/file2.txt
-../tdata/testfile1.txt					 					/epoc32/release/winscw/udeb/z/system/data/testpath/filtertests/testfile1.txt
-../tdata/testfile2.txt									 	/epoc32/release/winscw/udeb/z/system/data/testpath/filtertests/testfile2.txt
-../tdata/testfile3.txt									 	/epoc32/release/winscw/udeb/z/system/data/testpath/filtertests/testfile3.txt
-../tdata/testfile4.txt 										/epoc32/release/winscw/udeb/z/system/data/testpath/filtertests/testfile4.txt
-../tdata/UpdatedAppsList.bin								/epoc32/release/winscw/udeb/z/system/data/updatedappslist.bin
-../tdata/FileWithUnknownMimeType.UnrecognisableExtention	/epoc32/release/winscw/udeb/z/system/data/filewithunknownmimetype.unrecognisableextention	
-../tdata/TApsRecogAppTest.mmr								/epoc32/release/winscw/udeb/z/system/data/tapsrecogapptest.mmr
-../tdata/recmime_1.rsc										/epoc32/release/winscw/udeb/z/system/data/recmime_1.rsc
-../tdata/recmime_winscw.dll									/epoc32/release/winscw/udeb/z/system/data/recmime_winscw.dll
-
-../tdata/mimecontentpolicy/sd_goo.dcf			/epoc32/release/winscw/udeb/z/system/data/sd_goo.dcf
-../tdata/mimecontentpolicy/fl_goo.dm			/epoc32/release/winscw/udeb/z/system/data/fl_goo.dm
-../tdata/mimecontentpolicy/jpeg_wes.dm			/epoc32/release/winscw/udeb/z/system/data/jpeg_wes.dm
-../tdata/mimecontentpolicy/gif_wallpaper.gif	/epoc32/release/winscw/udeb/z/system/data/gif_wallpaper.gif
-../tdata/mimecontentpolicy/propelli.jpg	 		/epoc32/release/winscw/udeb/z/system/data/propelli.jpg
-../tdata/mimecontentpolicy/type-r.jpg			/epoc32/release/winscw/udeb/z/system/data/type-r.jpg
-../tdata/1028583d.txt 							/epoc32/release/winscw/udeb/z/private/10202be9/1028583d.txt //test Central Repository initialisation file
-../tdata/10003a3f.txt 							/epoc32/release/winscw/udeb/z/private/10202be9/10003a3f.txt //Test repository file contains closed content and extension information
-
-
-// WINSCW UREL
-
-#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-../tef/tstnnapp.mbm											/epoc32/release/winscw/urel/z/resource/apps/tstnnapp.mbm
-../tef/App_ctrl.MBM											/epoc32/release/winscw/urel/z/resource/apps/app_ctrl.mbm
-../tef/svg_icon.svg											/epoc32/release/winscw/urel/z/resource/apps/svg_icon.svg
-../tdata/AAA_reg.Rsc 										/epoc32/release/winscw/urel/z/apparctest/aaa_reg.rsc 
-../tdata/Corrupted_reg.RSC									/epoc32/release/winscw/urel/z/apparctest/corrupted_reg.rsc
-../tdata/testupdregappuninstallation_reg.rsc				/epoc32/release/winscw/urel/z/system/data/testupdregappuninstallation_reg.rsc
-../tdata/testupgradeupdregappuninstallation_reg.rsc			/epoc32/release/winscw/urel/z/system/data/testupgradeupdregappuninstallation_reg.rsc
-../tef/zerosizedicon.mbm									/epoc32/release/winscw/udeb/z/apparctestregfiles/zerosizedicon.mbm
-../tef/tstappviewneg.xyz									/epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.xyz
-#endif
-
-../tef/tstappviewneg.mbm									/epoc32/release/winscw/urel/z/resource/apps/tstappviewneg.mbm
-../tef/tstappviewneg.xyz									/epoc32/release/winscw/urel/z/resource/apps/tstappviewneg.xyz
-../tdata/GIF.NNA1 											/epoc32/release/winscw/urel/z/private/101f289c/gif.nna1
-../tdata/HTML.NNA2 											/epoc32/release/winscw/urel/z/private/101f289c/html.nna2
-../tdata/CONTACT.NNA3 										/epoc32/release/winscw/urel/z/private/101f289c/contact.nna3
-../tdata/TXT.NNA4 											/epoc32/release/winscw/urel/z/private/101f289c/txt.nna4
-../tdata/TSTAPPU.DOC 										/epoc32/release/winscw/urel/z/system/data/tstapp.doc
-../tdata/zero_len.txt 										/epoc32/release/winscw/urel/z/system/data/zero_len.txt
-../tdata/one_byte.txt 										/epoc32/release/winscw/urel/z/system/data/one_byte.txt
-../tdata/TRApaLsSessionStartAppTest.tst 					/epoc32/release/winscw/urel/z/system/data/trapalssessionstartapptest.tst
-../tdata/file1.txt 											/epoc32/release/winscw/urel/z/system/data/testpath/file1.txt
-../tdata/file2.txt 											/epoc32/release/winscw/urel/z/system/data/testpath/file2.txt
-../tdata/testfile1.txt									 	/epoc32/release/winscw/urel/z/system/data/testpath/filtertests/testfile1.txt
-../tdata/testfile2.txt									 	/epoc32/release/winscw/urel/z/system/data/testpath/filtertests/testfile2.txt
-../tdata/testfile3.txt									 	/epoc32/release/winscw/urel/z/system/data/testpath/filtertests/testfile3.txt
-../tdata/testfile4.txt 										/epoc32/release/winscw/urel/z/system/data/testpath/filtertests/testfile4.txt
-../tdata/FileWithUnknownMimeType.UnrecognisableExtention	/epoc32/release/winscw/urel/z/system/data/filewithunknownmimetype.unrecognisableextention	
-../tdata/TApsRecogAppTest.mmr 								/epoc32/release/winscw/urel/z/system/data/tapsrecogapptest.mmr
-../tdata/recmime_1.rsc										/epoc32/release/winscw/urel/z/system/data/recmime_1.rsc
-../tdata/recmime_winscw.dll									/epoc32/release/winscw/urel/z/system/data/recmime_winscw.dll
-../tdata/mimecontentpolicy/sd_goo.dcf						/epoc32/release/winscw/urel/z/system/data/sd_goo.dcf
-../tdata/mimecontentpolicy/fl_goo.dm						/epoc32/release/winscw/urel/z/system/data/fl_goo.dm
-../tdata/mimecontentpolicy/jpeg_wes.dm						/epoc32/release/winscw/urel/z/system/data/jpeg_wes.dm
-../tdata/mimecontentpolicy/gif_wallpaper.gif				/epoc32/release/winscw/urel/z/system/data/gif_wallpaper.gif
-../tdata/mimecontentpolicy/propelli.jpg	 					/epoc32/release/winscw/urel/z/system/data/propelli.jpg
-../tdata/mimecontentpolicy/type-r.jpg						/epoc32/release/winscw/urel/z/system/data/type-r.jpg
-../tdata/1028583d.txt 										/epoc32/release/winscw/urel/z/private/10202be9/1028583d.txt //test Central Repository initialisation file
-../tdata/10003a3f.txt 										/epoc32/release/winscw/urel/z/private/10202be9/10003a3f.txt //Test repository file contains closed content and extension information
-
-
-// ARMV5 UDEB
-
-// exporting db & certstore for armv5 
-../tdata/scr.db										/epoc32/data/z/sys/install/scr/provisioned/scr.db
-../tef/testpkg/swicertstore.dat						/epoc32/data/z/resource/swicertstore.dat
-
-
-#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-../tef/tstnnapp.mbm									/epoc32/release/armv5/udeb/z/resource/apps/tstnnapp.mbm
-../tdata/AAA_reg.Rsc 										/epoc32/release/armv5/udeb/z/apparctest/aaa_reg.rsc 
-../tdata/Corrupted_reg.RSC									/epoc32/release/armv5/udeb/z/apparctest/corrupted_reg.rsc
-../tdata/testupdregappuninstallation_reg.rsc			/epoc32/release/armv5/udeb/z/system/data/testupdregappuninstallation_reg.rsc
-../tdata/testupgradeupdregappuninstallation_reg.rsc			/epoc32/release/armv5/udeb/z/system/data/testupgradeupdregappuninstallation_reg.rsc
-#endif
-../tef/tstappviewneg.mbm									/epoc32/release/armv5/udeb/z/resource/apps/tstappviewneg.mbm
-../tef/tstappviewneg.xyz									/epoc32/release/armv5/udeb/z/resource/apps/tstappviewneg.xyz
-
-../tdata/GIF.NNA1 											/epoc32/release/armv5/udeb/z/private/101f289c/gif.nna1
-../tdata/HTML.NNA2 											/epoc32/release/armv5/udeb/z/private/101f289c/html.nna2
-../tdata/CONTACT.NNA3 										/epoc32/release/armv5/udeb/z/private/101f289c/contact.nna3
-../tdata/TXT.NNA4 											/epoc32/release/armv5/udeb/z/private/101f289c/txt.nna4
-../tdata/TSTAPPU.DOC 										/epoc32/release/armv5/udeb/tstapp.doc
-../tdata/zero_len.txt 										/epoc32/release/armv5/udeb/zero_len.txt
-../tdata/one_byte.txt 										/epoc32/release/armv5/udeb/one_byte.txt
-../tdata/TRApaLsSessionStartAppTest.tst 					/epoc32/release/armv5/udeb/z/system/data/trapalssessionstartapptest.tst
-../tdata/file1.txt 											/epoc32/release/armv5/udeb/z/system/data/testpath/file1.txt
-../tdata/file2.txt 											/epoc32/release/armv5/udeb/z/system/data/testpath/file2.txt
-../tdata/testfile1.txt									 	/epoc32/release/armv5/udeb/z/system/data/testpath/filtertests/testfile1.txt
-../tdata/testfile2.txt									 	/epoc32/release/armv5/udeb/z/system/data/testpath/filtertests/testfile2.txt
-../tdata/testfile3.txt									 	/epoc32/release/armv5/udeb/z/system/data/testpath/filtertests/testfile3.txt
-../tdata/testfile4.txt 										/epoc32/release/armv5/udeb/z/system/data/testpath/filtertests/testfile4.txt
-../tdata/FileWithUnknownMimeType.UnrecognisableExtention	/epoc32/release/armv5/udeb/z/system/data/filewithunknownmimetype.unrecognisableextention	
-../tdata/TApsRecogAppTest.mmr								/epoc32/release/armv5/udeb/z/system/data/tapsrecogapptest.mmr
-../tdata/recmime_1.rsc									/epoc32/release/armv5/udeb/z/system/data/recmime_1.rsc
-../tdata/recmime_armv5.dll									/epoc32/release/armv5/udeb/z/system/data/recmime_armv5.dll
-
-../tdata/mimecontentpolicy/sd_goo.dcf			/epoc32/release/armv5/udeb/z/system/data/sd_goo.dcf
-../tdata/mimecontentpolicy/fl_goo.dm			/epoc32/release/armv5/udeb/z/system/data/fl_goo.dm
-../tdata/mimecontentpolicy/jpeg_wes.dm		/epoc32/release/armv5/udeb/z/system/data/jpeg_wes.dm
-../tdata/mimecontentpolicy/gif_wallpaper.gif		/epoc32/release/armv5/udeb/z/system/data/gif_wallpaper.gif
-../tdata/mimecontentpolicy/propelli.jpg	 		/epoc32/release/armv5/udeb/z/system/data/propelli.jpg
-../tdata/mimecontentpolicy/type-r.jpg			/epoc32/release/armv5/udeb/z/system/data/type-r.jpg
-../tdata/TApsRecogUpgradeTest.upg						/epoc32/release/armv5/udeb/z/system/data/tapsrecogupgradetest.upg
-../tdata/TApsRecogUpgradeTest.upr						/epoc32/release/armv5/udeb/z/system/data/tapsrecogupgradetest.upr
-../tdata/recupgrade.rsc								/epoc32/release/armv5/udeb/z/system/data/recupgrade.rsc
-../tdata/recupgrade2.rsc								/epoc32/release/armv5/udeb/z/system/data/recupgrade2.rsc
-../tdata/recupgrade_armv5_rel.dll						/epoc32/release/armv5/udeb/z/system/data/recupgrade_armv5_rel.dll
-../tdata/recupgrade2_armv5_rel.dll						/epoc32/release/armv5/udeb/z/system/data/recupgrade2_armv5_rel.dll
-
-
-// ARMV5 UREL
-
-#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-../tef/tstnnapp.mbm									/epoc32/release/armv5/urel/z/resource/apps/tstnnapp.mbm
-../tef/App_ctrl.MBM											/epoc32/release/armv5/urel/z/resource/apps/app_ctrl.mbm
-../tef/svg_icon.svg											/epoc32/release/armv5/urel/z/resource/apps/svg_icon.svg
-../tdata/AAA_reg.Rsc 										/epoc32/release/armv5/urel/z/apparctest/aaa_reg.rsc 
-../tdata/Corrupted_reg.RSC									/epoc32/release/armv5/urel/z/apparctest/corrupted_reg.rsc
-../tdata/testupdregappuninstallation_reg.rsc			/epoc32/release/armv5/urel/z/system/data/testupdregappuninstallation_reg.rsc
-../tdata/testupgradeupdregappuninstallation_reg.rsc			/epoc32/release/armv5/urel/z/system/data/testupgradeupdregappuninstallation_reg.rsc
-../tef/zerosizedicon.mbm									/epoc32/release/winscw/udeb/z/apparctestregfiles/zerosizedicon.mbm
-../tef/tstappviewneg.xyz									/epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.xyz
-#endif
-../tef/tstappviewneg.xyz									/epoc32/release/armv5/urel/z/resource/apps/tstappviewneg.xyz
-../tef/tstappviewneg.mbm									/epoc32/release/armv5/urel/z/resource/apps/tstappviewneg.mbm
-../tef/tstappviewneg.mbm									/epoc32/data/z/apparctestregfiles/tstappviewneg.mbm
-../tef/App_ctrl.MBM											/epoc32/data/z/apparctestregfiles/App_ctrl.MBM
-../tef/svg_icon.svg											/epoc32/data/z/apparctestregfiles/svg_icon.svg
-../tef/tstappviewneg.xyz									/epoc32/data/z/apparctestregfiles/tstappviewneg.xyz
-../tef/tupgradeiconapp/tupgradeiconapp.mbm					/epoc32/data/z/apparctestregfiles/tupgradeiconapp.mbm
-../tef/zerosizedicon.mbm									/epoc32/data/z/apparctestregfiles/zerosizedicon.mbm
-
-../tdata/GIF.NNA1 											/epoc32/release/armv5/urel/z/private/101f289c/gif.nna1
-../tdata/HTML.NNA2 											/epoc32/release/armv5/urel/z/private/101f289c/html.nna2
-../tdata/CONTACT.NNA3 										/epoc32/release/armv5/urel/z/private/101f289c/contact.nna3
-../tdata/TXT.NNA4 											/epoc32/release/armv5/urel/z/private/101f289c/txt.nna4
-../tdata/TSTAPPU.DOC 										/epoc32/release/armv5/urel/tstapp.doc
-../tdata/zero_len.txt 										/epoc32/release/armv5/urel/zero_len.txt
-../tdata/one_byte.txt 										/epoc32/release/armv5/urel/one_byte.txt
-../tdata/TRApaLsSessionStartAppTest.tst 					/epoc32/release/armv5/urel/z/system/data/trapalssessionstartapptest.tst
-../tdata/file1.txt 											/epoc32/release/armv5/urel/z/system/data/testpath/file1.txt
-../tdata/file2.txt 											/epoc32/release/armv5/urel/z/system/data/testpath/file2.txt
-../tdata/testfile1.txt									 	/epoc32/release/armv5/urel/z/system/data/testpath/filtertests/testfile1.txt
-../tdata/testfile2.txt					 					/epoc32/release/armv5/urel/z/system/data/testpath/filtertests/testfile2.txt
-../tdata/testfile3.txt									 	/epoc32/release/armv5/urel/z/system/data/testpath/filtertests/testfile3.txt
-../tdata/testfile4.txt 										/epoc32/release/armv5/urel/z/system/data/testpath/filtertests/testfile4.txt
-../tdata/FileWithUnknownMimeType.UnrecognisableExtention	/epoc32/release/armv5/urel/z/system/data/filewithunknownmimetype.unrecognisableextention	
-../tdata/TApsRecogAppTest.mmr 								/epoc32/release/armv5/urel/z/system/data/tapsrecogapptest.mmr
-../tdata/recmime_1.rsc									/epoc32/release/armv5/urel/z/system/data/recmime_1.rsc
-../tdata/recmime_armv5.dll									/epoc32/release/armv5/urel/z/system/data/recmime_armv5.dll
-
-../tdata/mimecontentpolicy/sd_goo.dcf			/epoc32/release/armv5/urel/z/system/data/sd_goo.dcf
-../tdata/mimecontentpolicy/fl_goo.dm			/epoc32/release/armv5/urel/z/system/data/fl_goo.dm
-../tdata/mimecontentpolicy/jpeg_wes.dm		/epoc32/release/armv5/urel/z/system/data/jpeg_wes.dm
-../tdata/mimecontentpolicy/gif_wallpaper.gif		/epoc32/release/armv5/urel/z/system/data/gif_wallpaper.gif
-../tdata/mimecontentpolicy/propelli.jpg	 		/epoc32/release/armv5/urel/z/system/data/propelli.jpg
-../tdata/mimecontentpolicy/type-r.jpg			/epoc32/release/armv5/urel/z/system/data/type-r.jpg
-../tdata/TApsRecogUpgradeTest.upg							/epoc32/release/armv5/urel/z/system/data/tapsrecogupgradetest.upg
-../tdata/TApsRecogUpgradeTest.upr							/epoc32/release/armv5/urel/z/system/data/tapsrecogupgradetest.upr
-../tdata/recupgrade.rsc									/epoc32/release/armv5/urel/z/system/data/recupgrade.rsc
-../tdata/recupgrade2.rsc								/epoc32/release/armv5/urel/z/system/data/recupgrade2.rsc
-../tdata/recupgrade_armv5_rel.dll						/epoc32/release/armv5/urel/z/system/data/recupgrade_armv5_rel.dll
-../tdata/recupgrade2_armv5_rel.dll						/epoc32/release/armv5/urel/z/system/data/recupgrade2_armv5_rel.dll
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/group/apparcTest_new.iby	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,313 @@
+/*
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#ifndef __APPARCTEST_IBY__
+#define __APPARCTEST_IBY__
+
+REM Application Architecture Framework unit test iby file
+
+
+#ifndef __APPFWK_TEST_FRAMEWORK_IBY__
+	#include <appfwk_test_framework.iby>
+#endif
+
+
+file=ABI_DIR\BUILD_DIR\texe.exe				sys\bin\texe.exe
+
+file=ABI_DIR\BUILD_DIR\TCmdLineExe.exe  	sys\bin\TCmdLineExe.exe
+
+file=ABI_DIR\BUILD_DIR\tstapp.exe											sys\bin\tstapp.exe
+data=EPOCROOTepoc32\data\Z\private\10003a3f\import\apps\tstapp_reg.rsc		private\10003a3f\import\apps\tstapp_reg.rsc
+file=ABI_DIR\BUILD_DIR\tnonnativeruntime.exe											sys\bin\tnonnativeruntime.exe
+data=EPOCROOTepoc32\data\Z\private\10003a3f\import\apps\tnonnativeruntime_reg.rsc		private\10003a3f\import\apps\tnonnativeruntime_reg.rsc
+data=ZRESOURCE\apps\tstapp.rsc 												Resource\apps\tstapp.rsc
+data=ZRESOURCE\apps\tstapp_loc.r01 											Resource\apps\tstapp_loc.r01
+data=ZRESOURCE\apps\tstapp_loc.r02 											Resource\apps\tstapp_loc.r02
+data=ZRESOURCE\apps\tstapp_loc.r03 											Resource\apps\tstapp_loc.r03
+data=ZRESOURCE\apps\tstapp_loc.r04 											Resource\apps\tstapp_loc.r04
+data=ZRESOURCE\apps\tstapp_loc.r05 											Resource\apps\tstapp_loc.r05
+data=ZRESOURCE\apps\tstapp_loc.rsc 											Resource\apps\tstapp_loc.rsc
+data=ZRESOURCE\apps\tstapp.mbm 												Resource\apps\tstapp.mbm
+data=ZRESOURCE\apps\tstapp02.m02 											Resource\apps\tstapp02.m02
+data=ZRESOURCE\apps\tstappview01.m01 										Resource\apps\tstappview01.m01
+data=ZRESOURCE\apps\tstappview02.k 											Resource\apps\tstappview02.k
+data=ZRESOURCE\apps\tstappview01.m02 										Resource\apps\tstappview01.m02
+data=ZRESOURCE\apps\tstappview												Resource\apps\tstappview
+data=ZRESOURCE\apps\tstappviewneg.xyz 										Resource\apps\tstappviewneg.xyz
+data=ZRESOURCE\apps\tstappviewneg.mbm 										Resource\apps\tstappviewneg.mbm
+
+
+file=ABI_DIR\BUILD_DIR\m_ctrl.exe											sys\bin\m_ctrl.exe
+data=ZRESOURCE\apps\m_ctrl.rsc												Resource\Apps\m_ctrl.rsc
+data=ZRESOURCE\apps\m_ctrl_loc.rsc											Resource\Apps\m_ctrl_loc.rsc
+data=EPOCROOTepoc32\data\Z\private\10003a3f\import\apps\m_ctrl_reg.rsc		private\10003a3f\import\apps\m_ctrl_reg.rsc
+
+data=EPOCROOT##epoc32\data\Z\resource\swicertstore.dat						resource\swicertstore.dat
+data=EPOCROOT##epoc32\data\z\apparctest\scr_test.db							apparctest\scr_test.db
+
+
+ECOM_PLUGIN(refnativeplugin.dll,10285BC3.rsc)
+ECOM_PLUGIN(tstapp_embedded.dll,10004c66.rsc)
+
+data=ZSYSTEM\install\TSTAPP_standalone_Stub.sis 							system\install\TSTAPP_standalone_Stub.sis
+data=ZSYSTEM\install\app_CTRL2_stub.sis										system\install\app_CTRL2_stub.sis
+data=ZSYSTEM\install\m_ctrl_v2_Stub.sis										system\install\m_ctrl_v2_Stub.sis
+																			
+data=ZSYSTEM\apparctestsisfiles\app_CTRL2.sis 									apparctest\apparctestsisfiles\app_CTRL2.sis
+data=ZSYSTEM\apparctestsisfiles\EndTaskTestApp.sis 								apparctest\apparctestsisfiles\EndTaskTestApp.sis
+data=ZSYSTEM\apparctestsisfiles\SimpleApparcTestApp.sis							apparctest\apparctestsisfiles\SimpleApparcTestApp.sis
+data=ZSYSTEM\apparctestsisfiles\T_EnvSlots.sis									apparctest\apparctestsisfiles\T_EnvSlots.sis
+data=ZSYSTEM\apparctestsisfiles\t_groupname.sis									apparctest\apparctestsisfiles\t_groupname.sis
+data=ZSYSTEM\apparctestsisfiles\t_winchainChild.sis								apparctest\apparctestsisfiles\t_winchainChild.sis
+data=ZSYSTEM\apparctestsisfiles\t_winchainLaunch.sis							apparctest\apparctestsisfiles\t_winchainLaunch.sis
+data=ZSYSTEM\apparctestsisfiles\TApparcTestApp.sis								apparctest\apparctestsisfiles\TApparcTestApp.sis
+data=ZSYSTEM\apparctestsisfiles\TestTrustedPriorityApp2.sis						apparctest\apparctestsisfiles\TestTrustedPriorityApp2.sis
+data=ZSYSTEM\apparctestsisfiles\TestUnTrustedPriorityApp2.sis					apparctest\apparctestsisfiles\TestUnTrustedPriorityApp2.sis
+data=ZSYSTEM\apparctestsisfiles\TSTAPP_standalone.sis							apparctest\apparctestsisfiles\TSTAPP_standalone.sis
+data=ZSYSTEM\apparctestsisfiles\TStartDocApp_v2.sis								apparctest\apparctestsisfiles\TStartDocApp_v2.sis
+data=ZSYSTEM\apparctestsisfiles\UnProctectedUidApp.sis							apparctest\apparctestsisfiles\UnProctectedUidApp.sis
+data=ZSYSTEM\apparctestsisfiles\tnotifydrivesapp.sis							apparctest\apparctestsisfiles\tnotifydrivesapp.sis
+data=ZSYSTEM\apparctestsisfiles\T_groupname_ver1.sis							apparctest\apparctestsisfiles\T_groupname_ver1.sis
+data=ZSYSTEM\apparctestsisfiles\T_groupname_ver2.sis							apparctest\apparctestsisfiles\T_groupname_ver2.sis
+data=ZSYSTEM\apparctestsisfiles\tlargestackapp.sis								apparctest\apparctestsisfiles\tlargestackapp.sis
+data=ZSYSTEM\apparctestsisfiles\TAppEmbeddable_embedded.sis						apparctest\apparctestsisfiles\TAppEmbeddable_embedded.sis
+data=ZSYSTEM\apparctestsisfiles\TAppEmbeddable_standalone.sis					apparctest\apparctestsisfiles\TAppEmbeddable_standalone.sis
+data=ZSYSTEM\apparctestsisfiles\TAppEmbeddableOnly_v2.sis						apparctest\apparctestsisfiles\TAppEmbeddableOnly_v2.sis
+data=ZSYSTEM\apparctestsisfiles\TAppEmbeddableUiNotStandAlone_v2.sis			apparctest\apparctestsisfiles\TAppEmbeddableUiNotStandAlone_v2.sis
+data=ZSYSTEM\apparctestsisfiles\TAppEmbeddableUiOrStandAlone_embedded.sis		apparctest\apparctestsisfiles\TAppEmbeddableUiOrStandAlone_embedded.sis
+data=ZSYSTEM\apparctestsisfiles\TAppEmbeddableUiOrStandalone_standalone.sis		apparctest\apparctestsisfiles\TAppEmbeddableUiOrStandalone_standalone.sis
+data=ZSYSTEM\apparctestsisfiles\TAppNotEmbeddable_v2.sis						apparctest\apparctestsisfiles\TAppNotEmbeddable_v2.sis
+data=ZSYSTEM\apparctestsisfiles\TNNApp1.sis										apparctest\apparctestsisfiles\TNNApp1.sis
+data=ZSYSTEM\apparctestsisfiles\serverapp2.sis									apparctest\apparctestsisfiles\serverapp2.sis
+data=ZSYSTEM\apparctestsisfiles\serverapp4.sis									apparctest\apparctestsisfiles\serverapp4.sis
+data=ZSYSTEM\apparctestsisfiles\serverapp6.sis									apparctest\apparctestsisfiles\serverapp6.sis
+data=ZSYSTEM\apparctestsisfiles\serverapp7.sis									apparctest\apparctestsisfiles\serverapp7.sis
+data=ZSYSTEM\apparctestsisfiles\TRApaLsSessionStartAppTestApp_v2.sis			apparctest\apparctestsisfiles\TRApaLsSessionStartAppTestApp_v2.sis
+data=ZSYSTEM\apparctestsisfiles\TestMultipleApps.sis							apparctest\apparctestsisfiles\TestMultipleApps.sis
+//data=ZSYSTEM\apparctestsisfiles\TInvalidApp.sis								apparctest\apparctestsisfiles\TInvalidApp.sis
+data=ZSYSTEM\apparctestsisfiles\m_ctrl_v2.sis									apparctest\apparctestsisfiles\m_ctrl_v2.sis
+data=ZSYSTEM\apparctestsisfiles\openservice1app.sis								apparctest\apparctestsisfiles\openservice1app.sis
+data=ZSYSTEM\apparctestsisfiles\openservice2app.sis								apparctest\apparctestsisfiles\openservice2app.sis
+data=ZSYSTEM\apparctestsisfiles\T_DataPrioritySystem1.sis						apparctest\apparctestsisfiles\T_DataPrioritySystem1.sis
+data=ZSYSTEM\apparctestsisfiles\T_DataPrioritySystem2.sis						apparctest\apparctestsisfiles\T_DataPrioritySystem2.sis
+data=ZSYSTEM\apparctestsisfiles\T_DataPrioritySystem3.sis						apparctest\apparctestsisfiles\T_DataPrioritySystem3.sis
+data=ZSYSTEM\apparctestsisfiles\TCtrlPnlApp.sis									apparctest\apparctestsisfiles\TCtrlPnlApp.sis
+data=ZSYSTEM\apparctestsisfiles\TestTrustedPriorityApp1.sis						apparctest\apparctestsisfiles\TestTrustedPriorityApp1.sis
+data=ZSYSTEM\apparctestsisfiles\TestUnTrustedPriorityApp1.sis					apparctest\apparctestsisfiles\TestUnTrustedPriorityApp1.sis
+data=ZSYSTEM\apparctestsisfiles\tRuleBasedApp1.sis								apparctest\apparctestsisfiles\tRuleBasedApp1.sis
+data=ZSYSTEM\apparctestsisfiles\tRuleBasedApp2.sis								apparctest\apparctestsisfiles\tRuleBasedApp2.sis
+data=ZSYSTEM\apparctestsisfiles\tRuleBasedApp3.sis								apparctest\apparctestsisfiles\tRuleBasedApp3.sis
+data=ZSYSTEM\apparctestsisfiles\tRuleBasedApp4.sis								apparctest\apparctestsisfiles\tRuleBasedApp4.sis
+data=ZSYSTEM\apparctestsisfiles\zerosizedicontestapp.sis						apparctest\apparctestsisfiles\zerosizedicontestapp.sis
+data=ZSYSTEM\apparctestsisfiles\ForceRegApp1.sis								apparctest\apparctestsisfiles\ForceRegApp1.sis
+data=ZSYSTEM\apparctestsisfiles\ForceRegApp2.sis								apparctest\apparctestsisfiles\ForceRegApp2.sis
+data=ZSYSTEM\apparctestsisfiles\ForceRegMultipleApps.sis						apparctest\apparctestsisfiles\ForceRegMultipleApps.sis
+data=ZSYSTEM\apparctestsisfiles\CustomiseDefaultIconApp.sis						apparctest\apparctestsisfiles\CustomiseDefaultIconApp.sis
+data=ZSYSTEM\apparctestsisfiles\TestMultipleAppsDowngrade.sis					apparctest\apparctestsisfiles\TestMultipleAppsDowngrade.sis
+data=ZSYSTEM\apparctestsisfiles\ticoncaptionoverride.sis						apparctest\apparctestsisfiles\ticoncaptionoverride.sis
+
+file=ABI_DIR\BUILD_DIR\ParentProcess.exe				Sys\bin\ParentProcess.exe
+file=ABI_DIR\BUILD_DIR\ChildI.exe						Sys\bin\ChildI.exe
+file=ABI_DIR\BUILD_DIR\ChildII.exe						Sys\bin\ChildII.exe
+file=ABI_DIR\BUILD_DIR\ChildIII.exe						Sys\bin\ChildIII.exe
+data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\ParentProcess_reg.Rsc	private\10003a3f\apps\ParentProcess_reg.RSC
+data=EPOCROOTepoc32\data\z\Resource\apps\ParentProcess.Rsc				Resource\apps\ParentProcess.Rsc
+data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\ChildI_reg.RSC			private\10003a3f\apps\ChildI_reg.RSC
+data=EPOCROOTepoc32\data\z\Resource\apps\ChildI.Rsc						Resource\apps\ChildI.Rsc
+data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\ChildII_reg.RSC		private\10003a3f\apps\ChildII_reg.RSC
+data=EPOCROOTepoc32\data\z\Resource\apps\ChildII.Rsc					Resource\apps\ChildII.Rsc
+data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\ChildIII_reg.RSC		private\10003a3f\apps\ChildIII_reg.RSC
+data=EPOCROOTepoc32\data\z\Resource\apps\ChildIII.Rsc					Resource\apps\ChildIII.Rsc
+
+data=ABI_DIR\BUILD_DIR\tstapp.doc				System\data\tstapp.doc
+data=ABI_DIR\BUILD_DIR\zero_len.txt				System\data\zero_len.txt	
+data=ABI_DIR\BUILD_DIR\one_byte.txt				System\data\one_byte.txt
+
+
+#ifdef SYMBIAN_DISTINCT_LOCALE_MODEL
+REM Copy new locale language dlls to ROM SFTB10.1 onwards
+file=ABI_DIR\BUILD_DIR\elocl_lan.002					Sys\bin\elocl_lan.002
+file=ABI_DIR\BUILD_DIR\elocl_lan.004					Sys\bin\elocl_lan.004
+file=ABI_DIR\BUILD_DIR\elocl_lan.005					Sys\bin\elocl_lan.005
+file=ABI_DIR\BUILD_DIR\elocl_lan.032					Sys\bin\elocl_lan.032
+#else
+// These are pre SYMBIAN_DISTINCT_LOCALE_MODEL language locale dlls.Not to be use SFTB10.1 onwards. 
+file=ABI_DIR\BUILD_DIR\ELOCL.01					Sys\bin\ELOCL.01
+file=ABI_DIR\BUILD_DIR\ELOCL.02					Sys\bin\ELOCL.02
+file=ABI_DIR\BUILD_DIR\ELOCL.03					Sys\bin\ELOCL.03
+file=ABI_DIR\BUILD_DIR\ELOCL.04					Sys\bin\ELOCL.04
+file=ABI_DIR\BUILD_DIR\ELOCL.05					Sys\bin\ELOCL.05
+file=ABI_DIR\BUILD_DIR\ELOCL.10					Sys\bin\ELOCL.10
+file=ABI_DIR\BUILD_DIR\ELOCL.32					Sys\bin\ELOCL.32
+#endif
+// This is now included in techview, from initlocale.iby
+//file=ABI_DIR\BUILD_DIR\ELOCL.LOC				Sys\bin\ELOCL.LOC
+
+
+data=EPOCROOT##epoc32\data\Z\Apparctest\Corrupted_reg.rsc									ApparcTest\Corrupted_reg.rsc
+data=EPOCROOT##epoc32\data\z\system\data\Testpath\file1.txt									System\data\Testpath\file1.txt
+data=EPOCROOT##epoc32\data\z\system\data\Testpath\file2.txt									System\data\Testpath\file2.txt
+data=EPOCROOT##epoc32\data\z\system\data\Testpath\FilterTests\testfile1.txt					System\data\Testpath\FilterTests\testfile1.txt
+data=EPOCROOT##epoc32\data\z\system\data\Testpath\FilterTests\testfile2.txt					System\data\Testpath\FilterTests\testfile2.txt
+data=EPOCROOT##epoc32\data\z\system\data\Testpath\FilterTests\testfile3.txt					System\data\Testpath\FilterTests\testfile3.txt
+data=EPOCROOT##epoc32\data\z\system\data\Testpath\FilterTests\testfile4.txt					System\data\Testpath\FilterTests\testfile4.txt
+data=EPOCROOT##epoc32\data\z\system\data\FileWithUnknownMimeType.UnrecognisableExtention	System\data\FileWithUnknownMimeType.UnrecognisableExtention
+data=ABI_DIR\BUILD_DIR\z\system\data\recmime_1.rsc								System\data\recmime_1.rsc
+data=ABI_DIR\BUILD_DIR\z\system\data\recmime_armv5.dll							System\data\recmime_armv5.dll
+data=ABI_DIR\BUILD_DIR\z\system\data\TApsRecogAppTest.mmr							System\data\TApsRecogAppTest.mmr
+data=ABI_DIR\BUILD_DIR\z\system\data\recupgrade.rsc								System\data\recupgrade.rsc
+data=ABI_DIR\BUILD_DIR\z\system\data\recupgrade2.rsc							System\data\recupgrade2.rsc
+data=ABI_DIR\BUILD_DIR\z\system\data\recupgrade_armv5_rel.dll					System\data\recupgrade_armv5_rel.dll
+data=ABI_DIR\BUILD_DIR\z\system\data\recupgrade2_armv5_rel.dll					System\data\recupgrade2_armv5_rel.dll
+data=ABI_DIR\BUILD_DIR\z\system\data\TApsRecogUpgradeTest.upg					System\data\TApsRecogUpgradeTest.upg
+data=ABI_DIR\BUILD_DIR\z\system\data\TApsRecogUpgradeTest.upr					System\data\TApsRecogUpgradeTest.upr
+
+
+data=EPOCROOT##epoc32\data\Z\Apparctest\testforceregistrationapp1_reg.rsc			ApparcTest\testforceregistrationapp1_reg.rsc
+data=EPOCROOT##epoc32\data\Z\Apparctest\testforceregistrationapp1_loc.rsc			ApparcTest\testforceregistrationapp1_loc.rsc
+
+data=EPOCROOTepoc32\data\Z\resource\apps\default_app_icon.m02								resource\apps\default_app_icon.m02
+
+data=EPOCROOTepoc32\data\Z\private\10202be9\1028583d.txt				         private\10202be9\1028583d.txt
+data=EPOCROOTepoc32\data\Z\private\10202be9\10003a3f.txt				         private\10202be9\10003a3f.txt
+
+
+// Change for Control panel Start
+file=ABI_DIR\BUILD_DIR\app_ctrl.exe											Sys\bin\app_ctrl.exe
+file=ABI_DIR\BUILD_DIR\app_ctrl2.exe										Sys\bin\app_ctrl2.exe
+data=EPOCROOTepoc32\data\z\private\10003a3f\import\apps\App_CTRL2_reg.Rsc	private\10003a3f\import\apps\App_CTRL2_reg.Rsc
+data=EPOCROOTepoc32\data\z\Resource\apps\App_CTRL2.Rsc						Resource\apps\App_CTRL2.Rsc
+// Change for Control panel End
+
+ECOM_PLUGIN(tforceregapprec.dll, A0001010.rsc)
+
+ECOM_PLUGIN(TLongUrlRecognizer.DLL,10004c4e.rsc)
+ECOM_PLUGIN(TBufferOnlyRec.DLL, 10207f88.rsc)
+
+data=ABI_DIR\BUILD_DIR\z\system\data\TRApaLsSessionStartAppTest.tst						System\data\TRApaLsSessionStartAppTest.tst
+ECOM_PLUGIN(TRApaLsSessionStartAppTestRecognizer.DLL,10000182.rsc)
+
+ECOM_PLUGIN(TAppLaunchChecker.DLL,1020d465.rsc)
+ECOM_PLUGIN(TAppLaunchChecker2.DLL,102722ba.rsc)
+ECOM_PLUGIN(TNonNativeAppLaunchChecker.DLL,A0000B70.rsc)
+
+ECOM_PLUGIN(testrec.dll,102032A5.rsc)
+
+file=ABI_DIR\BUILD_DIR\tssaac.exe                							sys\bin\tssaac.exe
+file=ABI_DIR\BUILD_DIR\tssaac_tapp.exe 										sys\bin\tssaac_tapp.exe
+data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\tssaac_tapp_reg.rsc		private\10003a3f\apps\tssaac_tapp_reg.rsc
+data=ZRESOURCE\apps\tssaac_tapp.rsc 										resource\apps\tssaac_tapp.rsc
+data=ZRESOURCE\apps\tssaac_tapp_loc.rsc 									resource\apps\tssaac_tapp_loc.rsc
+
+ECOM_PLUGIN(TNonNativeRec.DLL, 10207f95.rsc)
+data=EPOCROOTepoc32\data\Z\private\101F289C\gif.nna1	   				private\101F289C\gif.nna1
+data=EPOCROOTepoc32\data\Z\private\101F289C\html.nna2	   				private\101F289C\html.nna2
+data=EPOCROOTepoc32\data\Z\private\101F289C\contact.nna3	   			private\101F289C\contact.nna3
+data=EPOCROOTepoc32\data\Z\private\101F289C\txt.nna4	   				private\101F289C\txt.nna4
+
+data=EPOCROOT##epoc32\data\z\system\data\fl_goo.dm					System\data\fl_goo.dm
+data=EPOCROOT##epoc32\data\z\system\data\jpeg_wes.dm				System\data\jpeg_wes.dm
+data=EPOCROOT##epoc32\data\z\system\data\gif_wallpaper.gif				System\data\gif_wallpaper.gif
+data=EPOCROOT##epoc32\data\z\system\data\propelli.jpg	 				System\data\propelli.jpg
+data=EPOCROOT##epoc32\data\z\system\data\type-r.jpg					System\data\type-r.jpg
+data=EPOCROOT##epoc32\data\z\system\data\sd_goo.dcf	 				System\data\sd_goo.dcf
+
+ECOM_PLUGIN(recmime.DLL, 102822B7.rsc)
+data=EPOCROOTepoc32\data\z\Resource\Plugins\recmime.RSC     			apparctest\dummy.rsc
+
+ECOM_PLUGIN(recupgrade.DLL, recupgrade.rsc)
+
+data=ABI_DIR\DEBUG_DIR\ApparcTestServer.exe							sys\bin\ApparcTestServer.exe
+data=ABI_DIR\DEBUG_DIR\TIconLoaderAndIconArrayForLeaks.dll			sys\bin\TIconLoaderAndIconArrayForLeaks.dll
+
+data=DATAZ_\apparctest\apparctest_run.bat                     		\apparctest_run.bat
+
+data=DATAZ_\apparctest\apparctest_t_ApsScan.script            		\apparctest\apparctest_t_ApsScan.script
+data=DATAZ_\apparctest\apparctest_t_AppList.script            		\apparctest\apparctest_t_AppList.script
+data=DATAZ_\apparctest\apparctest_t_AppListFileUpdate.script            \apparctest\apparctest_t_AppListFileUpdate.script
+data=DATAZ_\apparctest\apparctest_t_AutoMMCReaderOpen.script  		\apparctest\apparctest_t_AutoMMCReaderOpen.script
+data=DATAZ_\apparctest\apparctest_t_Backup.script             		\apparctest\apparctest_t_Backup.script
+data=DATAZ_\apparctest\apparctest_t_Capability1.script        		\apparctest\apparctest_t_Capability1.script
+data=DATAZ_\apparctest\apparctest_t_Capability2.script        		\apparctest\apparctest_t_Capability2.script
+data=DATAZ_\apparctest\apparctest_t_DataTypeMappingWithSid.script  \apparctest\apparctest_t_DataTypeMappingWithSid.script
+data=DATAZ_\apparctest\apparctest_t_Caption.script            		\apparctest\apparctest_t_Caption.script
+data=DATAZ_\apparctest\apparctest_t_Cmdln.script              		\apparctest\apparctest_t_Cmdln.script
+data=DATAZ_\apparctest\apparctest_t_ControlPanelTest.script   		\apparctest\apparctest_t_ControlPanelTest.script
+data=DATAZ_\apparctest\apparctest_T_DataMappingPersistenceA.script	\apparctest\apparctest_T_DataMappingPersistenceA.script
+data=DATAZ_\apparctest\apparctest_T_DataMappingPersistenceB.script	\apparctest\apparctest_T_DataMappingPersistenceB.script
+data=DATAZ_\apparctest\apparctest_T_DataMappingPersistenceC.script	\apparctest\apparctest_T_DataMappingPersistenceC.script
+data=DATAZ_\apparctest\apparctest_t_EndTask.script             		\apparctest\apparctest_t_EndTask.script
+data=DATAZ_\apparctest\apparctest_t_Exe.script                		\apparctest\apparctest_t_Exe.script
+data=DATAZ_\apparctest\apparctest_t_File2.script               		\apparctest\apparctest_t_File2.script
+data=DATAZ_\apparctest\apparctest_t_File3.script               		\apparctest\apparctest_t_File3.script
+data=DATAZ_\apparctest\apparctest_t_Foreground.script         		\apparctest\apparctest_t_Foreground.script
+data=DATAZ_\apparctest\apparctest_t_GroupName.script          		\apparctest\apparctest_t_GroupName.script
+data=DATAZ_\apparctest\apparctest_t_GroupName_ver1.script     		\apparctest\apparctest_t_GroupName_ver1.script
+data=DATAZ_\apparctest\apparctest_t_GroupName_ver2.script     		\apparctest\apparctest_t_GroupName_ver2.script
+data=DATAZ_\apparctest\apparctest_t_Locale.script             		\apparctest\apparctest_t_Locale.script
+data=DATAZ_\apparctest\apparctest_t_Mdr.script                		\apparctest\apparctest_t_Mdr.script
+data=DATAZ_\apparctest\apparctest_t_mimecontentpolicy.script                  \apparctest\apparctest_t_mimecontentpolicy.script
+data=DATAZ_\apparctest\apparctest_t_Mru.script                		\apparctest\apparctest_t_Mru.script
+data=DATAZ_\apparctest\apparctest_t_NonNativeApps.script            \apparctest\apparctest_t_NonNativeApps.script
+data=DATAZ_\apparctest\apparctest_t_Notif.script              		\apparctest\apparctest_t_Notif.script
+data=DATAZ_\apparctest\apparctest_t_OOM.script                		\apparctest\apparctest_t_OOM.script
+data=DATAZ_\apparctest\apparctest_t_Pro.script                		\apparctest\apparctest_t_Pro.script
+data=DATAZ_\apparctest\apparctest_t_Proc.script              		\apparctest\apparctest_t_Proc.script
+data=DATAZ_\apparctest\apparctest_t_RApaLsSession.script      		\apparctest\apparctest_t_RApaLsSession.script
+data=DATAZ_\apparctest\apparctest_t_RuleBasedLaunching.script 		\apparctest\apparctest_t_RuleBasedLaunching.script
+data=DATAZ_\apparctest\apparctest_t_Serv2.script              		\apparctest\apparctest_t_Serv2.script
+data=DATAZ_\apparctest\apparctest_t_Serv3.script              		\apparctest\apparctest_t_Serv3.script
+data=DATAZ_\apparctest\apparctest_t_ServiceRegistry.script    		\apparctest\apparctest_t_ServiceRegistry.script
+data=DATAZ_\apparctest\apparctest_t_Services.script           		\apparctest\apparctest_t_Services.script
+data=DATAZ_\apparctest\apparctest_t_StartApp.script           		\apparctest\apparctest_t_StartApp.script
+data=DATAZ_\apparctest\apparctest_t_StartDoc.script           		\apparctest\apparctest_t_StartDoc.script
+data=DATAZ_\apparctest\apparctest_t_WindowChaining.script     		\apparctest\apparctest_t_WindowChaining.script
+data=DATAZ_\apparctest\apparctest_t_Wgnam.script              		\apparctest\apparctest_t_Wgnam.script
+data=DATAZ_\apparctest\apparctest_t_IntegritySupport.script		\apparctest\apparctest_t_IntegritySupport.script
+data=DATAZ_\apparctest\apparctest_t_IntegritySupportReboot1.script	\apparctest\apparctest_t_IntegritySupportReboot1.script
+data=DATAZ_\apparctest\apparctest_t_IntegritySupportReboot2.script	\apparctest\apparctest_t_IntegritySupportReboot2.script
+data=DATAZ_\apparctest\apparctest_t_largestack.script				\apparctest\apparctest_t_largestack.script
+data=DATAZ_\apparctest\apparctest_t_drivenotification.script			\apparctest\apparctest_t_drivenotification.script
+data=DATAZ_\apparctest\apparctest_t_servicebase.script			\apparctest\apparctest_t_servicebase.script
+data=DATAZ_\apparctest\apparctest_t_RecUpgrade.script			\apparctest\apparctest_t_RecUpgrade.script
+data=DATAZ_\apparctest\apparctest_t_UpdateAppList.script			\apparctest\apparctest_t_UpdateAppList.script
+
+data=DATAZ_\apparctest\apparctest_t_forcereg.script					\apparctest\apparctest_t_forcereg.script
+data=DATAZ_\apparctest\apparctest_t_clientnotif.script				\apparctest\apparctest_t_clientnotif.script
+data=DATAZ_\apparctest\apparctest_t_nonnativetest.script			\apparctest\apparctest_t_nonnativetest.script
+
+REM SysStart Apparc Scripts
+data=DATAZ_\apparctest\apparctest_T_TestStartApp1L.script		\apparctest\apparctest_T_TestStartApp1L.script		
+data=DATAZ_\apparctest\apparctest_T_TestStartApp2L.script		\apparctest\apparctest_T_TestStartApp2L.script		
+data=DATAZ_\apparctest\apparctest_T_TestStartApp3L.script		\apparctest\apparctest_T_TestStartApp3L.script		
+data=DATAZ_\apparctest\apparctest_T_TestStartApp4L.script		\apparctest\apparctest_T_TestStartApp4L.script		
+data=DATAZ_\apparctest\apparctest_T_TestStartApp5L.script		\apparctest\apparctest_T_TestStartApp5L.script		
+data=DATAZ_\apparctest\apparctest_T_TestStartApp6L.script		\apparctest\apparctest_T_TestStartApp6L.script		
+data=DATAZ_\apparctest\apparctest_T_TestGetAllApps.script     		\apparctest\apparctest_T_TestGetAllApps.script     	
+data=DATAZ_\apparctest\apparctest_T_TestInsertDataTypeL.script		\apparctest\apparctest_T_TestInsertDataTypeL.script	
+data=DATAZ_\apparctest\apparctest_T_TestAppForDataTypeL.script		\apparctest\apparctest_T_TestAppForDataTypeL.script	
+data=DATAZ_\apparctest\apparctest_T_TestDeleteDataTypeL.script		\apparctest\apparctest_T_TestDeleteDataTypeL.script	
+data=DATAZ_\apparctest\apparctest_T_TestServiceDiscovery.script		\apparctest\apparctest_T_TestServiceDiscovery.script	
+data=DATAZ_\apparctest\apparctest_T_TestGetAppInfo.script     		\apparctest\apparctest_T_TestGetAppInfo.script     	
+data=DATAZ_\apparctest\apparctest_T_TestAppCount.script     		\apparctest\apparctest_T_TestAppCount.script     	
+data=DATAZ_\apparctest\apparctest_T_TestCreateDoc.script      		\apparctest\apparctest_T_TestCreateDoc.script      	
+data=DATAZ_\apparctest\apparctest_T_TestLocalisedCaptionL.script	\apparctest\apparctest_T_TestLocalisedCaptionL.script
+
+REM End of Application Architecture Framework unit test iby file
+
+patchdata apgrfx.dll @ KMinApplicationStackSize 0xf000
+patchdata apserv.dll @ KApaDrivesToMonitor 4
+#endif
--- a/appfw/apparchitecture/group/apparctest_new.iby	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,313 +0,0 @@
-/*
-* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#ifndef __APPARCTEST_IBY__
-#define __APPARCTEST_IBY__
-
-REM Application Architecture Framework unit test iby file
-
-
-#ifndef __APPFWK_TEST_FRAMEWORK_IBY__
-	#include <appfwk_test_framework.iby>
-#endif
-
-
-file=ABI_DIR\BUILD_DIR\texe.exe				sys\bin\texe.exe
-
-file=ABI_DIR\BUILD_DIR\TCmdLineExe.exe  	sys\bin\TCmdLineExe.exe
-
-file=ABI_DIR\BUILD_DIR\tstapp.exe											sys\bin\tstapp.exe
-data=EPOCROOTepoc32\data\Z\private\10003a3f\import\apps\tstapp_reg.rsc		private\10003a3f\import\apps\tstapp_reg.rsc
-file=ABI_DIR\BUILD_DIR\tnonnativeruntime.exe											sys\bin\tnonnativeruntime.exe
-data=EPOCROOTepoc32\data\Z\private\10003a3f\import\apps\tnonnativeruntime_reg.rsc		private\10003a3f\import\apps\tnonnativeruntime_reg.rsc
-data=ZRESOURCE\apps\tstapp.rsc 												Resource\apps\tstapp.rsc
-data=ZRESOURCE\apps\tstapp_loc.r01 											Resource\apps\tstapp_loc.r01
-data=ZRESOURCE\apps\tstapp_loc.r02 											Resource\apps\tstapp_loc.r02
-data=ZRESOURCE\apps\tstapp_loc.r03 											Resource\apps\tstapp_loc.r03
-data=ZRESOURCE\apps\tstapp_loc.r04 											Resource\apps\tstapp_loc.r04
-data=ZRESOURCE\apps\tstapp_loc.r05 											Resource\apps\tstapp_loc.r05
-data=ZRESOURCE\apps\tstapp_loc.rsc 											Resource\apps\tstapp_loc.rsc
-data=ZRESOURCE\apps\tstapp.mbm 												Resource\apps\tstapp.mbm
-data=ZRESOURCE\apps\tstapp02.m02 											Resource\apps\tstapp02.m02
-data=ZRESOURCE\apps\tstappview01.m01 										Resource\apps\tstappview01.m01
-data=ZRESOURCE\apps\tstappview02.k 											Resource\apps\tstappview02.k
-data=ZRESOURCE\apps\tstappview01.m02 										Resource\apps\tstappview01.m02
-data=ZRESOURCE\apps\tstappview												Resource\apps\tstappview
-data=ZRESOURCE\apps\tstappviewneg.xyz 										Resource\apps\tstappviewneg.xyz
-data=ZRESOURCE\apps\tstappviewneg.mbm 										Resource\apps\tstappviewneg.mbm
-
-
-file=ABI_DIR\BUILD_DIR\m_ctrl.exe											sys\bin\m_ctrl.exe
-data=ZRESOURCE\apps\m_ctrl.rsc												Resource\Apps\m_ctrl.rsc
-data=ZRESOURCE\apps\m_ctrl_loc.rsc											Resource\Apps\m_ctrl_loc.rsc
-data=EPOCROOTepoc32\data\Z\private\10003a3f\import\apps\m_ctrl_reg.rsc		private\10003a3f\import\apps\m_ctrl_reg.rsc
-
-data=EPOCROOT##epoc32\data\Z\resource\swicertstore.dat						resource\swicertstore.dat
-data=EPOCROOT##epoc32\data\z\apparctest\scr_test.db							apparctest\scr_test.db
-
-
-ECOM_PLUGIN(refnativeplugin.dll,10285BC3.rsc)
-ECOM_PLUGIN(tstapp_embedded.dll,10004c66.rsc)
-
-data=ZSYSTEM\install\TSTAPP_standalone_Stub.sis 							system\install\TSTAPP_standalone_Stub.sis
-data=ZSYSTEM\install\app_CTRL2_stub.sis										system\install\app_CTRL2_stub.sis
-data=ZSYSTEM\install\m_ctrl_v2_Stub.sis										system\install\m_ctrl_v2_Stub.sis
-																			
-data=ZSYSTEM\apparctestsisfiles\app_CTRL2.sis 									apparctest\apparctestsisfiles\app_CTRL2.sis
-data=ZSYSTEM\apparctestsisfiles\EndTaskTestApp.sis 								apparctest\apparctestsisfiles\EndTaskTestApp.sis
-data=ZSYSTEM\apparctestsisfiles\SimpleApparcTestApp.sis							apparctest\apparctestsisfiles\SimpleApparcTestApp.sis
-data=ZSYSTEM\apparctestsisfiles\T_EnvSlots.sis									apparctest\apparctestsisfiles\T_EnvSlots.sis
-data=ZSYSTEM\apparctestsisfiles\t_groupname.sis									apparctest\apparctestsisfiles\t_groupname.sis
-data=ZSYSTEM\apparctestsisfiles\t_winchainChild.sis								apparctest\apparctestsisfiles\t_winchainChild.sis
-data=ZSYSTEM\apparctestsisfiles\t_winchainLaunch.sis							apparctest\apparctestsisfiles\t_winchainLaunch.sis
-data=ZSYSTEM\apparctestsisfiles\TApparcTestApp.sis								apparctest\apparctestsisfiles\TApparcTestApp.sis
-data=ZSYSTEM\apparctestsisfiles\TestTrustedPriorityApp2.sis						apparctest\apparctestsisfiles\TestTrustedPriorityApp2.sis
-data=ZSYSTEM\apparctestsisfiles\TestUnTrustedPriorityApp2.sis					apparctest\apparctestsisfiles\TestUnTrustedPriorityApp2.sis
-data=ZSYSTEM\apparctestsisfiles\TSTAPP_standalone.sis							apparctest\apparctestsisfiles\TSTAPP_standalone.sis
-data=ZSYSTEM\apparctestsisfiles\TStartDocApp_v2.sis								apparctest\apparctestsisfiles\TStartDocApp_v2.sis
-data=ZSYSTEM\apparctestsisfiles\UnProctectedUidApp.sis							apparctest\apparctestsisfiles\UnProctectedUidApp.sis
-data=ZSYSTEM\apparctestsisfiles\tnotifydrivesapp.sis							apparctest\apparctestsisfiles\tnotifydrivesapp.sis
-data=ZSYSTEM\apparctestsisfiles\T_groupname_ver1.sis							apparctest\apparctestsisfiles\T_groupname_ver1.sis
-data=ZSYSTEM\apparctestsisfiles\T_groupname_ver2.sis							apparctest\apparctestsisfiles\T_groupname_ver2.sis
-data=ZSYSTEM\apparctestsisfiles\tlargestackapp.sis								apparctest\apparctestsisfiles\tlargestackapp.sis
-data=ZSYSTEM\apparctestsisfiles\TAppEmbeddable_embedded.sis						apparctest\apparctestsisfiles\TAppEmbeddable_embedded.sis
-data=ZSYSTEM\apparctestsisfiles\TAppEmbeddable_standalone.sis					apparctest\apparctestsisfiles\TAppEmbeddable_standalone.sis
-data=ZSYSTEM\apparctestsisfiles\TAppEmbeddableOnly_v2.sis						apparctest\apparctestsisfiles\TAppEmbeddableOnly_v2.sis
-data=ZSYSTEM\apparctestsisfiles\TAppEmbeddableUiNotStandAlone_v2.sis			apparctest\apparctestsisfiles\TAppEmbeddableUiNotStandAlone_v2.sis
-data=ZSYSTEM\apparctestsisfiles\TAppEmbeddableUiOrStandAlone_embedded.sis		apparctest\apparctestsisfiles\TAppEmbeddableUiOrStandAlone_embedded.sis
-data=ZSYSTEM\apparctestsisfiles\TAppEmbeddableUiOrStandalone_standalone.sis		apparctest\apparctestsisfiles\TAppEmbeddableUiOrStandalone_standalone.sis
-data=ZSYSTEM\apparctestsisfiles\TAppNotEmbeddable_v2.sis						apparctest\apparctestsisfiles\TAppNotEmbeddable_v2.sis
-data=ZSYSTEM\apparctestsisfiles\TNNApp1.sis										apparctest\apparctestsisfiles\TNNApp1.sis
-data=ZSYSTEM\apparctestsisfiles\serverapp2.sis									apparctest\apparctestsisfiles\serverapp2.sis
-data=ZSYSTEM\apparctestsisfiles\serverapp4.sis									apparctest\apparctestsisfiles\serverapp4.sis
-data=ZSYSTEM\apparctestsisfiles\serverapp6.sis									apparctest\apparctestsisfiles\serverapp6.sis
-data=ZSYSTEM\apparctestsisfiles\serverapp7.sis									apparctest\apparctestsisfiles\serverapp7.sis
-data=ZSYSTEM\apparctestsisfiles\TRApaLsSessionStartAppTestApp_v2.sis			apparctest\apparctestsisfiles\TRApaLsSessionStartAppTestApp_v2.sis
-data=ZSYSTEM\apparctestsisfiles\TestMultipleApps.sis							apparctest\apparctestsisfiles\TestMultipleApps.sis
-//data=ZSYSTEM\apparctestsisfiles\TInvalidApp.sis								apparctest\apparctestsisfiles\TInvalidApp.sis
-data=ZSYSTEM\apparctestsisfiles\m_ctrl_v2.sis									apparctest\apparctestsisfiles\m_ctrl_v2.sis
-data=ZSYSTEM\apparctestsisfiles\openservice1app.sis								apparctest\apparctestsisfiles\openservice1app.sis
-data=ZSYSTEM\apparctestsisfiles\openservice2app.sis								apparctest\apparctestsisfiles\openservice2app.sis
-data=ZSYSTEM\apparctestsisfiles\T_DataPrioritySystem1.sis						apparctest\apparctestsisfiles\T_DataPrioritySystem1.sis
-data=ZSYSTEM\apparctestsisfiles\T_DataPrioritySystem2.sis						apparctest\apparctestsisfiles\T_DataPrioritySystem2.sis
-data=ZSYSTEM\apparctestsisfiles\T_DataPrioritySystem3.sis						apparctest\apparctestsisfiles\T_DataPrioritySystem3.sis
-data=ZSYSTEM\apparctestsisfiles\TCtrlPnlApp.sis									apparctest\apparctestsisfiles\TCtrlPnlApp.sis
-data=ZSYSTEM\apparctestsisfiles\TestTrustedPriorityApp1.sis						apparctest\apparctestsisfiles\TestTrustedPriorityApp1.sis
-data=ZSYSTEM\apparctestsisfiles\TestUnTrustedPriorityApp1.sis					apparctest\apparctestsisfiles\TestUnTrustedPriorityApp1.sis
-data=ZSYSTEM\apparctestsisfiles\tRuleBasedApp1.sis								apparctest\apparctestsisfiles\tRuleBasedApp1.sis
-data=ZSYSTEM\apparctestsisfiles\tRuleBasedApp2.sis								apparctest\apparctestsisfiles\tRuleBasedApp2.sis
-data=ZSYSTEM\apparctestsisfiles\tRuleBasedApp3.sis								apparctest\apparctestsisfiles\tRuleBasedApp3.sis
-data=ZSYSTEM\apparctestsisfiles\tRuleBasedApp4.sis								apparctest\apparctestsisfiles\tRuleBasedApp4.sis
-data=ZSYSTEM\apparctestsisfiles\zerosizedicontestapp.sis						apparctest\apparctestsisfiles\zerosizedicontestapp.sis
-data=ZSYSTEM\apparctestsisfiles\ForceRegApp1.sis								apparctest\apparctestsisfiles\ForceRegApp1.sis
-data=ZSYSTEM\apparctestsisfiles\ForceRegApp2.sis								apparctest\apparctestsisfiles\ForceRegApp2.sis
-data=ZSYSTEM\apparctestsisfiles\ForceRegMultipleApps.sis						apparctest\apparctestsisfiles\ForceRegMultipleApps.sis
-data=ZSYSTEM\apparctestsisfiles\CustomiseDefaultIconApp.sis						apparctest\apparctestsisfiles\CustomiseDefaultIconApp.sis
-data=ZSYSTEM\apparctestsisfiles\TestMultipleAppsDowngrade.sis					apparctest\apparctestsisfiles\TestMultipleAppsDowngrade.sis
-data=ZSYSTEM\apparctestsisfiles\ticoncaptionoverride.sis						apparctest\apparctestsisfiles\ticoncaptionoverride.sis
-
-file=ABI_DIR\BUILD_DIR\ParentProcess.exe				Sys\bin\ParentProcess.exe
-file=ABI_DIR\BUILD_DIR\ChildI.exe						Sys\bin\ChildI.exe
-file=ABI_DIR\BUILD_DIR\ChildII.exe						Sys\bin\ChildII.exe
-file=ABI_DIR\BUILD_DIR\ChildIII.exe						Sys\bin\ChildIII.exe
-data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\ParentProcess_reg.Rsc	private\10003a3f\apps\ParentProcess_reg.RSC
-data=EPOCROOTepoc32\data\z\Resource\apps\ParentProcess.Rsc				Resource\apps\ParentProcess.Rsc
-data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\ChildI_reg.RSC			private\10003a3f\apps\ChildI_reg.RSC
-data=EPOCROOTepoc32\data\z\Resource\apps\ChildI.Rsc						Resource\apps\ChildI.Rsc
-data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\ChildII_reg.RSC		private\10003a3f\apps\ChildII_reg.RSC
-data=EPOCROOTepoc32\data\z\Resource\apps\ChildII.Rsc					Resource\apps\ChildII.Rsc
-data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\ChildIII_reg.RSC		private\10003a3f\apps\ChildIII_reg.RSC
-data=EPOCROOTepoc32\data\z\Resource\apps\ChildIII.Rsc					Resource\apps\ChildIII.Rsc
-
-data=ABI_DIR\BUILD_DIR\tstapp.doc				System\data\tstapp.doc
-data=ABI_DIR\BUILD_DIR\zero_len.txt				System\data\zero_len.txt	
-data=ABI_DIR\BUILD_DIR\one_byte.txt				System\data\one_byte.txt
-
-
-#ifdef SYMBIAN_DISTINCT_LOCALE_MODEL
-REM Copy new locale language dlls to ROM SFTB10.1 onwards
-file=ABI_DIR\BUILD_DIR\elocl_lan.002					Sys\bin\elocl_lan.002
-file=ABI_DIR\BUILD_DIR\elocl_lan.004					Sys\bin\elocl_lan.004
-file=ABI_DIR\BUILD_DIR\elocl_lan.005					Sys\bin\elocl_lan.005
-file=ABI_DIR\BUILD_DIR\elocl_lan.032					Sys\bin\elocl_lan.032
-#else
-// These are pre SYMBIAN_DISTINCT_LOCALE_MODEL language locale dlls.Not to be use SFTB10.1 onwards. 
-file=ABI_DIR\BUILD_DIR\ELOCL.01					Sys\bin\ELOCL.01
-file=ABI_DIR\BUILD_DIR\ELOCL.02					Sys\bin\ELOCL.02
-file=ABI_DIR\BUILD_DIR\ELOCL.03					Sys\bin\ELOCL.03
-file=ABI_DIR\BUILD_DIR\ELOCL.04					Sys\bin\ELOCL.04
-file=ABI_DIR\BUILD_DIR\ELOCL.05					Sys\bin\ELOCL.05
-file=ABI_DIR\BUILD_DIR\ELOCL.10					Sys\bin\ELOCL.10
-file=ABI_DIR\BUILD_DIR\ELOCL.32					Sys\bin\ELOCL.32
-#endif
-// This is now included in techview, from initlocale.iby
-//file=ABI_DIR\BUILD_DIR\ELOCL.LOC				Sys\bin\ELOCL.LOC
-
-
-data=EPOCROOT##epoc32\data\Z\Apparctest\Corrupted_reg.rsc									ApparcTest\Corrupted_reg.rsc
-data=EPOCROOT##epoc32\data\z\system\data\Testpath\file1.txt									System\data\Testpath\file1.txt
-data=EPOCROOT##epoc32\data\z\system\data\Testpath\file2.txt									System\data\Testpath\file2.txt
-data=EPOCROOT##epoc32\data\z\system\data\Testpath\FilterTests\testfile1.txt					System\data\Testpath\FilterTests\testfile1.txt
-data=EPOCROOT##epoc32\data\z\system\data\Testpath\FilterTests\testfile2.txt					System\data\Testpath\FilterTests\testfile2.txt
-data=EPOCROOT##epoc32\data\z\system\data\Testpath\FilterTests\testfile3.txt					System\data\Testpath\FilterTests\testfile3.txt
-data=EPOCROOT##epoc32\data\z\system\data\Testpath\FilterTests\testfile4.txt					System\data\Testpath\FilterTests\testfile4.txt
-data=EPOCROOT##epoc32\data\z\system\data\FileWithUnknownMimeType.UnrecognisableExtention	System\data\FileWithUnknownMimeType.UnrecognisableExtention
-data=ABI_DIR\BUILD_DIR\z\system\data\recmime_1.rsc								System\data\recmime_1.rsc
-data=ABI_DIR\BUILD_DIR\z\system\data\recmime_armv5.dll							System\data\recmime_armv5.dll
-data=ABI_DIR\BUILD_DIR\z\system\data\TApsRecogAppTest.mmr							System\data\TApsRecogAppTest.mmr
-data=ABI_DIR\BUILD_DIR\z\system\data\recupgrade.rsc								System\data\recupgrade.rsc
-data=ABI_DIR\BUILD_DIR\z\system\data\recupgrade2.rsc							System\data\recupgrade2.rsc
-data=ABI_DIR\BUILD_DIR\z\system\data\recupgrade_armv5_rel.dll					System\data\recupgrade_armv5_rel.dll
-data=ABI_DIR\BUILD_DIR\z\system\data\recupgrade2_armv5_rel.dll					System\data\recupgrade2_armv5_rel.dll
-data=ABI_DIR\BUILD_DIR\z\system\data\TApsRecogUpgradeTest.upg					System\data\TApsRecogUpgradeTest.upg
-data=ABI_DIR\BUILD_DIR\z\system\data\TApsRecogUpgradeTest.upr					System\data\TApsRecogUpgradeTest.upr
-
-
-data=EPOCROOT##epoc32\data\Z\Apparctest\testforceregistrationapp1_reg.rsc			ApparcTest\testforceregistrationapp1_reg.rsc
-data=EPOCROOT##epoc32\data\Z\Apparctest\testforceregistrationapp1_loc.rsc			ApparcTest\testforceregistrationapp1_loc.rsc
-
-data=EPOCROOTepoc32\data\Z\resource\apps\default_app_icon.m02								resource\apps\default_app_icon.m02
-
-data=EPOCROOTepoc32\data\Z\private\10202be9\1028583d.txt				         private\10202be9\1028583d.txt
-data=EPOCROOTepoc32\data\Z\private\10202be9\10003a3f.txt				         private\10202be9\10003a3f.txt
-
-
-// Change for Control panel Start
-file=ABI_DIR\BUILD_DIR\app_ctrl.exe											Sys\bin\app_ctrl.exe
-file=ABI_DIR\BUILD_DIR\app_ctrl2.exe										Sys\bin\app_ctrl2.exe
-data=EPOCROOTepoc32\data\z\private\10003a3f\import\apps\App_CTRL2_reg.Rsc	private\10003a3f\import\apps\App_CTRL2_reg.Rsc
-data=EPOCROOTepoc32\data\z\Resource\apps\App_CTRL2.Rsc						Resource\apps\App_CTRL2.Rsc
-// Change for Control panel End
-
-ECOM_PLUGIN(tforceregapprec.dll, A0001010.rsc)
-
-ECOM_PLUGIN(TLongUrlRecognizer.DLL,10004c4e.rsc)
-ECOM_PLUGIN(TBufferOnlyRec.DLL, 10207f88.rsc)
-
-data=ABI_DIR\BUILD_DIR\z\system\data\TRApaLsSessionStartAppTest.tst						System\data\TRApaLsSessionStartAppTest.tst
-ECOM_PLUGIN(TRApaLsSessionStartAppTestRecognizer.DLL,10000182.rsc)
-
-ECOM_PLUGIN(TAppLaunchChecker.DLL,1020d465.rsc)
-ECOM_PLUGIN(TAppLaunchChecker2.DLL,102722ba.rsc)
-ECOM_PLUGIN(TNonNativeAppLaunchChecker.DLL,A0000B70.rsc)
-
-ECOM_PLUGIN(testrec.dll,102032A5.rsc)
-
-file=ABI_DIR\BUILD_DIR\tssaac.exe                							sys\bin\tssaac.exe
-file=ABI_DIR\BUILD_DIR\tssaac_tapp.exe 										sys\bin\tssaac_tapp.exe
-data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\tssaac_tapp_reg.rsc		private\10003a3f\apps\tssaac_tapp_reg.rsc
-data=ZRESOURCE\apps\tssaac_tapp.rsc 										resource\apps\tssaac_tapp.rsc
-data=ZRESOURCE\apps\tssaac_tapp_loc.rsc 									resource\apps\tssaac_tapp_loc.rsc
-
-ECOM_PLUGIN(TNonNativeRec.DLL, 10207f95.rsc)
-data=EPOCROOTepoc32\data\Z\private\101F289C\gif.nna1	   				private\101F289C\gif.nna1
-data=EPOCROOTepoc32\data\Z\private\101F289C\html.nna2	   				private\101F289C\html.nna2
-data=EPOCROOTepoc32\data\Z\private\101F289C\contact.nna3	   			private\101F289C\contact.nna3
-data=EPOCROOTepoc32\data\Z\private\101F289C\txt.nna4	   				private\101F289C\txt.nna4
-
-data=EPOCROOT##epoc32\data\z\system\data\fl_goo.dm					System\data\fl_goo.dm
-data=EPOCROOT##epoc32\data\z\system\data\jpeg_wes.dm				System\data\jpeg_wes.dm
-data=EPOCROOT##epoc32\data\z\system\data\gif_wallpaper.gif				System\data\gif_wallpaper.gif
-data=EPOCROOT##epoc32\data\z\system\data\propelli.jpg	 				System\data\propelli.jpg
-data=EPOCROOT##epoc32\data\z\system\data\type-r.jpg					System\data\type-r.jpg
-data=EPOCROOT##epoc32\data\z\system\data\sd_goo.dcf	 				System\data\sd_goo.dcf
-
-ECOM_PLUGIN(recmime.DLL, 102822B7.rsc)
-data=EPOCROOTepoc32\data\z\Resource\Plugins\recmime.RSC     			apparctest\dummy.rsc
-
-ECOM_PLUGIN(recupgrade.DLL, recupgrade.rsc)
-
-data=ABI_DIR\DEBUG_DIR\ApparcTestServer.exe							sys\bin\ApparcTestServer.exe
-data=ABI_DIR\DEBUG_DIR\TIconLoaderAndIconArrayForLeaks.dll			sys\bin\TIconLoaderAndIconArrayForLeaks.dll
-
-data=DATAZ_\apparctest\apparctest_run.bat                     		\apparctest_run.bat
-
-data=DATAZ_\apparctest\apparctest_t_ApsScan.script            		\apparctest\apparctest_t_ApsScan.script
-data=DATAZ_\apparctest\apparctest_t_AppList.script            		\apparctest\apparctest_t_AppList.script
-data=DATAZ_\apparctest\apparctest_t_AppListFileUpdate.script            \apparctest\apparctest_t_AppListFileUpdate.script
-data=DATAZ_\apparctest\apparctest_t_AutoMMCReaderOpen.script  		\apparctest\apparctest_t_AutoMMCReaderOpen.script
-data=DATAZ_\apparctest\apparctest_t_Backup.script             		\apparctest\apparctest_t_Backup.script
-data=DATAZ_\apparctest\apparctest_t_Capability1.script        		\apparctest\apparctest_t_Capability1.script
-data=DATAZ_\apparctest\apparctest_t_Capability2.script        		\apparctest\apparctest_t_Capability2.script
-data=DATAZ_\apparctest\apparctest_t_DataTypeMappingWithSid.script  \apparctest\apparctest_t_DataTypeMappingWithSid.script
-data=DATAZ_\apparctest\apparctest_t_Caption.script            		\apparctest\apparctest_t_Caption.script
-data=DATAZ_\apparctest\apparctest_t_Cmdln.script              		\apparctest\apparctest_t_Cmdln.script
-data=DATAZ_\apparctest\apparctest_t_ControlPanelTest.script   		\apparctest\apparctest_t_ControlPanelTest.script
-data=DATAZ_\apparctest\apparctest_T_DataMappingPersistenceA.script	\apparctest\apparctest_T_DataMappingPersistenceA.script
-data=DATAZ_\apparctest\apparctest_T_DataMappingPersistenceB.script	\apparctest\apparctest_T_DataMappingPersistenceB.script
-data=DATAZ_\apparctest\apparctest_T_DataMappingPersistenceC.script	\apparctest\apparctest_T_DataMappingPersistenceC.script
-data=DATAZ_\apparctest\apparctest_t_EndTask.script             		\apparctest\apparctest_t_EndTask.script
-data=DATAZ_\apparctest\apparctest_t_Exe.script                		\apparctest\apparctest_t_Exe.script
-data=DATAZ_\apparctest\apparctest_t_File2.script               		\apparctest\apparctest_t_File2.script
-data=DATAZ_\apparctest\apparctest_t_File3.script               		\apparctest\apparctest_t_File3.script
-data=DATAZ_\apparctest\apparctest_t_Foreground.script         		\apparctest\apparctest_t_Foreground.script
-data=DATAZ_\apparctest\apparctest_t_GroupName.script          		\apparctest\apparctest_t_GroupName.script
-data=DATAZ_\apparctest\apparctest_t_GroupName_ver1.script     		\apparctest\apparctest_t_GroupName_ver1.script
-data=DATAZ_\apparctest\apparctest_t_GroupName_ver2.script     		\apparctest\apparctest_t_GroupName_ver2.script
-data=DATAZ_\apparctest\apparctest_t_Locale.script             		\apparctest\apparctest_t_Locale.script
-data=DATAZ_\apparctest\apparctest_t_Mdr.script                		\apparctest\apparctest_t_Mdr.script
-data=DATAZ_\apparctest\apparctest_t_mimecontentpolicy.script                  \apparctest\apparctest_t_mimecontentpolicy.script
-data=DATAZ_\apparctest\apparctest_t_Mru.script                		\apparctest\apparctest_t_Mru.script
-data=DATAZ_\apparctest\apparctest_t_NonNativeApps.script            \apparctest\apparctest_t_NonNativeApps.script
-data=DATAZ_\apparctest\apparctest_t_Notif.script              		\apparctest\apparctest_t_Notif.script
-data=DATAZ_\apparctest\apparctest_t_OOM.script                		\apparctest\apparctest_t_OOM.script
-data=DATAZ_\apparctest\apparctest_t_Pro.script                		\apparctest\apparctest_t_Pro.script
-data=DATAZ_\apparctest\apparctest_t_Proc.script              		\apparctest\apparctest_t_Proc.script
-data=DATAZ_\apparctest\apparctest_t_RApaLsSession.script      		\apparctest\apparctest_t_RApaLsSession.script
-data=DATAZ_\apparctest\apparctest_t_RuleBasedLaunching.script 		\apparctest\apparctest_t_RuleBasedLaunching.script
-data=DATAZ_\apparctest\apparctest_t_Serv2.script              		\apparctest\apparctest_t_Serv2.script
-data=DATAZ_\apparctest\apparctest_t_Serv3.script              		\apparctest\apparctest_t_Serv3.script
-data=DATAZ_\apparctest\apparctest_t_ServiceRegistry.script    		\apparctest\apparctest_t_ServiceRegistry.script
-data=DATAZ_\apparctest\apparctest_t_Services.script           		\apparctest\apparctest_t_Services.script
-data=DATAZ_\apparctest\apparctest_t_StartApp.script           		\apparctest\apparctest_t_StartApp.script
-data=DATAZ_\apparctest\apparctest_t_StartDoc.script           		\apparctest\apparctest_t_StartDoc.script
-data=DATAZ_\apparctest\apparctest_t_WindowChaining.script     		\apparctest\apparctest_t_WindowChaining.script
-data=DATAZ_\apparctest\apparctest_t_Wgnam.script              		\apparctest\apparctest_t_Wgnam.script
-data=DATAZ_\apparctest\apparctest_t_IntegritySupport.script		\apparctest\apparctest_t_IntegritySupport.script
-data=DATAZ_\apparctest\apparctest_t_IntegritySupportReboot1.script	\apparctest\apparctest_t_IntegritySupportReboot1.script
-data=DATAZ_\apparctest\apparctest_t_IntegritySupportReboot2.script	\apparctest\apparctest_t_IntegritySupportReboot2.script
-data=DATAZ_\apparctest\apparctest_t_largestack.script				\apparctest\apparctest_t_largestack.script
-data=DATAZ_\apparctest\apparctest_t_drivenotification.script			\apparctest\apparctest_t_drivenotification.script
-data=DATAZ_\apparctest\apparctest_t_servicebase.script			\apparctest\apparctest_t_servicebase.script
-data=DATAZ_\apparctest\apparctest_t_RecUpgrade.script			\apparctest\apparctest_t_RecUpgrade.script
-data=DATAZ_\apparctest\apparctest_t_UpdateAppList.script			\apparctest\apparctest_t_UpdateAppList.script
-
-data=DATAZ_\apparctest\apparctest_t_forcereg.script					\apparctest\apparctest_t_forcereg.script
-data=DATAZ_\apparctest\apparctest_t_clientnotif.script				\apparctest\apparctest_t_clientnotif.script
-data=DATAZ_\apparctest\apparctest_t_nonnativetest.script			\apparctest\apparctest_t_nonnativetest.script
-
-REM SysStart Apparc Scripts
-data=DATAZ_\apparctest\apparctest_T_TestStartApp1L.script		\apparctest\apparctest_T_TestStartApp1L.script		
-data=DATAZ_\apparctest\apparctest_T_TestStartApp2L.script		\apparctest\apparctest_T_TestStartApp2L.script		
-data=DATAZ_\apparctest\apparctest_T_TestStartApp3L.script		\apparctest\apparctest_T_TestStartApp3L.script		
-data=DATAZ_\apparctest\apparctest_T_TestStartApp4L.script		\apparctest\apparctest_T_TestStartApp4L.script		
-data=DATAZ_\apparctest\apparctest_T_TestStartApp5L.script		\apparctest\apparctest_T_TestStartApp5L.script		
-data=DATAZ_\apparctest\apparctest_T_TestStartApp6L.script		\apparctest\apparctest_T_TestStartApp6L.script		
-data=DATAZ_\apparctest\apparctest_T_TestGetAllApps.script     		\apparctest\apparctest_T_TestGetAllApps.script     	
-data=DATAZ_\apparctest\apparctest_T_TestInsertDataTypeL.script		\apparctest\apparctest_T_TestInsertDataTypeL.script	
-data=DATAZ_\apparctest\apparctest_T_TestAppForDataTypeL.script		\apparctest\apparctest_T_TestAppForDataTypeL.script	
-data=DATAZ_\apparctest\apparctest_T_TestDeleteDataTypeL.script		\apparctest\apparctest_T_TestDeleteDataTypeL.script	
-data=DATAZ_\apparctest\apparctest_T_TestServiceDiscovery.script		\apparctest\apparctest_T_TestServiceDiscovery.script	
-data=DATAZ_\apparctest\apparctest_T_TestGetAppInfo.script     		\apparctest\apparctest_T_TestGetAppInfo.script     	
-data=DATAZ_\apparctest\apparctest_T_TestAppCount.script     		\apparctest\apparctest_T_TestAppCount.script     	
-data=DATAZ_\apparctest\apparctest_T_TestCreateDoc.script      		\apparctest\apparctest_T_TestCreateDoc.script      	
-data=DATAZ_\apparctest\apparctest_T_TestLocalisedCaptionL.script	\apparctest\apparctest_T_TestLocalisedCaptionL.script
-
-REM End of Application Architecture Framework unit test iby file
-
-patchdata apgrfx.dll @ KMinApplicationStackSize 0xf000
-patchdata apserv.dll @ KApaDrivesToMonitor 4
-#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,635 @@
+// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Application architecture
+// 
+//
+
+/**
+ @file
+ @test
+*/
+
+
+PRJ_PLATFORMS
+WINC DEFAULT
+
+
+PRJ_EXPORTS
+// specify the source file followed by its destination here
+// copy will be used to copy the source file to its destination
+// If there's no destination then the source file will be copied
+// to the same name in /epoc32/include
+
+// Files from aincc.prj
+../inc/APACLN.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apacln.h)
+../inc/APACMDLN.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apacmdln.h)
+../inc/APADBASE.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apadbase.h)
+../inc/APADEF.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apadef.h)
+../inc/APAFLREC.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apaflrec.h)
+../inc/APAID.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apaid.h)
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+../inc/apaidpartner.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apaidpartner.h)
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
+../inc/APAMDR.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apamdr.h)
+../inc/APPARC.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apparc.h)
+../inc/apaapp.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apaapp.h)
+../inc/apadoc.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apadoc.h)
+../inc/apaproc.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apaproc.h)
+../inc/APASVST.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apasvst.h)
+../inc/ApaServerApp.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apaserverapp.h)
+
+// Files from fincc.prj
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../inc/APFFNDR.H /epoc32/include/apffndr.h
+#endif
+../inc/APFREC.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apfrec.h)
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../inc/APFDEF.H /epoc32/include/apfdef.h
+#endif
+../inc/APFCTLF.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apfctlf.h)
+../inc/APRuleBased.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(aprulebased.h)
+../inc/ApLaunchChecker.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(aplaunchchecker.h)
+
+../inc/ApSidChecker.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apsidchecker.h)
+
+// Files from gincc.prj
+../inc/APGAPLST.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apgaplst.h)
+../inc/APGCLI.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgcli.h)
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+../inc/apgupdate.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgupdate.h)
+#endif
+
+../inc/APGDOOR.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgdoor.h)
+../inc/APGICNFL.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgicnfl.h)
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+../inc/apgicnflpartner.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apgicnflpartner.h)
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
+../inc/APGTASK.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgtask.h)
+../inc/APGWGNAM.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgwgnam.h)
+../inc/APSSCAN.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apsscan.h)
+../inc/APGCTL.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgctl.h)
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+../inc/apgctllist.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apgctllist.h)
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
+../inc/apgnotif.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apgnotif.h)
+../inc/Apcaptionfile.rh SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apcaptionfile.rh)
+
+../inc/apfmimecontentpolicy.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apfmimecontentpolicy.h)
+
+// Service registry
+../inc/ServiceRegistry.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(serviceregistry.h)
+
+../inc/AppInfo.rh /epoc32/include/appinfo.rh
+
+../group/apparc.iby /epoc32/rom/include/apparc.iby
+
+// File from ../inc (which is relocated from app-framework/aiftool/inc)
+../inc/AIFTOOL.RH /epoc32/include/aiftool.rh
+
+//Backup and restore exports
+../group/backup_registration.xml	/epoc32/data/z/private/10003a3f/backup_registration.xml
+../group/backup_registration.xml	/epoc32/release/winscw/urel/z/private/10003a3f/backup_registration.xml
+../group/backup_registration.xml	/epoc32/release/winscw/udeb/z/private/10003a3f/backup_registration.xml
+
+// ConfML files
+../conf/apparchitecture.confml          		MW_LAYER_EXPORTS_CONFML(apparchitecture.confml)
+../conf/apparchitecture_1028583d.crml   		MW_LAYER_EXPORTS_CRML(apparchitecture_1028583d.crml)
+../conf/apparchitecture_closedcontentextinfo.confml          		MW_LAYER_EXPORTS_CONFML(apparchitecture_closedcontentextinfo.confml)
+../conf/apparchitecture_closedcontentextinfo_10003a3f.crml   		MW_LAYER_EXPORTS_CRML(apparchitecture_closedcontentextinfo_10003a3f.crml)
+
+PRJ_MMPFILES
+
+../group/APPARC.MMP
+../group/APGRFX.MMP
+../group/APLIST.MMP
+../group/APFILE.MMP
+../group/APSERV.MMP
+../group/APSEXE.MMP
+../group/ServiceRegistry.mmp
+
+#ifndef SYMBIAN_SYSTEM_STATE_MANAGEMENT
+../apstart/apstart.mmp
+#endif //SYMBIAN_SYSTEM_STATE_MANAGEMENT
+
+
+PRJ_TESTMMPFILES
+// specify the .mmp files required for building any test programs here
+//
+// you can specify "manual" to denote that a test should be listed in a generated
+// batch file for running a group of tests which require user input during testing.
+// you can specify "support" to denote that a file is a test support file and shouldn't
+// be listed in a batch file for running a group of tests
+// By default, each test will be listed in a batch file for running a group of tests
+// which can be left to run without requiring watching over by the person running the tests,
+// i.e. tests where no user input is required.  The default will apply if neither "manual"
+// or "support" is specified.
+../tef/apparctestserver.MMP
+
+../tef/TAppInstall/TestAppInstall.mmp
+../tef/CustomiseDefaultIconApp.mmp	support
+../tef/TCtrlPnlApp.mmp	support
+../tef/T_DataPrioritySystem3.mmp	support
+../tef/T_groupname.mmp	support
+../tef/T_groupname_ver1.mmp	support
+../tef/T_groupname_ver2.mmp	support
+../tef/TestTrustedPriorityApp1.mmp	support
+../tef/TestTrustedPriorityApp2.mmp	support
+../tef/TestUnTrustedPriorityApp1.mmp support
+../tef/TestUnTrustedPriorityApp2.mmp support
+../tef/openservice1app.mmp	support
+../tef/openservice2app.mmp	support
+../tef/serverapp.mmp	support
+../tef/serverapp2.mmp	support
+../tef/serverapp3.mmp	support
+../tef/serverapp4.mmp	support
+../tef/serverapp6.mmp	support
+../tef/serverapp7.mmp	support
+../tef/SimpleApparcTestApp.mmp	support
+../tef/zerosizedicontestapp.mmp	support
+../tef/TAppNotEmbeddable_v2.mmp support
+../tef/TAppEmbeddable_embedded.mmp support
+../tef/TAppEmbeddable_standalone.mmp support
+../tef/TAppEmbeddableOnly_v2.mmp support
+../tef/TAppEmbeddableUiOrStandAlone_embedded.mmp support
+../tef/TAppEmbeddableUiOrStandalone_standalone.mmp support
+../tef/TAppEmbeddableUiNotStandAlone_v2.mmp support
+../tef/TStartDocApp_v2.mmp support
+../tef/t_winchainChild.mmp support
+../tef/t_winchainLaunch.mmp support
+../tef/TRApaLsSessionStartAppTestApp_v2.mmp support
+../tef/tRuleBasedApps/tRuleBasedApp1.mmp support
+../tef/tRuleBasedApps/tRuleBasedApp2.mmp support
+../tef/tRuleBasedApps/tRuleBasedApp3.mmp support
+../tef/tRuleBasedApps/tRuleBasedApp4.mmp support
+../tef/TApparcTestApp.mmp support
+../tef/app_CTRL.MMP
+../tef/T_EnvSlots/T_EnvSlots.MMP
+../tef/ParentProcess.mmp
+../tef/ChildI.mmp
+../tef/ChildII.mmp
+../tef/ChildIII.mmp
+../tef/T_DataPrioritySystem1/T_DataPrioritySystem1.MMP
+../tef/T_DataPrioritySystem2/T_DataPrioritySystem2.MMP
+../tef/TNonNative/TNNApp1.mmp
+../tef/TNonNative/TNNApp2.mmp
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+../tef/TSidChecker/TestSidChecker.mmp
+#endif
+
+../tef/TEndTaskTestApp/EndTaskTestApp.mmp
+../tef/tlargestack/tlargestackapp.mmp
+../tef/UnProctectedUidApp.mmp	support
+../tef/tupgradeiconapp/tupgradeiconapp.mmp
+../tef/tnotifydrivesapp/tnotifydrivesapp.mmp
+../tef/ticoncaptionoverride.mmp
+../tef/testapp/testforceregistrationapp1/testforceregistrationapp1.mmp
+
+// testupdregappuninstallation is used in t_serviceregistry test. If any changes done to
+// this application, uncomment testupdregappuninstallation.mmp file and build it.
+// Then comment it and copy the testupdregappuninstallation_reg.rsc file to ../tdata folder.
+// Delete any testupdregappuninstallation* files from epoc32 directory.
+//../tef/testapp/testupdregappuninstallation/testupdregappuninstallation.mmp
+
+// testupgradeupdregappuninstallation is used in t_serviceregistry test. If any changes done to
+// this application, uncomment testupdregappuninstallation.mmp file and build it.
+// Then comment it and copy the testupgradeupdregappuninstallation_reg.rsc file to ../tdata folder.
+// Delete any testupdregappuninstallation* files from epoc32 directory.
+//../tef/testapp/testupgradeupdregappuninstallation/testupgradeupdregappuninstallation.mmp
+
+
+//plugins
+../tef/TNonNativeAppLaunchChecker.mmp support
+../tef/TAppLaunchChecker.mmp support
+../tef/TAppLaunchChecker2.mmp support
+../tef/TESTREC/TESTREC.MMP
+../tef/TBufferOnlyRec/TBufferOnlyRec.mmp
+../tef/TMimeRec/recmime.MMP
+//  RecMime_1 binaries are used to install and uninstall the mime type recognizer during runtime in TRApaLsSessionTestStep.
+//../tef/TMimeRec1/RecMime_1.MMP
+
+
+../tef/m_ctrl_v2.mmp	support
+../tef/m_ctrl_v2_Stub.mmp
+../tef/TSTAPP_embedded.MMP 	support
+../tef/TCmdLineExe.mmp 	support
+../tef/app_CTRL2.MMP
+../tef/app_CTRL2_stub.MMP
+../tef/tssaac/tssaac.mmp
+../tef/tssaac/tssaac_tapp.mmp
+../tef/TEXE_V2.MMP 	support
+
+
+../tef/TSTAPP_standalone.MMP	support
+../tef/TSTAPP_standalone_Stub.MMP
+../tef/TNonNative/TNonNativeRec.mmp
+../tef/TLongUrlRecognizer_v2.mmp support
+../tef/TRApaLsSessionStartAppTestRecognizer_v2.mmp support
+
+../tef/TIconLoaderAndIconArrayForLeaks.mmp
+
+../tef/TRecUpgrade/recupgrade.mmp
+../tef/refnativeplugin/refnativeplugin.mmp
+
+//*****************************************************************************************************************************************************************************************************
+//recupgrade_1 plug-in is used to upgrade the mime type recognizer during runtime in T_RecUpgrade test.  
+//              It is build for armv5 and rename to recupgrade_armv5_rel.dll and copied to apparc/Tdata before actual code builds.  If you are making any change in recupgrade_1.cpp then uncomment 
+//              “recupgrade_1.MMP” , build , rename (.dll) and copy as mentioned above .
+//*****************************************************************************************************************************************************************************************************
+//../tef/TRecUpgrade_1/recupgrade_1.MMP
+
+
+// ***************************************************************************************************************************************************************************************************
+// recupgrade_2 plug-in is used to upgrade the mime type recognizer during runtime in T_RecUpgrade test.  
+//              It is build for armv5 and rename to recupgrade2_armv5_rel.dll and copied to apparc/Tdata before actual code builds.  If you are making any change in recupgrade_2.cpp then uncomment 
+//              “recupgrade_2.MMP” , build , rename (.dll) and copy as mentioned above .
+// ***************************************************************************************************************************************************************************************************
+//../tef/TRecUpgrade_2/recupgrade_2.MMP
+
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+../tef/forceregapps/forceregapp1.mmp
+../tef/forceregapps/forceregapp2.mmp
+../tef/forceregapps/TForceRegAppRec.mmp
+../tef/tnonnativeruntime/tnonnativeruntime.mmp
+#endif
+
+makefile ../tef/testpkg/preparesis.fil
+makefile ../tef/testpkg/preparesis_stub.fil
+
+PRJ_TESTEXPORTS
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+../group/apparcTest.iby /epoc32/rom/include/apparctest.iby
+#else
+../group/apparcTest_new.iby /epoc32/rom/include/apparctest.iby
+#endif
+
+
+../tef/scripts/hardware/apparctest_run.bat                  z:/apparctest/apparctest_run.bat
+../tef/scripts/emulator/apparctest_run.bat                  /epoc32/release/winscw/udeb/apparctest_run.bat
+../tef/scripts/emulator/apparctest_run.bat                  /epoc32/release/winscw/urel/apparctest_run.bat
+
+
+../tef/scripts/apparctest_T_AppList.script            		z:/apparctest/apparctest_t_applist.script
+../tef/scripts/apparctest_T_AppListFile_Boot1.script		z:/apparctest/apparctest_t_applistfile_boot1.script
+../tef/scripts/apparctest_T_AppListFile_Boot2.script		z:/apparctest/apparctest_t_applistfile_boot2.script
+../tef/scripts/apparctest_T_AppListFile_Boot3.script		z:/apparctest/apparctest_t_applistfile_boot3.script
+../tef/scripts/apparctest_T_AppListFileUpdate.script		z:/apparctest/apparctest_t_applistfileupdate.script
+../tef/scripts/apparctest_t_ApsScan.script            		z:/apparctest/apparctest_t_apsscan.script
+../tef/scripts/apparctest_T_AutoMMCReaderOpen.script  		z:/apparctest/apparctest_t_autommcreaderopen.script
+../tef/scripts/apparctest_T_Backup.script             		z:/apparctest/apparctest_t_backup.script
+../tef/scripts/apparctest_T_Capability1.script        		z:/apparctest/apparctest_t_capability1.script
+../tef/scripts/apparctest_T_Capability2.script        		z:/apparctest/apparctest_t_capability2.script
+../tef/scripts/apparctest_T_DataTypeMappingWithSid.script  z:/apparctest/apparctest_t_datatypemappingwithsid.script
+../tef/scripts/apparctest_T_Caption.script            		z:/apparctest/apparctest_t_caption.script
+../tef/scripts/apparctest_T_Cmdln.script              		z:/apparctest/apparctest_t_cmdln.script
+../tef/scripts/apparctest_T_ControlPanelTest.script   		z:/apparctest/apparctest_t_controlpaneltest.script
+../tef/scripts/apparctest_T_DataMappingPersistenceA.script	z:/apparctest/apparctest_t_datamappingpersistencea.script
+../tef/scripts/apparctest_T_DataMappingPersistenceB.script	z:/apparctest/apparctest_t_datamappingpersistenceb.script
+../tef/scripts/apparctest_T_DataMappingPersistenceC.script	z:/apparctest/apparctest_t_datamappingpersistencec.script
+../tef/scripts/apparctest_T_EndTask.script                	z:/apparctest/apparctest_t_endtask.script
+../tef/scripts/apparctest_T_Exe.script                		z:/apparctest/apparctest_t_exe.script
+../tef/scripts/apparctest_t_File2.script               		z:/apparctest/apparctest_t_file2.script
+../tef/scripts/apparctest_T_File3.script               		z:/apparctest/apparctest_t_file3.script
+../tef/scripts/apparctest_T_Foreground.script         		z:/apparctest/apparctest_t_foreground.script
+../tef/scripts/apparctest_T_GroupName.script          		z:/apparctest/apparctest_t_groupname.script
+../tef/scripts/apparctest_T_GroupName_ver1.script     		z:/apparctest/apparctest_t_groupname_ver1.script
+../tef/scripts/apparctest_T_GroupName_ver2.script     		z:/apparctest/apparctest_t_groupname_ver2.script
+../tef/scripts/apparctest_T_Locale.script             		z:/apparctest/apparctest_t_locale.script
+../tef/scripts/apparctest_T_Mdr.script                		z:/apparctest/apparctest_t_mdr.script
+../tef/scripts/apparctest_t_mimecontentpolicy.script		z:/apparctest/apparctest_t_mimecontentpolicy.script
+../tef/scripts/apparctest_T_Mru.script                		z:/apparctest/apparctest_t_mru.script
+../tef/scripts/apparctest_t_NonNativeApps.script  			z:/apparctest/apparctest_t_nonnativeapps.script
+../tef/scripts/apparctest_T_Notif.script              		z:/apparctest/apparctest_t_notif.script
+../tef/scripts/apparctest_T_OOM.script                		z:/apparctest/apparctest_t_oom.script
+../tef/scripts/apparctest_T_Pro.script                		z:/apparctest/apparctest_t_pro.script
+../tef/scripts/apparctest_T_Proc.script               		z:/apparctest/apparctest_t_proc.script
+../tef/scripts/apparctest_T_RApaLsSession.script      		z:/apparctest/apparctest_t_rapalssession.script
+../tef/scripts/apparctest_T_RuleBasedLaunching.script 		z:/apparctest/apparctest_t_rulebasedlaunching.script
+../tef/scripts/apparctest_T_Serv2.script              		z:/apparctest/apparctest_t_serv2.script
+../tef/scripts/apparctest_T_Serv3.script              		z:/apparctest/apparctest_t_serv3.script
+../tef/scripts/apparctest_T_ServiceRegistry.script    		z:/apparctest/apparctest_t_serviceregistry.script
+../tef/scripts/apparctest_T_Services.script           		z:/apparctest/apparctest_t_services.script
+../tef/scripts/apparctest_T_StartApp.script           		z:/apparctest/apparctest_t_startapp.script
+../tef/scripts/apparctest_T_StartDoc.script           		z:/apparctest/apparctest_t_startdoc.script
+../tef/scripts/apparctest_T_WindowChaining.script     		z:/apparctest/apparctest_t_windowchaining.script
+../tef/scripts/apparctest_T_Wgnam.script              		z:/apparctest/apparctest_t_wgnam.script
+../tef/scripts/apparctest_T_IntegritySupport.script			z:/apparctest/apparctest_t_integritysupport.script
+../tef/scripts/apparctest_T_IntegritySupportReboot1.script	z:/apparctest/apparctest_t_integritysupportreboot1.script
+../tef/scripts/apparctest_T_IntegritySupportReboot2.script	z:/apparctest/apparctest_t_integritysupportreboot2.script
+../tef/scripts/apparctest_t_largestack.script				z:/apparctest/apparctest_t_largestack.script
+../tef/scripts/apparctest_t_drivenotification.script		z:/apparctest/apparctest_t_drivenotification.script
+../tef/scripts/apparctest_t_servicebase.script				z:/apparctest/apparctest_t_servicebase.script
+../tef/scripts/apparctest_t_RecUpgrade.script         		z:/apparctest/apparctest_t_recupgrade.script
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+../tef/scripts/apparctest_t_UpdateAppList.script			z:/apparctest/apparctest_t_updateapplist.script
+../tef/scripts/apparctest_t_forcereg.script					z:/apparctest/apparctest_t_forcereg.script
+../tef/scripts/apparctest_t_clientnotif.script				z:/apparctest/apparctest_t_clientnotif.script
+../tef/scripts/apparctest_t_nonnativetest.script			z:/apparctest/apparctest_t_nonnativetest.script
+#endif
+
+//SysStart Apparc Scripts
+../tef/scripts/apparctest_T_TestStartApp1L.script			z:/apparctest/apparctest_t_teststartapp1l.script		
+../tef/scripts/apparctest_T_TestStartApp2L.script			z:/apparctest/apparctest_t_teststartapp2l.script		
+../tef/scripts/apparctest_T_TestStartApp3L.script			z:/apparctest/apparctest_t_teststartapp3l.script		
+../tef/scripts/apparctest_T_TestStartApp4L.script			z:/apparctest/apparctest_t_teststartapp4l.script		
+../tef/scripts/apparctest_T_TestStartApp5L.script			z:/apparctest/apparctest_t_teststartapp5l.script		
+../tef/scripts/apparctest_T_TestStartApp6L.script			z:/apparctest/apparctest_t_teststartapp6l.script		
+../tef/scripts/apparctest_T_TestGetAllApps.script     		z:/apparctest/apparctest_t_testgetallapps.script     	
+../tef/scripts/apparctest_T_TestInsertDataTypeL.script		z:/apparctest/apparctest_t_testinsertdatatypel.script	
+../tef/scripts/apparctest_T_TestAppForDataTypeL.script		z:/apparctest/apparctest_t_testappfordatatypel.script	
+../tef/scripts/apparctest_T_TestDeleteDataTypeL.script		z:/apparctest/apparctest_t_testdeletedatatypel.script	
+../tef/scripts/apparctest_T_TestServiceDiscovery.script		z:/apparctest/apparctest_t_testservicediscovery.script	
+../tef/scripts/apparctest_T_TestGetAppInfo.script     		z:/apparctest/apparctest_t_testgetappinfo.script     	
+../tef/scripts/apparctest_T_TestAppCount.script		        z:/apparctest/apparctest_t_testappcount.script		
+../tef/scripts/apparctest_T_TestCreateDoc.script      		z:/apparctest/apparctest_t_testcreatedoc.script      	
+../tef/scripts/apparctest_T_TestLocalisedCaptionL.script	z:/apparctest/apparctest_t_testlocalisedcaptionl.script
+
+
+
+
+// SysStart batch files for hardware test execution
+../tef/tssaac/scripts/hardware/sysstart_apparc_run.bat				/epoc32/data/z/apparctest/sysstart_apparc_run.bat
+../tef/tssaac/scripts/hardware/sysstart_apparc_buildrom.bat			/epoc32/data/z/apparctest/sysstart_apparc_buildrom.bat
+../tef/tssaac/scripts/hardware/sysstart_apparc_checkEpocWind.bat	/epoc32/data/z/apparctest/sysstart_apparc_checkepocwind.bat
+../tef/tssaac/scripts/hardware/sysstart_apparc_insertlog.pl			/epoc32/data/z/apparctest/sysstart_apparc_insertlog.pl
+// WINSCW UDEB
+../tef/tssaac/scripts/emulator/sysstart_apparc_run.bat				/epoc32/release/winscw/udeb/sysstart_apparc_run.bat 
+../tef/tssaac/scripts/emulator/sysstart_apparc_setup.bat			/epoc32/release/winscw/udeb/z/apparctest/sysstart_apparc_setup.bat
+../tef/tssaac/scripts/emulator/sysstart_apparc_checkEpocWind.bat	/epoc32/release/winscw/udeb/z/apparctest/sysstart_apparc_checkepocwind.bat
+// WINSCW UREL
+../tef/tssaac/scripts/emulator/sysstart_apparc_run.bat				/epoc32/release/winscw/urel/sysstart_apparc_run.bat 
+../tef/tssaac/scripts/emulator/sysstart_apparc_setup.bat			/epoc32/release/winscw/urel/z/apparctest/sysstart_apparc_setup.bat
+../tef/tssaac/scripts/emulator/sysstart_apparc_checkEpocWind.bat	/epoc32/release/winscw/urel/z/apparctest/sysstart_apparc_checkepocwind.bat
+
+../tef/tupgradeiconapp/tupgradeiconapp.mbm					/epoc32/release/winscw/udeb/z/apparctestregfiles/tupgradeiconapp.mbm
+
+// epoc32/data
+
+// export certificates for creating sis files
+../tef/testpkg/Nokia_RnDCert_02.der							/epoc32/tools/Nokia_RnDCert_02.der
+../tef/testpkg/Nokia_RnDCert_02.key							/epoc32/tools/Nokia_RnDCert_02.key
+../tef/testpkg/swicertstore.dat								/epoc32/release/winscw/udeb/z/resource/swicertstore.dat
+
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+../tef/tstnnapp.mbm											/epoc32/data/z/resource/apps/tstnnapp.mbm
+../tdata/AAA_reg.Rsc 										/epoc32/data/z/apparctest/aaa_reg.rsc
+#endif
+
+../tdata/forcegtestapp1.frg1								/epoc32/data/z/apparctest/forcegtestapp1.frg1
+../tdata/forcegtestapp2.frg2								/epoc32/data/z/apparctest/forcegtestapp2.frg2
+../tdata/scr_test.db										/epoc32/data/z/apparctest/scr_test.db
+
+../tef/tstappviewneg.mbm									/epoc32/data/z/resource/apps/tstappviewneg.mbm
+../tef/App_ctrl.MBM											/epoc32/release/winscw/udeb/z/apparctestregfiles/app_ctrl.mbm
+../tef/svg_icon.svg											/epoc32/release/winscw/udeb/z/apparctestregfiles/svg_icon.svg
+../tef/zerosizedicon.mbm									/epoc32/release/winscw/udeb/z/apparctestregfiles/zerosizedicon.mbm
+../tdata/Corrupted_reg.RSC									/epoc32/data/z/apparctest/corrupted_reg.rsc
+
+../tdata/testfile4.txt 										/epoc32/data/z/system/data/testpath/filtertests/testfile4.txt
+../tef/tstappviewneg.xyz									/epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.xyz
+../tef/tstappviewneg.xyz									/epoc32/data/z/resource/apps/tstappviewneg.xyz
+../tdata/GIF.NNA1 											/epoc32/data/z/private/101f289c/gif.nna1
+../tdata/HTML.NNA2 											/epoc32/data/z/private/101f289c/html.nna2
+../tdata/CONTACT.NNA3 										/epoc32/data/z/private/101f289c/contact.nna3
+../tdata/TXT.NNA4 											/epoc32/data/z/private/101f289c/txt.nna4
+../tdata/TSTAPPU.DOC 										/epoc32/data/z/system/data/tstapp.doc
+../tdata/zero_len.txt 										/epoc32/data/z/system/data/zero_len.txt
+../tdata/one_byte.txt 										/epoc32/data/z/system/data/one_byte.txt
+../tdata/TRApaLsSessionStartAppTest.tst 					/epoc32/data/z/system/data/trapalssessionstartapptest.tst
+../tdata/file1.txt 											/epoc32/data/z/system/data/testpath/file1.txt
+../tdata/file2.txt 											/epoc32/data/z/system/data/testpath/file2.txt
+../tdata/testfile1.txt 										/epoc32/data/z/system/data/testpath/filtertests/testfile1.txt
+../tdata/testfile2.txt 										/epoc32/data/z/system/data/testpath/filtertests/testfile2.txt
+../tdata/testfile3.txt 										/epoc32/data/z/system/data/testpath/filtertests/testfile3.txt
+../tdata/FileWithUnknownMimeType.UnrecognisableExtention	/epoc32/data/z/system/data/filewithunknownmimetype.unrecognisableextention
+../tdata/TApsRecogAppTest.mmr								/epoc32/data/z/system/data/tapsrecogapptest.mmr
+
+../tdata/TApsRecogUpgradeTest.upg				/epoc32/data/z/system/data/tapsrecogupgradetest.upg
+../tdata/TApsRecogUpgradeTest.upr				/epoc32/data/z/system/data/tapsrecogupgradetest.upr
+../tdata/mimecontentpolicy/sd_goo.dcf			/epoc32/data/z/system/data/sd_goo.dcf
+../tdata/mimecontentpolicy/fl_goo.dm			/epoc32/data/z/system/data/fl_goo.dm
+../tdata/mimecontentpolicy/jpeg_wes.dm			/epoc32/data/z/system/data/jpeg_wes.dm
+../tdata/mimecontentpolicy/gif_wallpaper.gif	/epoc32/data/z/system/data/gif_wallpaper.gif
+../tdata/mimecontentpolicy/propelli.jpg	 		/epoc32/data/z/system/data/propelli.jpg
+../tdata/mimecontentpolicy/type-r.jpg			/epoc32/data/z/system/data/type-r.jpg
+../tdata/1028583d.txt 							/epoc32/data/z/private/10202be9/1028583d.txt //test Central Repository initialisation file
+../tdata/10003a3f.txt 							/epoc32/data/z/private/10202be9/10003a3f.txt //Test repository file contains closed content and extension information
+
+
+// WINSCW UDEB
+// exporting db & certstore for winscw
+../tdata/scr.db										/epoc32/release/winscw/udeb/z/sys/install/scr/provisioned/scr.db
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+../tef/tstnnapp.mbm									/epoc32/release/winscw/udeb/z/resource/apps/tstnnapp.mbm
+../tef/App_ctrl.MBM											/epoc32/release/winscw/udeb/z/resource/apps/app_ctrl.mbm
+../tef/svg_icon.svg											/epoc32/release/winscw/udeb/z/resource/apps/svg_icon.svg
+../tdata/AAA_reg.Rsc 										/epoc32/release/winscw/udeb/z/apparctest/aaa_reg.rsc 
+../tdata/102081cf_reg.rsc									/epoc32/release/winscw/udeb/z/system/data/102081cf_reg.rsc
+../tdata/102081ce_reg.rsc									/epoc32/release/winscw/udeb/z/system/data/102081ce_reg.rsc
+../tdata/testupdregappuninstallation_reg.rsc			/epoc32/release/winscw/udeb/z/system/data/testupdregappuninstallation_reg.rsc
+../tdata/testupgradeupdregappuninstallation_reg.rsc			/epoc32/release/winscw/udeb/z/system/data/testupgradeupdregappuninstallation_reg.rsc
+../tef/zerosizedicon.mbm									/epoc32/release/winscw/udeb/z/apparctestregfiles/zerosizedicon.mbm
+../tef/tstappviewneg.xyz									/epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.xyz
+#endif
+
+../tdata/scr_test.db										/epoc32/release/winscw/udeb/z/apparctest/scr_test.db
+../tef/tstappviewneg.xyz									/epoc32/release/winscw/udeb/z/resource/apps/tstappviewneg.xyz
+../tef/tstappviewneg.mbm									/epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.mbm
+../tef/tstappviewneg.mbm									/epoc32/release/winscw/udeb/z/resource/apps/tstappviewneg.mbm
+../tdata/Corrupted_reg.RSC									/epoc32/release/winscw/udeb/z/apparctest/corrupted_reg.rsc
+
+../tdata/GIF.NNA1 											/epoc32/release/winscw/udeb/z/private/101f289c/gif.nna1
+../tdata/HTML.NNA2 											/epoc32/release/winscw/udeb/z/private/101f289c/html.nna2
+../tdata/CONTACT.NNA3 										/epoc32/release/winscw/udeb/z/private/101f289c/contact.nna3
+../tdata/TXT.NNA4 											/epoc32/release/winscw/udeb/z/private/101f289c/txt.nna4
+../tdata/TSTAPPU.DOC 										/epoc32/release/winscw/udeb/z/system/data/tstapp.doc
+../tdata/zero_len.txt 										/epoc32/release/winscw/udeb/z/system/data/zero_len.txt
+../tdata/one_byte.txt 										/epoc32/release/winscw/udeb/z/system/data/one_byte.txt
+../tdata/TRApaLsSessionStartAppTest.tst 					/epoc32/release/winscw/udeb/z/system/data/trapalssessionstartapptest.tst
+../tdata/file1.txt 											/epoc32/release/winscw/udeb/z/system/data/testpath/file1.txt
+../tdata/file2.txt 											/epoc32/release/winscw/udeb/z/system/data/testpath/file2.txt
+../tdata/testfile1.txt					 					/epoc32/release/winscw/udeb/z/system/data/testpath/filtertests/testfile1.txt
+../tdata/testfile2.txt									 	/epoc32/release/winscw/udeb/z/system/data/testpath/filtertests/testfile2.txt
+../tdata/testfile3.txt									 	/epoc32/release/winscw/udeb/z/system/data/testpath/filtertests/testfile3.txt
+../tdata/testfile4.txt 										/epoc32/release/winscw/udeb/z/system/data/testpath/filtertests/testfile4.txt
+../tdata/UpdatedAppsList.bin								/epoc32/release/winscw/udeb/z/system/data/updatedappslist.bin
+../tdata/FileWithUnknownMimeType.UnrecognisableExtention	/epoc32/release/winscw/udeb/z/system/data/filewithunknownmimetype.unrecognisableextention	
+../tdata/TApsRecogAppTest.mmr								/epoc32/release/winscw/udeb/z/system/data/tapsrecogapptest.mmr
+../tdata/recmime_1.rsc										/epoc32/release/winscw/udeb/z/system/data/recmime_1.rsc
+../tdata/recmime_winscw.dll									/epoc32/release/winscw/udeb/z/system/data/recmime_winscw.dll
+
+../tdata/mimecontentpolicy/sd_goo.dcf			/epoc32/release/winscw/udeb/z/system/data/sd_goo.dcf
+../tdata/mimecontentpolicy/fl_goo.dm			/epoc32/release/winscw/udeb/z/system/data/fl_goo.dm
+../tdata/mimecontentpolicy/jpeg_wes.dm			/epoc32/release/winscw/udeb/z/system/data/jpeg_wes.dm
+../tdata/mimecontentpolicy/gif_wallpaper.gif	/epoc32/release/winscw/udeb/z/system/data/gif_wallpaper.gif
+../tdata/mimecontentpolicy/propelli.jpg	 		/epoc32/release/winscw/udeb/z/system/data/propelli.jpg
+../tdata/mimecontentpolicy/type-r.jpg			/epoc32/release/winscw/udeb/z/system/data/type-r.jpg
+../tdata/1028583d.txt 							/epoc32/release/winscw/udeb/z/private/10202be9/1028583d.txt //test Central Repository initialisation file
+../tdata/10003a3f.txt 							/epoc32/release/winscw/udeb/z/private/10202be9/10003a3f.txt //Test repository file contains closed content and extension information
+
+
+// WINSCW UREL
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+../tef/tstnnapp.mbm											/epoc32/release/winscw/urel/z/resource/apps/tstnnapp.mbm
+../tef/App_ctrl.MBM											/epoc32/release/winscw/urel/z/resource/apps/app_ctrl.mbm
+../tef/svg_icon.svg											/epoc32/release/winscw/urel/z/resource/apps/svg_icon.svg
+../tdata/AAA_reg.Rsc 										/epoc32/release/winscw/urel/z/apparctest/aaa_reg.rsc 
+../tdata/Corrupted_reg.RSC									/epoc32/release/winscw/urel/z/apparctest/corrupted_reg.rsc
+../tdata/testupdregappuninstallation_reg.rsc				/epoc32/release/winscw/urel/z/system/data/testupdregappuninstallation_reg.rsc
+../tdata/testupgradeupdregappuninstallation_reg.rsc			/epoc32/release/winscw/urel/z/system/data/testupgradeupdregappuninstallation_reg.rsc
+../tef/zerosizedicon.mbm									/epoc32/release/winscw/udeb/z/apparctestregfiles/zerosizedicon.mbm
+../tef/tstappviewneg.xyz									/epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.xyz
+#endif
+
+../tef/tstappviewneg.mbm									/epoc32/release/winscw/urel/z/resource/apps/tstappviewneg.mbm
+../tef/tstappviewneg.xyz									/epoc32/release/winscw/urel/z/resource/apps/tstappviewneg.xyz
+../tdata/GIF.NNA1 											/epoc32/release/winscw/urel/z/private/101f289c/gif.nna1
+../tdata/HTML.NNA2 											/epoc32/release/winscw/urel/z/private/101f289c/html.nna2
+../tdata/CONTACT.NNA3 										/epoc32/release/winscw/urel/z/private/101f289c/contact.nna3
+../tdata/TXT.NNA4 											/epoc32/release/winscw/urel/z/private/101f289c/txt.nna4
+../tdata/TSTAPPU.DOC 										/epoc32/release/winscw/urel/z/system/data/tstapp.doc
+../tdata/zero_len.txt 										/epoc32/release/winscw/urel/z/system/data/zero_len.txt
+../tdata/one_byte.txt 										/epoc32/release/winscw/urel/z/system/data/one_byte.txt
+../tdata/TRApaLsSessionStartAppTest.tst 					/epoc32/release/winscw/urel/z/system/data/trapalssessionstartapptest.tst
+../tdata/file1.txt 											/epoc32/release/winscw/urel/z/system/data/testpath/file1.txt
+../tdata/file2.txt 											/epoc32/release/winscw/urel/z/system/data/testpath/file2.txt
+../tdata/testfile1.txt									 	/epoc32/release/winscw/urel/z/system/data/testpath/filtertests/testfile1.txt
+../tdata/testfile2.txt									 	/epoc32/release/winscw/urel/z/system/data/testpath/filtertests/testfile2.txt
+../tdata/testfile3.txt									 	/epoc32/release/winscw/urel/z/system/data/testpath/filtertests/testfile3.txt
+../tdata/testfile4.txt 										/epoc32/release/winscw/urel/z/system/data/testpath/filtertests/testfile4.txt
+../tdata/FileWithUnknownMimeType.UnrecognisableExtention	/epoc32/release/winscw/urel/z/system/data/filewithunknownmimetype.unrecognisableextention	
+../tdata/TApsRecogAppTest.mmr 								/epoc32/release/winscw/urel/z/system/data/tapsrecogapptest.mmr
+../tdata/recmime_1.rsc										/epoc32/release/winscw/urel/z/system/data/recmime_1.rsc
+../tdata/recmime_winscw.dll									/epoc32/release/winscw/urel/z/system/data/recmime_winscw.dll
+../tdata/mimecontentpolicy/sd_goo.dcf						/epoc32/release/winscw/urel/z/system/data/sd_goo.dcf
+../tdata/mimecontentpolicy/fl_goo.dm						/epoc32/release/winscw/urel/z/system/data/fl_goo.dm
+../tdata/mimecontentpolicy/jpeg_wes.dm						/epoc32/release/winscw/urel/z/system/data/jpeg_wes.dm
+../tdata/mimecontentpolicy/gif_wallpaper.gif				/epoc32/release/winscw/urel/z/system/data/gif_wallpaper.gif
+../tdata/mimecontentpolicy/propelli.jpg	 					/epoc32/release/winscw/urel/z/system/data/propelli.jpg
+../tdata/mimecontentpolicy/type-r.jpg						/epoc32/release/winscw/urel/z/system/data/type-r.jpg
+../tdata/1028583d.txt 										/epoc32/release/winscw/urel/z/private/10202be9/1028583d.txt //test Central Repository initialisation file
+../tdata/10003a3f.txt 										/epoc32/release/winscw/urel/z/private/10202be9/10003a3f.txt //Test repository file contains closed content and extension information
+
+
+// ARMV5 UDEB
+
+// exporting db & certstore for armv5 
+../tdata/scr.db										/epoc32/data/z/sys/install/scr/provisioned/scr.db
+../tef/testpkg/swicertstore.dat						/epoc32/data/z/resource/swicertstore.dat
+
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+../tef/tstnnapp.mbm									/epoc32/release/armv5/udeb/z/resource/apps/tstnnapp.mbm
+../tdata/AAA_reg.Rsc 										/epoc32/release/armv5/udeb/z/apparctest/aaa_reg.rsc 
+../tdata/Corrupted_reg.RSC									/epoc32/release/armv5/udeb/z/apparctest/corrupted_reg.rsc
+../tdata/testupdregappuninstallation_reg.rsc			/epoc32/release/armv5/udeb/z/system/data/testupdregappuninstallation_reg.rsc
+../tdata/testupgradeupdregappuninstallation_reg.rsc			/epoc32/release/armv5/udeb/z/system/data/testupgradeupdregappuninstallation_reg.rsc
+#endif
+../tef/tstappviewneg.mbm									/epoc32/release/armv5/udeb/z/resource/apps/tstappviewneg.mbm
+../tef/tstappviewneg.xyz									/epoc32/release/armv5/udeb/z/resource/apps/tstappviewneg.xyz
+
+../tdata/GIF.NNA1 											/epoc32/release/armv5/udeb/z/private/101f289c/gif.nna1
+../tdata/HTML.NNA2 											/epoc32/release/armv5/udeb/z/private/101f289c/html.nna2
+../tdata/CONTACT.NNA3 										/epoc32/release/armv5/udeb/z/private/101f289c/contact.nna3
+../tdata/TXT.NNA4 											/epoc32/release/armv5/udeb/z/private/101f289c/txt.nna4
+../tdata/TSTAPPU.DOC 										/epoc32/release/armv5/udeb/tstapp.doc
+../tdata/zero_len.txt 										/epoc32/release/armv5/udeb/zero_len.txt
+../tdata/one_byte.txt 										/epoc32/release/armv5/udeb/one_byte.txt
+../tdata/TRApaLsSessionStartAppTest.tst 					/epoc32/release/armv5/udeb/z/system/data/trapalssessionstartapptest.tst
+../tdata/file1.txt 											/epoc32/release/armv5/udeb/z/system/data/testpath/file1.txt
+../tdata/file2.txt 											/epoc32/release/armv5/udeb/z/system/data/testpath/file2.txt
+../tdata/testfile1.txt									 	/epoc32/release/armv5/udeb/z/system/data/testpath/filtertests/testfile1.txt
+../tdata/testfile2.txt									 	/epoc32/release/armv5/udeb/z/system/data/testpath/filtertests/testfile2.txt
+../tdata/testfile3.txt									 	/epoc32/release/armv5/udeb/z/system/data/testpath/filtertests/testfile3.txt
+../tdata/testfile4.txt 										/epoc32/release/armv5/udeb/z/system/data/testpath/filtertests/testfile4.txt
+../tdata/FileWithUnknownMimeType.UnrecognisableExtention	/epoc32/release/armv5/udeb/z/system/data/filewithunknownmimetype.unrecognisableextention	
+../tdata/TApsRecogAppTest.mmr								/epoc32/release/armv5/udeb/z/system/data/tapsrecogapptest.mmr
+../tdata/recmime_1.rsc									/epoc32/release/armv5/udeb/z/system/data/recmime_1.rsc
+../tdata/recmime_armv5.dll									/epoc32/release/armv5/udeb/z/system/data/recmime_armv5.dll
+
+../tdata/mimecontentpolicy/sd_goo.dcf			/epoc32/release/armv5/udeb/z/system/data/sd_goo.dcf
+../tdata/mimecontentpolicy/fl_goo.dm			/epoc32/release/armv5/udeb/z/system/data/fl_goo.dm
+../tdata/mimecontentpolicy/jpeg_wes.dm		/epoc32/release/armv5/udeb/z/system/data/jpeg_wes.dm
+../tdata/mimecontentpolicy/gif_wallpaper.gif		/epoc32/release/armv5/udeb/z/system/data/gif_wallpaper.gif
+../tdata/mimecontentpolicy/propelli.jpg	 		/epoc32/release/armv5/udeb/z/system/data/propelli.jpg
+../tdata/mimecontentpolicy/type-r.jpg			/epoc32/release/armv5/udeb/z/system/data/type-r.jpg
+../tdata/TApsRecogUpgradeTest.upg						/epoc32/release/armv5/udeb/z/system/data/tapsrecogupgradetest.upg
+../tdata/TApsRecogUpgradeTest.upr						/epoc32/release/armv5/udeb/z/system/data/tapsrecogupgradetest.upr
+../tdata/recupgrade.rsc								/epoc32/release/armv5/udeb/z/system/data/recupgrade.rsc
+../tdata/recupgrade2.rsc								/epoc32/release/armv5/udeb/z/system/data/recupgrade2.rsc
+../tdata/recupgrade_armv5_rel.dll						/epoc32/release/armv5/udeb/z/system/data/recupgrade_armv5_rel.dll
+../tdata/recupgrade2_armv5_rel.dll						/epoc32/release/armv5/udeb/z/system/data/recupgrade2_armv5_rel.dll
+
+
+// ARMV5 UREL
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+../tef/tstnnapp.mbm									/epoc32/release/armv5/urel/z/resource/apps/tstnnapp.mbm
+../tef/App_ctrl.MBM											/epoc32/release/armv5/urel/z/resource/apps/app_ctrl.mbm
+../tef/svg_icon.svg											/epoc32/release/armv5/urel/z/resource/apps/svg_icon.svg
+../tdata/AAA_reg.Rsc 										/epoc32/release/armv5/urel/z/apparctest/aaa_reg.rsc 
+../tdata/Corrupted_reg.RSC									/epoc32/release/armv5/urel/z/apparctest/corrupted_reg.rsc
+../tdata/testupdregappuninstallation_reg.rsc			/epoc32/release/armv5/urel/z/system/data/testupdregappuninstallation_reg.rsc
+../tdata/testupgradeupdregappuninstallation_reg.rsc			/epoc32/release/armv5/urel/z/system/data/testupgradeupdregappuninstallation_reg.rsc
+../tef/zerosizedicon.mbm									/epoc32/release/winscw/udeb/z/apparctestregfiles/zerosizedicon.mbm
+../tef/tstappviewneg.xyz									/epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.xyz
+#endif
+../tef/tstappviewneg.xyz									/epoc32/release/armv5/urel/z/resource/apps/tstappviewneg.xyz
+../tef/tstappviewneg.mbm									/epoc32/release/armv5/urel/z/resource/apps/tstappviewneg.mbm
+../tef/tstappviewneg.mbm									/epoc32/data/z/apparctestregfiles/tstappviewneg.mbm
+../tef/App_ctrl.MBM											/epoc32/data/z/apparctestregfiles/App_ctrl.MBM
+../tef/svg_icon.svg											/epoc32/data/z/apparctestregfiles/svg_icon.svg
+../tef/tstappviewneg.xyz									/epoc32/data/z/apparctestregfiles/tstappviewneg.xyz
+../tef/tupgradeiconapp/tupgradeiconapp.mbm					/epoc32/data/z/apparctestregfiles/tupgradeiconapp.mbm
+../tef/zerosizedicon.mbm									/epoc32/data/z/apparctestregfiles/zerosizedicon.mbm
+
+../tdata/GIF.NNA1 											/epoc32/release/armv5/urel/z/private/101f289c/gif.nna1
+../tdata/HTML.NNA2 											/epoc32/release/armv5/urel/z/private/101f289c/html.nna2
+../tdata/CONTACT.NNA3 										/epoc32/release/armv5/urel/z/private/101f289c/contact.nna3
+../tdata/TXT.NNA4 											/epoc32/release/armv5/urel/z/private/101f289c/txt.nna4
+../tdata/TSTAPPU.DOC 										/epoc32/release/armv5/urel/tstapp.doc
+../tdata/zero_len.txt 										/epoc32/release/armv5/urel/zero_len.txt
+../tdata/one_byte.txt 										/epoc32/release/armv5/urel/one_byte.txt
+../tdata/TRApaLsSessionStartAppTest.tst 					/epoc32/release/armv5/urel/z/system/data/trapalssessionstartapptest.tst
+../tdata/file1.txt 											/epoc32/release/armv5/urel/z/system/data/testpath/file1.txt
+../tdata/file2.txt 											/epoc32/release/armv5/urel/z/system/data/testpath/file2.txt
+../tdata/testfile1.txt									 	/epoc32/release/armv5/urel/z/system/data/testpath/filtertests/testfile1.txt
+../tdata/testfile2.txt					 					/epoc32/release/armv5/urel/z/system/data/testpath/filtertests/testfile2.txt
+../tdata/testfile3.txt									 	/epoc32/release/armv5/urel/z/system/data/testpath/filtertests/testfile3.txt
+../tdata/testfile4.txt 										/epoc32/release/armv5/urel/z/system/data/testpath/filtertests/testfile4.txt
+../tdata/FileWithUnknownMimeType.UnrecognisableExtention	/epoc32/release/armv5/urel/z/system/data/filewithunknownmimetype.unrecognisableextention	
+../tdata/TApsRecogAppTest.mmr 								/epoc32/release/armv5/urel/z/system/data/tapsrecogapptest.mmr
+../tdata/recmime_1.rsc									/epoc32/release/armv5/urel/z/system/data/recmime_1.rsc
+../tdata/recmime_armv5.dll									/epoc32/release/armv5/urel/z/system/data/recmime_armv5.dll
+
+../tdata/mimecontentpolicy/sd_goo.dcf			/epoc32/release/armv5/urel/z/system/data/sd_goo.dcf
+../tdata/mimecontentpolicy/fl_goo.dm			/epoc32/release/armv5/urel/z/system/data/fl_goo.dm
+../tdata/mimecontentpolicy/jpeg_wes.dm		/epoc32/release/armv5/urel/z/system/data/jpeg_wes.dm
+../tdata/mimecontentpolicy/gif_wallpaper.gif		/epoc32/release/armv5/urel/z/system/data/gif_wallpaper.gif
+../tdata/mimecontentpolicy/propelli.jpg	 		/epoc32/release/armv5/urel/z/system/data/propelli.jpg
+../tdata/mimecontentpolicy/type-r.jpg			/epoc32/release/armv5/urel/z/system/data/type-r.jpg
+../tdata/TApsRecogUpgradeTest.upg							/epoc32/release/armv5/urel/z/system/data/tapsrecogupgradetest.upg
+../tdata/TApsRecogUpgradeTest.upr							/epoc32/release/armv5/urel/z/system/data/tapsrecogupgradetest.upr
+../tdata/recupgrade.rsc									/epoc32/release/armv5/urel/z/system/data/recupgrade.rsc
+../tdata/recupgrade2.rsc								/epoc32/release/armv5/urel/z/system/data/recupgrade2.rsc
+../tdata/recupgrade_armv5_rel.dll						/epoc32/release/armv5/urel/z/system/data/recupgrade_armv5_rel.dll
+../tdata/recupgrade2_armv5_rel.dll						/epoc32/release/armv5/urel/z/system/data/recupgrade2_armv5_rel.dll
+
--- a/appfw/apparchitecture/tdata/Corrupted_reg.RSC	Fri Jun 11 13:48:03 2010 +0300
+++ b/appfw/apparchitecture/tdata/Corrupted_reg.RSC	Tue Jun 29 10:40:11 2010 +0300
@@ -1,24 +1,24 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Note: Standard test header to avoid Copyright tool complaining of missing copyright...
-// 
-//
-
-/**
- @file
- @test
- @internalComponent - Internal Symbian test code 
-*/
-
-kJ!€º<©ÁÚ$ Õ  	        beytfyugjcert    
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Note: Standard test header to avoid Copyright tool complaining of missing copyright...
+// 
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code 
+*/
+
+kJ!€º<©ÁÚ$ Õ  	        beytfyugjcert    
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/CustomiseDefaultIconApp.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,58 @@
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET        	CustomiseDefaultIconApp.exe
+TARGETTYPE    	exe
+UID           	0x100039CE 0x10208181
+VENDORID  	0x70000001
+
+
+USERINCLUDE   	.
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE   /epoc32/include/techview
+
+
+// Application localisable resource file
+resource  	CustomiseDefaultIconApp_loc.RSS
+start resource 	CustomiseDefaultIconApp_loc.RSS
+HEADER
+targetpath 	/apparctestregfiles
+lang		sc
+end
+
+START RESOURCE	CustomiseDefaultIconApp_reg.rss
+TARGETPATH	/apparctestregfiles
+lang		sc
+END
+
+SOURCEPATH		../tef
+SOURCE	app_CTRL.CPP
+
+LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
+LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
+LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY		aplist.lib
+LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/TCtrlPnlApp.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,48 @@
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET        	TCtrlPnlApp.exe
+TARGETTYPE    	exe
+UID           	0x100039CE 0x10207f79
+VENDORID  	0x70000001
+
+USERINCLUDE   	.
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE   /epoc32/include/techview
+
+START RESOURCE	TCtrlPnlApp_reg.rss
+TARGETPATH	/apparctestregfiles
+lang		sc
+END
+
+SOURCEPATH		../tef
+SOURCE	app_CTRL.CPP
+
+LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
+LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
+LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY		aplist.lib
+LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/TSTAPP_standalone_Stub.MMP	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,104 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code 
+*/
+
+
+
+ TARGET        	tstapp.exe
+ TARGETTYPE    	exe
+ TARGETPATH		/sys/bin
+
+CAPABILITY 	All -Tcb
+
+UID           	0x100039CE 10 //the original UID
+VENDORID 		0x70000001 
+EPOCSTACKSIZE 	0x5000
+
+SOURCEPATH    	.
+SOURCE        	TSTAPP_standalone.CPP
+
+USERINCLUDE   	.
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE 	/epoc32/include/techview
+//systeminclude 	/epoc32/include/ecom
+
+
+//reg added for Datacaging
+START RESOURCE	tstapp_reg.rss
+TARGETPATH		/private/10003a3f/import/apps
+END
+
+START RESOURCE 	TSTAPP.rss
+TARGETPATH 		/resource/apps
+END
+
+START RESOURCE 	tstapp_loc.rss
+TARGETPATH 		/resource/apps
+LANG 			SC 01 02 03 04 05
+END
+
+START BITMAP 	tstapp.mbm
+TARGETPATH 		/resource/apps
+SOURCEPATH 		../tdatasrc
+SOURCE 			c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
+SOURCE 			c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
+SOURCE 			c8,1 tstappicon40x55.bmp tstappicon40x55m.bmp
+
+END
+
+START BITMAP 	tstapp02.m02
+TARGETPATH 		/resource/apps
+SOURCEPATH 		../tdatasrc
+SOURCE 			c8,1 def25.bmp def25m.bmp def25.bmp def25m.bmp def50.bmp def50m.bmp
+END
+
+START BITMAP 	tstappview01.m01
+TARGETPATH 		/resource/apps
+SOURCEPATH 		../tdatasrc
+SOURCE 			c8,1 def25.bmp def25m.bmp def35.bmp def35m.bmp def50.bmp def50m.bmp
+END
+
+START BITMAP 	tstappview02.k
+TARGETPATH 		/resource/apps
+SOURCEPATH 		../tdatasrc
+SOURCE 			c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
+SOURCE 			c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
+SOURCE 			c8,1 tstappicon40x55.bmp tstappicon40x55m.bmp
+END
+
+START BITMAP 	tstappview01.m02
+TARGETPATH 		/resource/apps
+SOURCEPATH 		../tdatasrc
+SOURCE 			c8,1 def25.bmp def25m.bmp def35.bmp def35m.bmp def50.bmp def50m.bmp
+END
+
+START BITMAP 	tstappview
+TARGETPATH 		/resource/apps
+SOURCEPATH 		../tdatasrc
+SOURCE 			c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
+SOURCE 			c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
+SOURCE 			c8,1 tstappicon40x55.bmp tstappicon40x55m.bmp
+END
+
+LIBRARY 	euser.lib apparc.lib eikcore.lib cone.lib  
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/T_DataPrioritySystem3.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,51 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET        	T_DataPrioritySystem3.exe
+TARGETTYPE    	exe
+UID           	0x100039CE 0x10207f7f
+VENDORID  	0x70000001
+
+USERINCLUDE   	.
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE   /epoc32/include/techview
+
+// Application exe registration resource file
+resource  	T_DataPrioritySystem3_reg.rss
+start resource 	T_DataPrioritySystem3_reg.rss
+targetpath 	/apparctestregfiles
+lang		sc
+end
+
+SOURCEPATH		../tef
+//SOURCE T_ServicesStep.cpp
+SOURCE	app_CTRL.CPP
+
+LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
+LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
+LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY		aplist.lib
+LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/T_groupname.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,58 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET        	T_groupname.exe
+TARGETTYPE    	exe
+UID           	0x100039CE 0x10208185
+VENDORID  	0x70000001
+
+USERINCLUDE   	.
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE   /epoc32/include/techview
+
+// Application localisable resource file
+resource  	T_groupname_loc.RSS
+start resource 	T_groupname_loc.RSS
+HEADER
+targetpath 	/apparctestregfiles
+lang		sc
+end
+
+
+START RESOURCE	T_groupname_reg.rss
+TARGETPATH	/apparctestregfiles
+lang		sc
+END
+
+
+SOURCEPATH		../tef
+SOURCE	app_CTRL.CPP
+
+LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
+LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
+LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY		aplist.lib
+LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/T_groupname_ver1.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,58 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET        	T_groupname_ver1.exe
+TARGETTYPE    	exe
+UID           	0x100039CE 0x10208183
+VENDORID  	0x70000001
+
+USERINCLUDE   	.
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE   /epoc32/include/techview
+
+// Application localisable resource file
+resource  	T_groupnamever1_loc.RSS
+start resource 	T_groupnamever1_loc.RSS
+HEADER
+targetpath 	/apparctestregfiles
+lang		sc
+end
+
+
+START RESOURCE	T_groupnamever1_reg.rss
+TARGETPATH	/apparctestregfiles
+lang		sc
+END
+
+
+SOURCEPATH		../tef
+SOURCE	app_CTRL.CPP
+
+LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
+LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
+LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY		aplist.lib
+LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/T_groupname_ver2.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,58 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET        	T_groupname_ver2.exe
+TARGETTYPE    	exe
+UID           	0x100039CE 0x10208184
+VENDORID  	0x70000001
+
+USERINCLUDE   	.
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE   /epoc32/include/techview
+
+// Application localisable resource file
+resource  	T_groupnamever2_loc.RSS
+start resource 	T_groupnamever2_loc.RSS
+HEADER
+targetpath 	/apparctestregfiles
+lang		sc
+end
+
+
+START RESOURCE	T_groupnamever2_reg.rss
+TARGETPATH	/apparctestregfiles
+lang		sc
+END
+
+
+SOURCEPATH		../tef
+SOURCE	app_CTRL.CPP
+
+LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
+LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
+LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY		aplist.lib
+LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/TestTrustedPriorityApp1.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,51 @@
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET        	TestTrustedPriorityApp1.exe
+TARGETTYPE    	exe
+UID           	0x100039CE 0x10207f8D
+VENDORID  	0x70000001
+
+USERINCLUDE   	.
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE   /epoc32/include/techview
+
+// Application exe registration resource file
+resource  	TestTrustedPriorityApp1_reg.rss
+start resource 	TestTrustedPriorityApp1_reg.rss
+targetpath 	/apparctestregfiles
+lang		sc
+end
+
+SOURCEPATH		../tef
+// SOURCE T_RApaLsSessionStep.cpp
+SOURCE	app_CTRL.CPP
+
+LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
+LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
+LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY		aplist.lib
+LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/TestTrustedPriorityApp2.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,51 @@
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET        	TestTrustedPriorityApp2.exe
+TARGETTYPE    	exe
+UID           	0x100039CE 0x10207f8F
+VENDORID  	0x70000001
+
+USERINCLUDE   	.
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE   /epoc32/include/techview
+
+// Application exe registration resource file
+resource  	TestTrustedPriorityApp2_reg.rss
+start resource 	TestTrustedPriorityApp2_reg.rss
+targetpath 	/apparctestregfiles
+lang		sc
+end
+
+SOURCEPATH		../tef
+// SOURCE T_RApaLsSessionStep.cpp T_DataTypeMappingWithSid1.cpp
+SOURCE	app_CTRL.CPP
+
+LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
+LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
+LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY		aplist.lib
+LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/TestUnTrustedPriorityApp1.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,51 @@
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET        	TestUnTrustedPriorityApp1.exe
+TARGETTYPE    	exe
+UID           	0x100039CE 0x10207f8C
+VENDORID  	0x70000001
+
+USERINCLUDE   	.
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE   /epoc32/include/techview
+
+// Application exe registration resource file
+resource  	TestUnTrustedPriorityApp1_reg.rss
+start resource 	TestUnTrustedPriorityApp1_reg.rss
+targetpath 	/apparctestregfiles
+lang		sc
+end
+
+SOURCEPATH		../tef
+// SOURCE T_RApaLsSessionStep.cpp T_DataTypeMappingWithSid1.cpp
+SOURCE	app_CTRL.CPP
+
+LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
+LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
+LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY		aplist.lib
+LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/TestUnTrustedPriorityApp2.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,51 @@
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET        	TestUnTrustedPriorityApp2.exe
+TARGETTYPE    	exe
+UID           	0x100039CE 0xA3010010
+VENDORID  	0x70000001
+
+USERINCLUDE   	.
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE   /epoc32/include/techview
+
+// Application exe registration resource file
+resource  	TestUnTrustedPriorityApp2_reg.rss
+start resource 	TestUnTrustedPriorityApp2_reg.rss
+targetpath 	/apparctestregfiles
+lang		sc
+end
+
+SOURCEPATH		../tef
+// SOURCE T_RApaLsSessionStep.cpp T_DataTypeMappingWithSid1.cpp
+SOURCE	app_CTRL.CPP
+
+LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
+LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
+LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY		aplist.lib
+LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/app_CTRL2_stub.MMP	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,62 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+//
+// App_CTRL2.MMP for test component App_CTRL2 (released in APPARC)
+//
+
+target		app_ctrl2.exe
+TARGETTYPE 	exe
+
+CAPABILITY 	All -Tcb
+VENDORID 	0x70000001
+
+UID             0x100039CE 0x13008ADE
+targetpath 	/sys/bin
+SOURCEPATH	.	
+
+// your public include directory should be here
+userinclude   ../inc
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//systeminclude   /epoc32/include/techview
+//systeminclude   /epoc32/include/kernel
+
+source          app_CTRL2.CPP
+
+// Application exe specific resource which is localised to the application
+resource	App_CTRL2.rss
+start resource	App_CTRL2.rss
+targetpath	/resource/apps
+lang		sc
+end
+
+// Application exe registration resource file
+resource	App_CTRL2_reg.rss
+start resource	App_CTRL2_reg.rss
+targetpath 	/private/10003a3f/import/apps
+lang		sc
+end
+
+
+LIBRARY       	apparc.lib
+LIBRARY       	cone.lib 
+LIBRARY       	eikcore.lib 
+LIBRARY       	euser.lib
+LIBRARY       	gdi.lib
+
+SMPSAFE
--- a/appfw/apparchitecture/tef/app_ctrl2_stub.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-//
-// App_CTRL2.MMP for test component App_CTRL2 (released in APPARC)
-//
-
-target		app_ctrl2.exe
-TARGETTYPE 	exe
-
-CAPABILITY 	All -Tcb
-VENDORID 	0x70000001
-
-UID             0x100039CE 0x13008ADE
-targetpath 	/sys/bin
-SOURCEPATH	.	
-
-// your public include directory should be here
-userinclude   ../inc
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
-//systeminclude   /epoc32/include/techview
-//systeminclude   /epoc32/include/kernel
-
-source          app_CTRL2.CPP
-
-// Application exe specific resource which is localised to the application
-resource	App_CTRL2.rss
-start resource	App_CTRL2.rss
-targetpath	/resource/apps
-lang		sc
-end
-
-// Application exe registration resource file
-resource	App_CTRL2_reg.rss
-start resource	App_CTRL2_reg.rss
-targetpath 	/private/10003a3f/import/apps
-lang		sc
-end
-
-
-LIBRARY       	apparc.lib
-LIBRARY       	cone.lib 
-LIBRARY       	eikcore.lib 
-LIBRARY       	euser.lib
-LIBRARY       	gdi.lib
-
-SMPSAFE
--- a/appfw/apparchitecture/tef/customisedefaulticonapp.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @internalComponent - Internal Symbian test code
-*/
-
-TARGET        	CustomiseDefaultIconApp.exe
-TARGETTYPE    	exe
-UID           	0x100039CE 0x10208181
-VENDORID  	0x70000001
-
-
-USERINCLUDE   	.
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
-//SYSTEMINCLUDE   /epoc32/include/techview
-
-
-// Application localisable resource file
-resource  	CustomiseDefaultIconApp_loc.RSS
-start resource 	CustomiseDefaultIconApp_loc.RSS
-HEADER
-targetpath 	/apparctestregfiles
-lang		sc
-end
-
-START RESOURCE	CustomiseDefaultIconApp_reg.rss
-TARGETPATH	/apparctestregfiles
-lang		sc
-END
-
-SOURCEPATH		../tef
-SOURCE	app_CTRL.CPP
-
-LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
-LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
-LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
-LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
-LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
-LIBRARY		aplist.lib
-LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
-
-SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/forceregapps/A0001010.rss	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,54 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code  
+*/
+
+
+//  INCLUDES
+#include <ecom/registryinfo.rh>
+
+
+// RESOURCE DEFINITIONS
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE REGISTRY_INFO r_registry
+    {
+    dll_uid = 0xA0001010;
+    interfaces = 
+        {
+        INTERFACE_INFO
+            {
+            interface_uid = 0x101F7D87; // Const for all Data Recognizers
+            implementations =
+                {
+                IMPLEMENTATION_INFO
+                    {
+                    implementation_uid = 0xA0001010; 
+                    version_no = 1;
+                    display_name = "TForceRegAppRec";
+                    default_data = "";
+                    opaque_data = "";
+                    }
+                };
+            }
+        };
+    }
+
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/forceregapps/TForceRegAppRec.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,157 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This recognizer is part of the supporting test code for T_ForceRegStep.CPP
+// 
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+#include <e32std.h>
+#include <e32base.h>
+#include <apmstd.h>
+#include <apmrec.h>
+#include <f32file.h>
+
+#include <apfrec.h>
+#include <ecom/implementationproxy.h> 
+
+_LIT8(KLit8_DataType_ForceRegApp1, "x-epoc/forcregapp1");
+_LIT8(KLit8_DataType_ForceRegApp2, "x-epoc/forcregapp2");
+_LIT8(KLit8_DataType_ForceRegApp3, "x-epoc/forcregapp3");
+_LIT8(KLit8_DataType_ForceRegApp4, "x-epoc/forcregapp4");
+
+const TUid KUidForceRegAppRecognizer={0xA0001010};
+const TUint KImplForceRegAppRecognizer=0xA0001010;
+
+enum TMimeTypes
+    {
+    EMimeType1 = 0,
+    EMimeType2,
+    EMimeType3,
+    EMimeType4,
+    EMimeLast
+    };
+
+_LIT(KLitMimeExtension1, ".FRG1");
+_LIT(KLitMimeExtension2, ".FRG2");
+_LIT(KLitMimeExtension3, ".FRG3");
+_LIT(KLitMimeExtension4, ".FRG4");
+
+
+// CTForceRegAppRec definition
+
+class CTForceRegAppRec : public CApaDataRecognizerType
+	{
+public:
+	CTForceRegAppRec();
+	static CApaDataRecognizerType* CreateRecognizerL();
+private:
+	// from CApaDataRecognizerType
+	virtual TUint PreferredBufSize();
+	virtual TDataType SupportedDataTypeL(TInt aIndex) const;
+	virtual void DoRecognizeL(const TDesC& aName, const TDesC8& aBuffer);
+	};
+
+
+// CTForceRegAppRec implementation
+
+CTForceRegAppRec::CTForceRegAppRec() 
+	:CApaDataRecognizerType(KUidForceRegAppRecognizer, EHigh)
+	{
+	iCountDataTypes = EMimeLast;
+	} 
+
+TUint CTForceRegAppRec::PreferredBufSize()
+	{
+	return 0;
+	}
+
+TDataType CTForceRegAppRec::SupportedDataTypeL(TInt aIndex) const
+	{
+	if (aIndex == EMimeType1)
+		return TDataType(KLit8_DataType_ForceRegApp1);
+    
+    else if (aIndex == EMimeType2)
+		return TDataType(KLit8_DataType_ForceRegApp2);
+    
+    else if (aIndex == EMimeType3)
+		return TDataType(KLit8_DataType_ForceRegApp3);
+    
+    else if (aIndex == EMimeType4)
+		return TDataType(KLit8_DataType_ForceRegApp4);
+    
+    else
+        return TDataType(KNullDesC8);
+    }
+ 
+
+void CTForceRegAppRec::DoRecognizeL(const TDesC& aName, const TDesC8&)
+	{
+
+	// Compare if the file extension is known
+	if (aName.Length() < 5)
+		{
+    	iDataType = TDataType(KNullDesC8); 	
+    	iConfidence = ENotRecognized;
+		return;
+		}
+
+	if (aName.Right(5).CompareF(KLitMimeExtension1) == 0)
+		{
+		iDataType = TDataType(KLit8_DataType_ForceRegApp1);
+		iConfidence = ECertain;
+		}
+	else if (aName.Right(5).CompareF(KLitMimeExtension2) == 0)
+		{
+		iDataType = TDataType(KLit8_DataType_ForceRegApp2);
+		iConfidence = ECertain;
+		}
+	else if (aName.Right(5).CompareF(KLitMimeExtension3) == 0)
+		{
+		iDataType = TDataType(KLit8_DataType_ForceRegApp3);
+		iConfidence = ECertain;
+		}
+	else if (aName.Right(5).CompareF(KLitMimeExtension4) == 0)
+		{
+		iDataType = TDataType(KLit8_DataType_ForceRegApp4);
+		iConfidence = ECertain;
+		}
+    else
+    	{
+    	iDataType = TDataType(KNullDesC8); 	
+    	iConfidence = ENotRecognized;
+    	}
+	}
+
+// stand-alone functions
+
+CApaDataRecognizerType* CTForceRegAppRec::CreateRecognizerL()
+	{
+	return new (ELeave) CTForceRegAppRec();
+	}
+
+const TImplementationProxy ImplementationTable[] = 
+    {
+	IMPLEMENTATION_PROXY_ENTRY(KImplForceRegAppRecognizer, CTForceRegAppRec::CreateRecognizerL)
+	};
+
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
+    {
+    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
+    return ImplementationTable;
+    }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/forceregapps/TForceRegAppRec.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,41 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code 
+*/
+
+
+TARGET			tforceregapprec.dll
+CAPABILITY		All -Tcb
+TARGETTYPE		PLUGIN
+UID				0x10009d8d 0xA0001010
+VENDORID 		0x70000001
+
+SOURCEPATH		.
+SOURCE			TForceRegAppRec.cpp
+
+userinclude   ../../inc
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY			euser.lib apmime.lib apparc.lib efsrv.lib
+
+start resource A0001010.rss
+target tforceregapprec.rsc
+end
+
+SMPSAFE
--- a/appfw/apparchitecture/tef/forceregapps/a0001010.rss	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @internalComponent - Internal Symbian test code  
-*/
-
-
-//  INCLUDES
-#include <ecom/registryinfo.rh>
-
-
-// RESOURCE DEFINITIONS
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE REGISTRY_INFO r_registry
-    {
-    dll_uid = 0xA0001010;
-    interfaces = 
-        {
-        INTERFACE_INFO
-            {
-            interface_uid = 0x101F7D87; // Const for all Data Recognizers
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid = 0xA0001010; 
-                    version_no = 1;
-                    display_name = "TForceRegAppRec";
-                    default_data = "";
-                    opaque_data = "";
-                    }
-                };
-            }
-        };
-    }
-
-// End of File
--- a/appfw/apparchitecture/tef/forceregapps/tforceregapprec.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// This recognizer is part of the supporting test code for T_ForceRegStep.CPP
-// 
-//
-
-/**
- @file
- @internalComponent - Internal Symbian test code
-*/
-
-#include <e32std.h>
-#include <e32base.h>
-#include <apmstd.h>
-#include <apmrec.h>
-#include <f32file.h>
-
-#include <apfrec.h>
-#include <ecom/implementationproxy.h> 
-
-_LIT8(KLit8_DataType_ForceRegApp1, "x-epoc/forcregapp1");
-_LIT8(KLit8_DataType_ForceRegApp2, "x-epoc/forcregapp2");
-_LIT8(KLit8_DataType_ForceRegApp3, "x-epoc/forcregapp3");
-_LIT8(KLit8_DataType_ForceRegApp4, "x-epoc/forcregapp4");
-
-const TUid KUidForceRegAppRecognizer={0xA0001010};
-const TUint KImplForceRegAppRecognizer=0xA0001010;
-
-enum TMimeTypes
-    {
-    EMimeType1 = 0,
-    EMimeType2,
-    EMimeType3,
-    EMimeType4,
-    EMimeLast
-    };
-
-_LIT(KLitMimeExtension1, ".FRG1");
-_LIT(KLitMimeExtension2, ".FRG2");
-_LIT(KLitMimeExtension3, ".FRG3");
-_LIT(KLitMimeExtension4, ".FRG4");
-
-
-// CTForceRegAppRec definition
-
-class CTForceRegAppRec : public CApaDataRecognizerType
-	{
-public:
-	CTForceRegAppRec();
-	static CApaDataRecognizerType* CreateRecognizerL();
-private:
-	// from CApaDataRecognizerType
-	virtual TUint PreferredBufSize();
-	virtual TDataType SupportedDataTypeL(TInt aIndex) const;
-	virtual void DoRecognizeL(const TDesC& aName, const TDesC8& aBuffer);
-	};
-
-
-// CTForceRegAppRec implementation
-
-CTForceRegAppRec::CTForceRegAppRec() 
-	:CApaDataRecognizerType(KUidForceRegAppRecognizer, EHigh)
-	{
-	iCountDataTypes = EMimeLast;
-	} 
-
-TUint CTForceRegAppRec::PreferredBufSize()
-	{
-	return 0;
-	}
-
-TDataType CTForceRegAppRec::SupportedDataTypeL(TInt aIndex) const
-	{
-	if (aIndex == EMimeType1)
-		return TDataType(KLit8_DataType_ForceRegApp1);
-    
-    else if (aIndex == EMimeType2)
-		return TDataType(KLit8_DataType_ForceRegApp2);
-    
-    else if (aIndex == EMimeType3)
-		return TDataType(KLit8_DataType_ForceRegApp3);
-    
-    else if (aIndex == EMimeType4)
-		return TDataType(KLit8_DataType_ForceRegApp4);
-    
-    else
-        return TDataType(KNullDesC8);
-    }
- 
-
-void CTForceRegAppRec::DoRecognizeL(const TDesC& aName, const TDesC8&)
-	{
-
-	// Compare if the file extension is known
-	if (aName.Length() < 5)
-		{
-    	iDataType = TDataType(KNullDesC8); 	
-    	iConfidence = ENotRecognized;
-		return;
-		}
-
-	if (aName.Right(5).CompareF(KLitMimeExtension1) == 0)
-		{
-		iDataType = TDataType(KLit8_DataType_ForceRegApp1);
-		iConfidence = ECertain;
-		}
-	else if (aName.Right(5).CompareF(KLitMimeExtension2) == 0)
-		{
-		iDataType = TDataType(KLit8_DataType_ForceRegApp2);
-		iConfidence = ECertain;
-		}
-	else if (aName.Right(5).CompareF(KLitMimeExtension3) == 0)
-		{
-		iDataType = TDataType(KLit8_DataType_ForceRegApp3);
-		iConfidence = ECertain;
-		}
-	else if (aName.Right(5).CompareF(KLitMimeExtension4) == 0)
-		{
-		iDataType = TDataType(KLit8_DataType_ForceRegApp4);
-		iConfidence = ECertain;
-		}
-    else
-    	{
-    	iDataType = TDataType(KNullDesC8); 	
-    	iConfidence = ENotRecognized;
-    	}
-	}
-
-// stand-alone functions
-
-CApaDataRecognizerType* CTForceRegAppRec::CreateRecognizerL()
-	{
-	return new (ELeave) CTForceRegAppRec();
-	}
-
-const TImplementationProxy ImplementationTable[] = 
-    {
-	IMPLEMENTATION_PROXY_ENTRY(KImplForceRegAppRecognizer, CTForceRegAppRec::CreateRecognizerL)
-	};
-
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-    {
-    aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-    return ImplementationTable;
-    }
-
--- a/appfw/apparchitecture/tef/forceregapps/tforceregapprec.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @internalComponent - Internal Symbian test code 
-*/
-
-
-TARGET			tforceregapprec.dll
-CAPABILITY		All -Tcb
-TARGETTYPE		PLUGIN
-UID				0x10009d8d 0xA0001010
-VENDORID 		0x70000001
-
-SOURCEPATH		.
-SOURCE			TForceRegAppRec.cpp
-
-userinclude   ../../inc
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY			euser.lib apmime.lib apparc.lib efsrv.lib
-
-start resource A0001010.rss
-target tforceregapprec.rsc
-end
-
-SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/m_ctrl_v2_Stub.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,72 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+//
+// M_CTRL.MMP for test component M_CTRL (released in APPARC)
+// New style APP/EXE built for a secure environment
+//
+
+target 		m_ctrl.exe
+TARGETTYPE 	exe
+
+targetpath	/sys/bin
+UID		0x100039CE 0x13008AEE
+CAPABILITY 	All -Tcb
+VENDORID 	0x70000001
+
+epocstacksize 	0x5000
+
+SOURCEPATH	.
+
+
+userinclude   ../inc
+ 		
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//systeminclude   /epoc32/include/techview
+
+userinclude     .
+
+// Application exe specific resource which is localised to the application
+resource  	M_CTRL.rss
+start resource  M_CTRL.rss
+targetpath	/resource/apps
+lang 		sc
+end
+
+// Application exe registration resource file
+start resource 	M_CTRL_reg.rss
+targetpath 	/private/10003a3f/import/apps
+lang		sc
+end
+
+// Application localisable resource file
+start resource 	M_CTRL_loc.RSS
+targetpath 	/resource/apps
+lang		sc
+end
+
+SOURCE		M_CTRL_V2.CPP
+
+LIBRARY 	apparc.lib 
+LIBRARY 	cone.lib
+LIBRARY 	efsrv.lib
+LIBRARY 	eikcore.lib
+LIBRARY 	euser.lib 
+LIBRARY 	gdi.lib
+LIBRARY 	appfwk_test_appui.lib 
+
+SMPSAFE
--- a/appfw/apparchitecture/tef/m_ctrl_v2_stub.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-//
-// M_CTRL.MMP for test component M_CTRL (released in APPARC)
-// New style APP/EXE built for a secure environment
-//
-
-target 		m_ctrl.exe
-TARGETTYPE 	exe
-
-targetpath	/sys/bin
-UID		0x100039CE 0x13008AEE
-CAPABILITY 	All -Tcb
-VENDORID 	0x70000001
-
-epocstacksize 	0x5000
-
-SOURCEPATH	.
-
-
-userinclude   ../inc
- 		
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
-//systeminclude   /epoc32/include/techview
-
-userinclude     .
-
-// Application exe specific resource which is localised to the application
-resource  	M_CTRL.rss
-start resource  M_CTRL.rss
-targetpath	/resource/apps
-lang 		sc
-end
-
-// Application exe registration resource file
-start resource 	M_CTRL_reg.rss
-targetpath 	/private/10003a3f/import/apps
-lang		sc
-end
-
-// Application localisable resource file
-start resource 	M_CTRL_loc.RSS
-targetpath 	/resource/apps
-lang		sc
-end
-
-SOURCE		M_CTRL_V2.CPP
-
-LIBRARY 	apparc.lib 
-LIBRARY 	cone.lib
-LIBRARY 	efsrv.lib
-LIBRARY 	eikcore.lib
-LIBRARY 	euser.lib 
-LIBRARY 	gdi.lib
-LIBRARY 	appfwk_test_appui.lib 
-
-SMPSAFE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/refnativeplugin/10285BC3.rss	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+* ECOM DLL UID:			0x10285BC3
+* ECOM interface UID:		0x10285BC2 (KUidSifPlugin)
+* ECOM Implementation:		0x10285BC4
+*
+*/
+
+
+#include <ecom/registryinfo.rh>
+
+RESOURCE REGISTRY_INFO so_registry
+	{
+	dll_uid = 0x10285BC3;
+	interfaces =
+		{
+		INTERFACE_INFO
+			{
+			interface_uid = 0x10285BC2;
+			
+			implementations =
+				{
+				IMPLEMENTATION_INFO
+					{
+					implementation_uid = 0x10285BC4;
+					version_no = 1;
+					default_data = "";
+					opaque_data = "";
+					}
+				};
+			}
+		};
+	}
\ No newline at end of file
--- a/appfw/apparchitecture/tef/refnativeplugin/10285bc3.rss	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* ECOM DLL UID:			0x10285BC3
-* ECOM interface UID:		0x10285BC2 (KUidSifPlugin)
-* ECOM Implementation:		0x10285BC4
-*
-*/
-
-
-#include <ecom/registryinfo.rh>
-
-RESOURCE REGISTRY_INFO so_registry
-	{
-	dll_uid = 0x10285BC3;
-	interfaces =
-		{
-		INTERFACE_INFO
-			{
-			interface_uid = 0x10285BC2;
-			
-			implementations =
-				{
-				IMPLEMENTATION_INFO
-					{
-					implementation_uid = 0x10285BC4;
-					version_no = 1;
-					default_data = "";
-					opaque_data = "";
-					}
-				};
-			}
-		};
-	}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/scripts/apparctest_t_UpdateAppList.script	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,20 @@
+//
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+PRINT Run T_UpdateAppList Apparc test 
+//
+LOAD_SUITE ApparcTestServer
+RUN_TEST_STEP 100 ApparcTestServer T_UpdateAppList
\ No newline at end of file
--- a/appfw/apparchitecture/tef/scripts/apparctest_t_updateapplist.script	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-//
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-//
-PRINT Run T_UpdateAppList Apparc test 
-//
-LOAD_SUITE ApparcTestServer
-RUN_TEST_STEP 100 ApparcTestServer T_UpdateAppList
\ No newline at end of file
--- a/appfw/apparchitecture/tef/t_dataprioritysystem3.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @internalComponent - Internal Symbian test code
-*/
-
-TARGET        	T_DataPrioritySystem3.exe
-TARGETTYPE    	exe
-UID           	0x100039CE 0x10207f7f
-VENDORID  	0x70000001
-
-USERINCLUDE   	.
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
-//SYSTEMINCLUDE   /epoc32/include/techview
-
-// Application exe registration resource file
-resource  	T_DataPrioritySystem3_reg.rss
-start resource 	T_DataPrioritySystem3_reg.rss
-targetpath 	/apparctestregfiles
-lang		sc
-end
-
-SOURCEPATH		../tef
-//SOURCE T_ServicesStep.cpp
-SOURCE	app_CTRL.CPP
-
-LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
-LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
-LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
-LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
-LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
-LIBRARY		aplist.lib
-LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
-
-SMPSAFE
--- a/appfw/apparchitecture/tef/t_groupname.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @internalComponent - Internal Symbian test code
-*/
-
-TARGET        	T_groupname.exe
-TARGETTYPE    	exe
-UID           	0x100039CE 0x10208185
-VENDORID  	0x70000001
-
-USERINCLUDE   	.
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
-//SYSTEMINCLUDE   /epoc32/include/techview
-
-// Application localisable resource file
-resource  	T_groupname_loc.RSS
-start resource 	T_groupname_loc.RSS
-HEADER
-targetpath 	/apparctestregfiles
-lang		sc
-end
-
-
-START RESOURCE	T_groupname_reg.rss
-TARGETPATH	/apparctestregfiles
-lang		sc
-END
-
-
-SOURCEPATH		../tef
-SOURCE	app_CTRL.CPP
-
-LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
-LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
-LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
-LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
-LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
-LIBRARY		aplist.lib
-LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
-
-SMPSAFE
--- a/appfw/apparchitecture/tef/t_groupname_ver1.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @internalComponent - Internal Symbian test code
-*/
-
-TARGET        	T_groupname_ver1.exe
-TARGETTYPE    	exe
-UID           	0x100039CE 0x10208183
-VENDORID  	0x70000001
-
-USERINCLUDE   	.
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
-//SYSTEMINCLUDE   /epoc32/include/techview
-
-// Application localisable resource file
-resource  	T_groupnamever1_loc.RSS
-start resource 	T_groupnamever1_loc.RSS
-HEADER
-targetpath 	/apparctestregfiles
-lang		sc
-end
-
-
-START RESOURCE	T_groupnamever1_reg.rss
-TARGETPATH	/apparctestregfiles
-lang		sc
-END
-
-
-SOURCEPATH		../tef
-SOURCE	app_CTRL.CPP
-
-LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
-LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
-LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
-LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
-LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
-LIBRARY		aplist.lib
-LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
-
-SMPSAFE
--- a/appfw/apparchitecture/tef/t_groupname_ver2.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @internalComponent - Internal Symbian test code
-*/
-
-TARGET        	T_groupname_ver2.exe
-TARGETTYPE    	exe
-UID           	0x100039CE 0x10208184
-VENDORID  	0x70000001
-
-USERINCLUDE   	.
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
-//SYSTEMINCLUDE   /epoc32/include/techview
-
-// Application localisable resource file
-resource  	T_groupnamever2_loc.RSS
-start resource 	T_groupnamever2_loc.RSS
-HEADER
-targetpath 	/apparctestregfiles
-lang		sc
-end
-
-
-START RESOURCE	T_groupnamever2_reg.rss
-TARGETPATH	/apparctestregfiles
-lang		sc
-END
-
-
-SOURCEPATH		../tef
-SOURCE	app_CTRL.CPP
-
-LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
-LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
-LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
-LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
-LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
-LIBRARY		aplist.lib
-LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
-
-SMPSAFE
--- a/appfw/apparchitecture/tef/tctrlpnlapp.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @internalComponent - Internal Symbian test code
-*/
-
-TARGET        	TCtrlPnlApp.exe
-TARGETTYPE    	exe
-UID           	0x100039CE 0x10207f79
-VENDORID  	0x70000001
-
-USERINCLUDE   	.
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
-//SYSTEMINCLUDE   /epoc32/include/techview
-
-START RESOURCE	TCtrlPnlApp_reg.rss
-TARGETPATH	/apparctestregfiles
-lang		sc
-END
-
-SOURCEPATH		../tef
-SOURCE	app_CTRL.CPP
-
-LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
-LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
-LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
-LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
-LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
-LIBRARY		aplist.lib
-LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
-
-SMPSAFE
--- a/appfw/apparchitecture/tef/testapp/testforceregistrationapp1/testforceregistrationapp1.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ b/appfw/apparchitecture/tef/testapp/testforceregistrationapp1/testforceregistrationapp1.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -14,22 +14,24 @@
 // testforceregistrationapp1.mmp
 //
 
+#include <platform_paths.hrh>
+
 target          testforceregistrationapp1.exe
 targettype      EXE
 UID             0x1000007a 0x102826E0
 
 
-systeminclude   /epoc32/include
+MW_LAYER_SYSTEMINCLUDE
 
 source	 ./testforceregistrationapp1.cpp
 
 
 START RESOURCE      testforceregistrationapp1_reg.rss
-    TARGETPATH      \apparctest
+    TARGETPATH      /apparctest
 END
 
 START RESOURCE      testforceregistrationapp1_loc.rss
-    TARGETPATH      \apparctest
+    TARGETPATH      /apparctest
 END
 
 library  euser.lib
Binary file appfw/apparchitecture/tef/testpkg/Nokia_RnDCert_02.der has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/Nokia_RnDCert_02.key	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQC/TDP7KKIaf5+uW4OD2iVZuUMC2a+SeQTjf6srlKcOm+CpPNXn
+uLNm/8fdEnyOIuRXPRKmqhs1n0JkxEGHynELWMTuKXbQx9SRAGUXzyneGn+IJNnO
+vOKHWgKCouX2hfI8rtkdqJpqmO460gGsMgw+lsbeyWyW9lnfLxq+ZC7sqQIDAQAB
+AoGBALmUWZE8GBaQ3P4u9WUCSd3DJkkrmXIFSULSZeH/chlwCwDjbbhArHothVzo
+REE3hEFFlERvHbplZ+mNouzy7boduvgUzbksGrbGMLJ2qO1GzWWVwV+GzOWKd3ss
+/98Gwoy5R8pjnkqUE2wP1iJFw0FjvUTKcYv/z6t3LLJ0CsoBAkEA+c7ixvsviQ3J
+s0INytCKU2bf8fqFQJi1VI82ukxNsujGTQ9upVSjuvqPvWyDvvTdrUBHqO+3qPut
+sEh01Q8aiQJBAMQKDJPVRu4ud3mwUfEavzL5EjqwG1k9VCNGYsT4FwtrHcxu1oP/
+pk6M3rIZukqomoEEnHWPMwhrK3fhBqi0OSECQQDr40VXege4FnH5OI2Hj4afHMyp
+VdQQXGMWFyopnzXblFz0lXb43cTCIiorR9XcMqNFHybLypkWE5o+lRzlt55pAkBQ
+P/zeF5Sts//cpL0mgdh7OVKpC6ZmZaCnwAx2rUhhuDu+kDDoYCLoTOps5fNI1LRK
+1GRoC3LMo3Jr5IYhUYWBAkBpCpN6k4JU/mszq98EojHerQNxk8sPqvQKUzTutohT
+1gLX9yepGayB/TtT2EEJDkWOlnTy/dvN6W3vzbJYz97x
+-----END RSA PRIVATE KEY-----
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/Corrupted.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,29 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"Corrupted"}, (0x10004c5f), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\data\z\apparctest\Corrupted_reg.rsc"-"!:\private\10003a3f\import\apps\Corrupted_reg.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/CustomiseDefaultIconApp.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"CustomiseDefaultIconApp"}, (0x10208181), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\CustomiseDefaultIconApp.exe"-"!:\sys\bin\CustomiseDefaultIconApp.exe"
+"\epoc32\data\z\apparctestregfiles\CustomiseDefaultIconApp_reg.rsc"-"!:\private\10003a3f\import\apps\CustomiseDefaultIconApp_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\CustomiseDefaultIconApp_loc.rsc"-"!:\resource\apps\CustomiseDefaultIconApp_loc.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/EndTaskTestApp.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"EndTaskTestApp"}, (0x10282B33), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\endtasktestapp.exe"-"!:\sys\bin\endtasktestapp.exe"
+"\epoc32\data\z\apparctestregfiles\EndTask_reg.rsc"-"!:\private\10003a3f\import\apps\EndTask_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\EndTaskTestApp.rsc"-"!:\resource\apps\EndTaskTestApp.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/ForceRegApp1.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"ForceRegApp1"}, (0xA0001000), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\forceregapp1.exe"-"!:\sys\bin\forceregapp1.exe"
+"\epoc32\data\z\apparctestregfiles\forceregapp1_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp1_reg.rsc"
+"\epoc32\data\z\apparctest\forcegtestapp1.frg1"-"!:\apparctest\forcegtestapp1.frg1", RI
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/ForceRegApp2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"ForceRegApp2"}, (0xA0001001), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\forceregapp2.exe"-"!:\sys\bin\forceregapp2.exe"
+"\epoc32\data\z\apparctestregfiles\forceregapp2_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp2_reg.rsc"
+"\epoc32\data\z\apparctest\forcegtestapp2.frg2"-"!:\apparctest\forcegtestapp2.frg2", RI, RW
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/ForceRegMultipleApps.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,35 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"ForceRegMultipleApps"}, (0xA0001001), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\forceregapp1.exe"-"!:\sys\bin\forceregapp1.exe"
+"\epoc32\data\z\apparctestregfiles\forceregapp1_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp1_reg.rsc"
+"\epoc32\data\z\apparctest\forcegtestapp1.frg1"-"!:\apparctest\forcegtestapp1.frg1", RI
+
+"\epoc32\release\armv5\udeb\forceregapp2.exe"-"!:\sys\bin\forceregapp2.exe"
+"\epoc32\data\z\apparctestregfiles\forceregapp2_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp2_reg.rsc"
+"\epoc32\data\z\apparctest\forcegtestapp2.frg2"-"!:\apparctest\forcegtestapp2.frg2", RI, RW
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/SimpleApparcTestApp.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"SimpleApparcTestApp"}, (0x12008ACE), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\simpleapparctestapp.exe"-"!:\sys\bin\simpleapparctestapp.exe"
+"\epoc32\data\z\apparctestregfiles\SimpleApparcTestApp_Reg.rsc"-"!:\private\10003a3f\import\apps\SimpleApparcTestApp_Reg.rsc"
+"\epoc32\data\z\apparctestregfiles\SimpleApparcTestApp.rsc"-"!:\resource\apps\SimpleApparcTestApp.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddableOnly_v2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddableOnly_v2"}, (0x10004c5C), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tappembeddableonly.dll"-"!:\sys\bin\tappembeddableonly.dll"
+"\epoc32\data\z\apparctestregfiles\TAppEmbeddableOnly_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableOnly_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tappembeddableonly.rsc"-"!:\resource\plugins\tappembeddableonly.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddableUiNotStandAlone_v2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddableUiNotStandAlone_v2"}, (0x10004c5E), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tappembeddableuinotstandalone.dll"-"!:\sys\bin\tappembeddableuinotstandalone.dll"
+"\epoc32\data\z\apparctestregfiles\TAppEmbeddableUiNotStandAlone_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableUiNotStandAlone_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tappembeddableuinotstandalone.rsc"-"!:\resource\plugins\tappembeddableuinotstandalone.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddableUiOrStandAlone_embedded.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddableUiOrStandAlone_embedded"}, (0x10004c5D), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tappembeddableuiorstandalone_embedded.dll"-"!:\sys\bin\tappembeddableuiorstandalone_embedded.dll"
+"\epoc32\data\z\apparctestregfiles\tappembeddableuiorstandalone_embedded.rsc"-"!:\resource\plugins\tappembeddableuiorstandalone_embedded.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddableUiOrStandalone_standalone.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddableUiOrStandalone_standalone"}, (0x10004c4A), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tappembeddableuiorstandalone.exe"-"!:\sys\bin\tappembeddableuiorstandalone.exe"
+"\epoc32\data\z\apparctestregfiles\TAppEmbeddableUiOrStandAlone_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableUiOrStandAlone_reg.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddable_embedded.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddable_embedded"}, (0x10004c5B), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tappembeddable_embedded.dll"-"!:\sys\bin\tappembeddable_embedded.dll"
+"\epoc32\data\z\apparctestregfiles\tappembeddable_embedded.rsc"-"!:\resource\plugins\tappembeddable_embedded.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddable_standalone.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddable_standalone"}, (0x10004c48), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tappembeddable.exe"-"!:\sys\bin\tappembeddable.exe"
+"\epoc32\data\z\apparctestregfiles\TAppEmbeddable_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddable_reg.rsc"
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TAppInstall.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppInstall"}, (0x10207f7d), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\testappinstall.exe"-"!:\sys\bin\testappinstall.exe"
+"\epoc32\data\z\apparctestregfiles\TestAppInstall_reg.rsc"-"!:\apparctest\TestAppInstall_reg.rsc"
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TAppNotEmbeddable_v2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppNotEmbeddable_v2"}, (0x10004c47), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tappnotembeddable.exe"-"!:\sys\bin\tappnotembeddable.exe"
+"\epoc32\data\z\apparctestregfiles\TAppNotEmbeddable_reg.rsc"-"!:\private\10003a3f\import\apps\TAppNotEmbeddable_reg.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TApparcTestApp.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,34 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TApparcTestApp"}, (0x100048F3), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tapparctestapp.exe"-"!:\sys\bin\tapparctestapp.exe"
+"\epoc32\data\z\apparctestregfiles\tapparctestapp_reg.rsc"-"!:\private\10003a3f\import\apps\tapparctestapp_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tapparctestapp.rsc"-"!:\resource\apps\tapparctestapp.rsc"
+"\epoc32\data\z\apparctestregfiles\tapparctestapp_loc.rsc"-"!:\resource\apps\tapparctestapp_loc.rsc"
+"\epoc32\data\z\apparctestregfiles\svg_icon.svg"-"!:\resource\apps\svg_icon.svg"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TCtrlPnlApp.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TCtrlPnlApp"}, (0x10207f79), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\TCtrlPnlApp.exe"-"!:\sys\bin\TCtrlPnlApp.exe"
+"\epoc32\data\z\apparctestregfiles\TCtrlPnlApp_reg.rsc"-"!:\private\10003a3f\import\apps\TCtrlPnlApp_reg.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TNNApp1.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TNNApp1"}, (0x10207f92), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tnnapp1.exe"-"!:\sys\bin\tnnapp1.exe"
+"\epoc32\data\z\apparctestregfiles\TNNApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TNNApp1_reg.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TNNApp2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TNNApp2"}, (0x10207f94), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tnnapp2.exe"-"!:\sys\bin\tnnapp2.exe"
+"\epoc32\data\z\apparctestregfiles\TNNApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TNNApp2_reg.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TRApaLsSessionStartAppTestApp_v2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TRApaLsSessionStartAppTestApp_v2"}, (0x10004c4f), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\trapalssessionstartapptestapp.exe"-"!:\sys\bin\trapalssessionstartapptestapp.exe"
+"\epoc32\data\z\apparctestregfiles\TRApaLsSessionStartAppTestApp_reg.rsc"-"!:\private\10003a3f\import\apps\TRApaLsSessionStartAppTestApp_reg.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TSTAPP_standalone.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,47 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TSTAPP_standalone"}, (10), 1, 0, 0, TYPE=SA, RU
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tstapp.exe"-"!:\sys\bin\tstapp.exe"
+"\epoc32\data\z\apparctestregfiles\tstapp_reg.rsc"-"!:\private\10003a3f\import\apps\tstapp_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tstapp_loc.rsc"-"!:\resource\apps\tstapp_loc.rsc"
+"\epoc32\data\z\apparctestregfiles\tstapp_loc.r01"-"!:\resource\apps\tstapp_loc.r01"
+"\epoc32\data\z\apparctestregfiles\tstapp_loc.r02"-"!:\resource\apps\tstapp_loc.r02"
+"\epoc32\data\z\apparctestregfiles\tstapp_loc.r03"-"!:\resource\apps\tstapp_loc.r03"
+"\epoc32\data\z\apparctestregfiles\tstapp_loc.r04"-"!:\resource\apps\tstapp_loc.r04"
+"\epoc32\data\z\apparctestregfiles\tstapp_loc.r05"-"!:\resource\apps\tstapp_loc.r05"
+"\epoc32\data\z\apparctestregfiles\TSTAPP.rsc"-"!:\resource\apps\TSTAPP.rsc"
+"\epoc32\data\z\apparctestregfiles\tstapp.mbm"-"!:\resource\apps\tstapp.mbm"
+"\epoc32\data\z\apparctestregfiles\tstappview01.m01"-"!:\resource\apps\tstappview01.m01"
+"\epoc32\data\z\apparctestregfiles\tstappview02.k"-"!:\resource\apps\tstappview02.k"
+"\epoc32\data\z\apparctestregfiles\tstappviewneg.xyz"-"!:\resource\apps\tstappviewneg.xyz"
+"\epoc32\data\z\apparctestregfiles\tstappviewneg.mbm"-"!:\resource\apps\tstappviewneg.mbm"
+"\epoc32\data\z\apparctestregfiles\tstappview"-"!:\resource\apps\tstappview"
+"\epoc32\data\z\apparctestregfiles\tstapp02.m02"-"!:\resource\apps\tstapp02.m02"
+"\epoc32\data\z\apparctestregfiles\tstappview01.m02"-"!:\resource\apps\tstappview01.m02"
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TStartDocApp_v2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TStartDocApp_v2"}, (0x10004c4d), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tstartdocapp.exe"-"!:\sys\bin\tstartdocapp.exe"
+"\epoc32\data\z\apparctestregfiles\TStartDocApp_reg.rsc"-"!:\private\10003a3f\import\apps\TStartDocApp_reg.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/T_DataPrioritySystem1.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_DataPrioritySystem1"}, (0x10207f7b), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\t_dataprioritysystem1.exe"-"!:\sys\bin\t_dataprioritysystem1.exe"
+"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem1_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem1_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem1_loc.rsc"-"!:\resource\apps\T_DataPrioritySystem1_loc.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/T_DataPrioritySystem2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_DataPrioritySystem2"}, (0x10207f7c), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\t_dataprioritysystem2.exe"-"!:\sys\bin\t_dataprioritysystem2.exe"
+"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem2_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem2_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem2_loc.rsc"-"!:\resource\apps\T_DataPrioritySystem2_loc.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/T_DataPrioritySystem3.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_DataPrioritySystem3"}, (0x10207f7f), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\T_DataPrioritySystem3.exe"-"!:\sys\bin\T_DataPrioritySystem3.exe"
+"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem3_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem3_reg.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/T_EnvSlots.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_EnvSlots"}, (0x102032AB), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\t_envslots.exe"-"!:\sys\bin\t_envslots.exe"
+"\epoc32\data\z\apparctestregfiles\T_EnvSlots_reg.rsc"-"!:\private\10003a3f\import\apps\T_EnvSlots_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\T_EnvSlots_loc.rsc"-"!:\resource\apps\T_EnvSlots_loc.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/T_groupname.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_groupname"}, (0x10208185), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\T_groupname.exe"-"!:\sys\bin\T_groupname.exe"
+"\epoc32\data\z\apparctestregfiles\T_groupname_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupname_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\T_groupname_loc.rsc"-"!:\resource\apps\T_groupname_loc.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/T_groupname_ver1.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_groupname_ver1"}, (0x10208183), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\T_groupname_ver1.exe"-"!:\sys\bin\T_groupname_ver1.exe"
+"\epoc32\data\z\apparctestregfiles\T_groupnamever1_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever1_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\T_groupnamever1_loc.rsc"-"!:\resource\apps\T_groupnamever1_loc.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/T_groupname_ver2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_groupname_ver2"}, (0x10208184), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\T_groupname_ver2.exe"-"!:\sys\bin\T_groupname_ver2.exe"
+"\epoc32\data\z\apparctestregfiles\T_groupnamever2_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever2_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\T_groupnamever2_loc.rsc"-"!:\resource\apps\T_groupnamever2_loc.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TestTrustedPriorityApp1.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestTrustedPriorityApp1"}, (0x10207f8D), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\TestTrustedPriorityApp1.exe"-"!:\sys\bin\TestTrustedPriorityApp1.exe"
+"\epoc32\data\z\apparctestregfiles\TestTrustedPriorityApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TestTrustedPriorityApp1_reg.rsc"
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TestTrustedPriorityApp2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestTrustedPriorityApp2"}, (0x10207f8F), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\TestTrustedPriorityApp2.exe"-"!:\sys\bin\TestTrustedPriorityApp2.exe"
+"\epoc32\data\z\apparctestregfiles\TestTrustedPriorityApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TestTrustedPriorityApp2_reg.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TestUnTrustedPriorityApp1.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestUnTrustedPriorityApp1"}, (0x10207f8C), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\TestUnTrustedPriorityApp1.exe"-"!:\sys\bin\TestUnTrustedPriorityApp1.exe"
+"\epoc32\data\z\apparctestregfiles\TestUnTrustedPriorityApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TestUnTrustedPriorityApp1_reg.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TestUnTrustedPriorityApp2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestUnTrustedPriorityApp2"}, (0xA3010010), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\TestUnTrustedPriorityApp2.exe"-"!:\sys\bin\TestUnTrustedPriorityApp2.exe"
+"\epoc32\data\z\apparctestregfiles\TestUnTrustedPriorityApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TestUnTrustedPriorityApp2_reg.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/UnProctectedUidApp.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"UnProctectedUidApp"}, (0xA0001C5E), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\unproctecteduidapp.exe"-"!:\sys\bin\unproctecteduidapp.exe"
+"\epoc32\data\z\apparctestregfiles\UnProctectedUidApp_reg.rsc"-"!:\private\10003a3f\import\apps\UnProctectedUidApp_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\UnProctectedUidApp.rsc"-"!:\resource\apps\UnProctectedUidApp.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/app_CTRL.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,34 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"app_CTRL"}, (0x13008ACE), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\app_ctrl.exe"-"!:\sys\bin\app_ctrl.exe"
+"\epoc32\data\z\apparctestregfiles\App_CTRL_reg.rsc"-"!:\private\10003a3f\import\apps\App_CTRL_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\App_CTRL.rsc"-"!:\resource\apps\App_CTRL.rsc"
+"\epoc32\data\z\apparctestregfiles\App_ctrl_loc.rsc"-"!:\resource\apps\App_ctrl_loc.rsc"
+"\epoc32\data\z\apparctestregfiles\APP_CTRL.MBM"-"!:\resource\apps\APP_CTRL.MBM"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/app_CTRL2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"app_CTRL2"}, (0x13008ADE), 1, 0, 0, TYPE=SA, RU
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\app_ctrl2.exe"-"!:\sys\bin\app_ctrl2.exe"
+"\epoc32\data\z\apparctestregfiles\App_CTRL2_reg.rsc"-"!:\private\10003a3f\import\apps\App_CTRL2_reg.rsc"
\ No newline at end of file
--- a/appfw/apparchitecture/tef/testpkg/armv5/app_ctrl.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"app_CTRL"}, (0x13008ACE), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\app_ctrl.exe"-"!:\sys\bin\app_ctrl.exe"
-"\epoc32\data\z\apparctestregfiles\App_CTRL_reg.rsc"-"!:\private\10003a3f\import\apps\App_CTRL_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\App_CTRL.rsc"-"!:\resource\apps\App_CTRL.rsc"
-"\epoc32\data\z\apparctestregfiles\App_ctrl_loc.rsc"-"!:\resource\apps\App_ctrl_loc.rsc"
-"\epoc32\data\z\apparctestregfiles\APP_CTRL.MBM"-"!:\resource\apps\APP_CTRL.MBM"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/app_ctrl2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"app_CTRL2"}, (0x13008ADE), 1, 0, 0, TYPE=SA, RU
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\app_ctrl2.exe"-"!:\sys\bin\app_ctrl2.exe"
-"\epoc32\data\z\apparctestregfiles\App_CTRL2_reg.rsc"-"!:\private\10003a3f\import\apps\App_CTRL2_reg.rsc"
\ No newline at end of file
--- a/appfw/apparchitecture/tef/testpkg/armv5/corrupted.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"Corrupted"}, (0x10004c5f), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\data\z\apparctest\Corrupted_reg.rsc"-"!:\private\10003a3f\import\apps\Corrupted_reg.rsc"
--- a/appfw/apparchitecture/tef/testpkg/armv5/customisedefaulticonapp.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"CustomiseDefaultIconApp"}, (0x10208181), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\CustomiseDefaultIconApp.exe"-"!:\sys\bin\CustomiseDefaultIconApp.exe"
-"\epoc32\data\z\apparctestregfiles\CustomiseDefaultIconApp_reg.rsc"-"!:\private\10003a3f\import\apps\CustomiseDefaultIconApp_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\CustomiseDefaultIconApp_loc.rsc"-"!:\resource\apps\CustomiseDefaultIconApp_loc.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/endtasktestapp.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"EndTaskTestApp"}, (0x10282B33), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\endtasktestapp.exe"-"!:\sys\bin\endtasktestapp.exe"
-"\epoc32\data\z\apparctestregfiles\EndTask_reg.rsc"-"!:\private\10003a3f\import\apps\EndTask_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\EndTaskTestApp.rsc"-"!:\resource\apps\EndTaskTestApp.rsc"
--- a/appfw/apparchitecture/tef/testpkg/armv5/forceregapp1.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"ForceRegApp1"}, (0xA0001000), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\forceregapp1.exe"-"!:\sys\bin\forceregapp1.exe"
-"\epoc32\data\z\apparctestregfiles\forceregapp1_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp1_reg.rsc"
-"\epoc32\data\z\apparctest\forcegtestapp1.frg1"-"!:\apparctest\forcegtestapp1.frg1", RI
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/forceregapp2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"ForceRegApp2"}, (0xA0001001), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\forceregapp2.exe"-"!:\sys\bin\forceregapp2.exe"
-"\epoc32\data\z\apparctestregfiles\forceregapp2_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp2_reg.rsc"
-"\epoc32\data\z\apparctest\forcegtestapp2.frg2"-"!:\apparctest\forcegtestapp2.frg2", RI, RW
--- a/appfw/apparchitecture/tef/testpkg/armv5/forceregmultipleapps.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"ForceRegMultipleApps"}, (0xA0001001), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\forceregapp1.exe"-"!:\sys\bin\forceregapp1.exe"
-"\epoc32\data\z\apparctestregfiles\forceregapp1_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp1_reg.rsc"
-"\epoc32\data\z\apparctest\forcegtestapp1.frg1"-"!:\apparctest\forcegtestapp1.frg1", RI
-
-"\epoc32\release\armv5\udeb\forceregapp2.exe"-"!:\sys\bin\forceregapp2.exe"
-"\epoc32\data\z\apparctestregfiles\forceregapp2_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp2_reg.rsc"
-"\epoc32\data\z\apparctest\forcegtestapp2.frg2"-"!:\apparctest\forcegtestapp2.frg2", RI, RW
--- a/appfw/apparchitecture/tef/testpkg/armv5/simpleapparctestapp.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"SimpleApparcTestApp"}, (0x12008ACE), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\simpleapparctestapp.exe"-"!:\sys\bin\simpleapparctestapp.exe"
-"\epoc32\data\z\apparctestregfiles\SimpleApparcTestApp_Reg.rsc"-"!:\private\10003a3f\import\apps\SimpleApparcTestApp_Reg.rsc"
-"\epoc32\data\z\apparctestregfiles\SimpleApparcTestApp.rsc"-"!:\resource\apps\SimpleApparcTestApp.rsc"
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/tRuleBasedApp1.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tRuleBasedApp1"}, (0X1020D6FC), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\trulebasedapp1.exe"-"!:\sys\bin\trulebasedapp1.exe"
+"\epoc32\data\z\apparctestregfiles\tRuleBasedApp1_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp1_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tRuleBasedApp1.rsc"-"!:\resource\apps\tRuleBasedApp1.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/tRuleBasedApp2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tRuleBasedApp2"}, (0X1020D6FD), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\trulebasedapp2.exe"-"!:\sys\bin\trulebasedapp2.exe"
+"\epoc32\data\z\apparctestregfiles\tRuleBasedApp2_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp2_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tRuleBasedApp2.rsc"-"!:\resource\apps\tRuleBasedApp2.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/tRuleBasedApp3.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tRuleBasedApp3"}, (0X1020D6FE), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\trulebasedapp3.exe"-"!:\sys\bin\trulebasedapp3.exe"
+"\epoc32\data\z\apparctestregfiles\tRuleBasedApp3_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp3_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tRuleBasedApp3.rsc"-"!:\resource\apps\tRuleBasedApp3.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/tRuleBasedApp4.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tRuleBasedApp4"}, (0x10210F77), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\trulebasedapp4.exe"-"!:\sys\bin\trulebasedapp4.exe"
+"\epoc32\data\z\apparctestregfiles\tRuleBasedApp4_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp4_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tRuleBasedApp4.rsc"-"!:\resource\apps\tRuleBasedApp4.rsc"
+
--- a/appfw/apparchitecture/tef/testpkg/armv5/t_dataprioritysystem1.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"T_DataPrioritySystem1"}, (0x10207f7b), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\t_dataprioritysystem1.exe"-"!:\sys\bin\t_dataprioritysystem1.exe"
-"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem1_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem1_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem1_loc.rsc"-"!:\resource\apps\T_DataPrioritySystem1_loc.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/t_dataprioritysystem2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"T_DataPrioritySystem2"}, (0x10207f7c), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\t_dataprioritysystem2.exe"-"!:\sys\bin\t_dataprioritysystem2.exe"
-"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem2_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem2_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem2_loc.rsc"-"!:\resource\apps\T_DataPrioritySystem2_loc.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/t_dataprioritysystem3.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"T_DataPrioritySystem3"}, (0x10207f7f), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\T_DataPrioritySystem3.exe"-"!:\sys\bin\T_DataPrioritySystem3.exe"
-"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem3_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem3_reg.rsc"
--- a/appfw/apparchitecture/tef/testpkg/armv5/t_envslots.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"T_EnvSlots"}, (0x102032AB), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\t_envslots.exe"-"!:\sys\bin\t_envslots.exe"
-"\epoc32\data\z\apparctestregfiles\T_EnvSlots_reg.rsc"-"!:\private\10003a3f\import\apps\T_EnvSlots_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\T_EnvSlots_loc.rsc"-"!:\resource\apps\T_EnvSlots_loc.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/t_groupname.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"T_groupname"}, (0x10208185), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\T_groupname.exe"-"!:\sys\bin\T_groupname.exe"
-"\epoc32\data\z\apparctestregfiles\T_groupname_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupname_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\T_groupname_loc.rsc"-"!:\resource\apps\T_groupname_loc.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/t_groupname_ver1.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"T_groupname_ver1"}, (0x10208183), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\T_groupname_ver1.exe"-"!:\sys\bin\T_groupname_ver1.exe"
-"\epoc32\data\z\apparctestregfiles\T_groupnamever1_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever1_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\T_groupnamever1_loc.rsc"-"!:\resource\apps\T_groupnamever1_loc.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/t_groupname_ver2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"T_groupname_ver2"}, (0x10208184), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\T_groupname_ver2.exe"-"!:\sys\bin\T_groupname_ver2.exe"
-"\epoc32\data\z\apparctestregfiles\T_groupnamever2_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever2_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\T_groupnamever2_loc.rsc"-"!:\resource\apps\T_groupnamever2_loc.rsc"
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/t_winchainChild.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"t_winchainChild"}, (0X10009e9f), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\t_winchainchild.exe"-"!:\sys\bin\t_winchainchild.exe"
+"\epoc32\data\z\apparctestregfiles\t_winchainChild_reg.rsc"-"!:\private\10003a3f\import\apps\t_winchainChild_reg.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/t_winchainLaunch.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"t_winchainLaunch"}, (0X10009f9a), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\t_winchainlaunch.exe"-"!:\sys\bin\t_winchainlaunch.exe"
+"\epoc32\data\z\apparctestregfiles\t_winchainLaunch_reg.rsc"-"!:\private\10003a3f\import\apps\t_winchainLaunch_reg.rsc"
+
--- a/appfw/apparchitecture/tef/testpkg/armv5/t_winchainchild.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"t_winchainChild"}, (0X10009e9f), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\t_winchainchild.exe"-"!:\sys\bin\t_winchainchild.exe"
-"\epoc32\data\z\apparctestregfiles\t_winchainChild_reg.rsc"-"!:\private\10003a3f\import\apps\t_winchainChild_reg.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/t_winchainlaunch.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"t_winchainLaunch"}, (0X10009f9a), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\t_winchainlaunch.exe"-"!:\sys\bin\t_winchainlaunch.exe"
-"\epoc32\data\z\apparctestregfiles\t_winchainLaunch_reg.rsc"-"!:\private\10003a3f\import\apps\t_winchainLaunch_reg.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/tapparctestapp.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TApparcTestApp"}, (0x100048F3), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\tapparctestapp.exe"-"!:\sys\bin\tapparctestapp.exe"
-"\epoc32\data\z\apparctestregfiles\tapparctestapp_reg.rsc"-"!:\private\10003a3f\import\apps\tapparctestapp_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\tapparctestapp.rsc"-"!:\resource\apps\tapparctestapp.rsc"
-"\epoc32\data\z\apparctestregfiles\tapparctestapp_loc.rsc"-"!:\resource\apps\tapparctestapp_loc.rsc"
-"\epoc32\data\z\apparctestregfiles\svg_icon.svg"-"!:\resource\apps\svg_icon.svg"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/tappembeddable_embedded.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TAppEmbeddable_embedded"}, (0x10004c5B), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\tappembeddable_embedded.dll"-"!:\sys\bin\tappembeddable_embedded.dll"
-"\epoc32\data\z\apparctestregfiles\tappembeddable_embedded.rsc"-"!:\resource\plugins\tappembeddable_embedded.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/tappembeddable_standalone.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TAppEmbeddable_standalone"}, (0x10004c48), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\tappembeddable.exe"-"!:\sys\bin\tappembeddable.exe"
-"\epoc32\data\z\apparctestregfiles\TAppEmbeddable_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddable_reg.rsc"
-
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/tappembeddableonly_v2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TAppEmbeddableOnly_v2"}, (0x10004c5C), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\tappembeddableonly.dll"-"!:\sys\bin\tappembeddableonly.dll"
-"\epoc32\data\z\apparctestregfiles\TAppEmbeddableOnly_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableOnly_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\tappembeddableonly.rsc"-"!:\resource\plugins\tappembeddableonly.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/tappembeddableuinotstandalone_v2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TAppEmbeddableUiNotStandAlone_v2"}, (0x10004c5E), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\tappembeddableuinotstandalone.dll"-"!:\sys\bin\tappembeddableuinotstandalone.dll"
-"\epoc32\data\z\apparctestregfiles\TAppEmbeddableUiNotStandAlone_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableUiNotStandAlone_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\tappembeddableuinotstandalone.rsc"-"!:\resource\plugins\tappembeddableuinotstandalone.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/tappembeddableuiorstandalone_embedded.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TAppEmbeddableUiOrStandAlone_embedded"}, (0x10004c5D), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\tappembeddableuiorstandalone_embedded.dll"-"!:\sys\bin\tappembeddableuiorstandalone_embedded.dll"
-"\epoc32\data\z\apparctestregfiles\tappembeddableuiorstandalone_embedded.rsc"-"!:\resource\plugins\tappembeddableuiorstandalone_embedded.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/tappembeddableuiorstandalone_standalone.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TAppEmbeddableUiOrStandalone_standalone"}, (0x10004c4A), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\tappembeddableuiorstandalone.exe"-"!:\sys\bin\tappembeddableuiorstandalone.exe"
-"\epoc32\data\z\apparctestregfiles\TAppEmbeddableUiOrStandAlone_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableUiOrStandAlone_reg.rsc"
--- a/appfw/apparchitecture/tef/testpkg/armv5/tappinstall.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TAppInstall"}, (0x10207f7d), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\testappinstall.exe"-"!:\sys\bin\testappinstall.exe"
-"\epoc32\data\z\apparctestregfiles\TestAppInstall_reg.rsc"-"!:\apparctest\TestAppInstall_reg.rsc"
\ No newline at end of file
--- a/appfw/apparchitecture/tef/testpkg/armv5/tappnotembeddable_v2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TAppNotEmbeddable_v2"}, (0x10004c47), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\tappnotembeddable.exe"-"!:\sys\bin\tappnotembeddable.exe"
-"\epoc32\data\z\apparctestregfiles\TAppNotEmbeddable_reg.rsc"-"!:\private\10003a3f\import\apps\TAppNotEmbeddable_reg.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/tctrlpnlapp.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TCtrlPnlApp"}, (0x10207f79), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\TCtrlPnlApp.exe"-"!:\sys\bin\TCtrlPnlApp.exe"
-"\epoc32\data\z\apparctestregfiles\TCtrlPnlApp_reg.rsc"-"!:\private\10003a3f\import\apps\TCtrlPnlApp_reg.rsc"
--- a/appfw/apparchitecture/tef/testpkg/armv5/testtrustedpriorityapp1.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TestTrustedPriorityApp1"}, (0x10207f8D), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\TestTrustedPriorityApp1.exe"-"!:\sys\bin\TestTrustedPriorityApp1.exe"
-"\epoc32\data\z\apparctestregfiles\TestTrustedPriorityApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TestTrustedPriorityApp1_reg.rsc"
-
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/testtrustedpriorityapp2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TestTrustedPriorityApp2"}, (0x10207f8F), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\TestTrustedPriorityApp2.exe"-"!:\sys\bin\TestTrustedPriorityApp2.exe"
-"\epoc32\data\z\apparctestregfiles\TestTrustedPriorityApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TestTrustedPriorityApp2_reg.rsc"
--- a/appfw/apparchitecture/tef/testpkg/armv5/testuntrustedpriorityapp1.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TestUnTrustedPriorityApp1"}, (0x10207f8C), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\TestUnTrustedPriorityApp1.exe"-"!:\sys\bin\TestUnTrustedPriorityApp1.exe"
-"\epoc32\data\z\apparctestregfiles\TestUnTrustedPriorityApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TestUnTrustedPriorityApp1_reg.rsc"
--- a/appfw/apparchitecture/tef/testpkg/armv5/testuntrustedpriorityapp2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TestUnTrustedPriorityApp2"}, (0xA3010010), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\TestUnTrustedPriorityApp2.exe"-"!:\sys\bin\TestUnTrustedPriorityApp2.exe"
-"\epoc32\data\z\apparctestregfiles\TestUnTrustedPriorityApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TestUnTrustedPriorityApp2_reg.rsc"
--- a/appfw/apparchitecture/tef/testpkg/armv5/tnnapp1.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TNNApp1"}, (0x10207f92), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\tnnapp1.exe"-"!:\sys\bin\tnnapp1.exe"
-"\epoc32\data\z\apparctestregfiles\TNNApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TNNApp1_reg.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/tnnapp2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TNNApp2"}, (0x10207f94), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\tnnapp2.exe"-"!:\sys\bin\tnnapp2.exe"
-"\epoc32\data\z\apparctestregfiles\TNNApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TNNApp2_reg.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/trapalssessionstartapptestapp_v2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TRApaLsSessionStartAppTestApp_v2"}, (0x10004c4f), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\trapalssessionstartapptestapp.exe"-"!:\sys\bin\trapalssessionstartapptestapp.exe"
-"\epoc32\data\z\apparctestregfiles\TRApaLsSessionStartAppTestApp_reg.rsc"-"!:\private\10003a3f\import\apps\TRApaLsSessionStartAppTestApp_reg.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/trulebasedapp1.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"tRuleBasedApp1"}, (0X1020D6FC), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\trulebasedapp1.exe"-"!:\sys\bin\trulebasedapp1.exe"
-"\epoc32\data\z\apparctestregfiles\tRuleBasedApp1_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp1_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\tRuleBasedApp1.rsc"-"!:\resource\apps\tRuleBasedApp1.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/trulebasedapp2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"tRuleBasedApp2"}, (0X1020D6FD), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\trulebasedapp2.exe"-"!:\sys\bin\trulebasedapp2.exe"
-"\epoc32\data\z\apparctestregfiles\tRuleBasedApp2_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp2_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\tRuleBasedApp2.rsc"-"!:\resource\apps\tRuleBasedApp2.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/trulebasedapp3.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"tRuleBasedApp3"}, (0X1020D6FE), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\trulebasedapp3.exe"-"!:\sys\bin\trulebasedapp3.exe"
-"\epoc32\data\z\apparctestregfiles\tRuleBasedApp3_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp3_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\tRuleBasedApp3.rsc"-"!:\resource\apps\tRuleBasedApp3.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/trulebasedapp4.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"tRuleBasedApp4"}, (0x10210F77), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\trulebasedapp4.exe"-"!:\sys\bin\trulebasedapp4.exe"
-"\epoc32\data\z\apparctestregfiles\tRuleBasedApp4_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp4_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\tRuleBasedApp4.rsc"-"!:\resource\apps\tRuleBasedApp4.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/tstapp_standalone.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TSTAPP_standalone"}, (10), 1, 0, 0, TYPE=SA, RU
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\tstapp.exe"-"!:\sys\bin\tstapp.exe"
-"\epoc32\data\z\apparctestregfiles\tstapp_reg.rsc"-"!:\private\10003a3f\import\apps\tstapp_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\tstapp_loc.rsc"-"!:\resource\apps\tstapp_loc.rsc"
-"\epoc32\data\z\apparctestregfiles\tstapp_loc.r01"-"!:\resource\apps\tstapp_loc.r01"
-"\epoc32\data\z\apparctestregfiles\tstapp_loc.r02"-"!:\resource\apps\tstapp_loc.r02"
-"\epoc32\data\z\apparctestregfiles\tstapp_loc.r03"-"!:\resource\apps\tstapp_loc.r03"
-"\epoc32\data\z\apparctestregfiles\tstapp_loc.r04"-"!:\resource\apps\tstapp_loc.r04"
-"\epoc32\data\z\apparctestregfiles\tstapp_loc.r05"-"!:\resource\apps\tstapp_loc.r05"
-"\epoc32\data\z\apparctestregfiles\TSTAPP.rsc"-"!:\resource\apps\TSTAPP.rsc"
-"\epoc32\data\z\apparctestregfiles\tstapp.mbm"-"!:\resource\apps\tstapp.mbm"
-"\epoc32\data\z\apparctestregfiles\tstappview01.m01"-"!:\resource\apps\tstappview01.m01"
-"\epoc32\data\z\apparctestregfiles\tstappview02.k"-"!:\resource\apps\tstappview02.k"
-"\epoc32\data\z\apparctestregfiles\tstappviewneg.xyz"-"!:\resource\apps\tstappviewneg.xyz"
-"\epoc32\data\z\apparctestregfiles\tstappviewneg.mbm"-"!:\resource\apps\tstappviewneg.mbm"
-"\epoc32\data\z\apparctestregfiles\tstappview"-"!:\resource\apps\tstappview"
-"\epoc32\data\z\apparctestregfiles\tstapp02.m02"-"!:\resource\apps\tstapp02.m02"
-"\epoc32\data\z\apparctestregfiles\tstappview01.m02"-"!:\resource\apps\tstappview01.m02"
-
-
--- a/appfw/apparchitecture/tef/testpkg/armv5/tstartdocapp_v2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TStartDocApp_v2"}, (0x10004c4d), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\tstartdocapp.exe"-"!:\sys\bin\tstartdocapp.exe"
-"\epoc32\data\z\apparctestregfiles\TStartDocApp_reg.rsc"-"!:\private\10003a3f\import\apps\TStartDocApp_reg.rsc"
--- a/appfw/apparchitecture/tef/testpkg/armv5/unproctecteduidapp.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"UnProctectedUidApp"}, (0xA0001C5E), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\armv5\udeb\unproctecteduidapp.exe"-"!:\sys\bin\unproctecteduidapp.exe"
-"\epoc32\data\z\apparctestregfiles\UnProctectedUidApp_reg.rsc"-"!:\private\10003a3f\import\apps\UnProctectedUidApp_reg.rsc"
-"\epoc32\data\z\apparctestregfiles\UnProctectedUidApp.rsc"-"!:\resource\apps\UnProctectedUidApp.rsc"
-
Binary file appfw/apparchitecture/tef/testpkg/nokia_rndcert_02.der has changed
--- a/appfw/apparchitecture/tef/testpkg/nokia_rndcert_02.key	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQC/TDP7KKIaf5+uW4OD2iVZuUMC2a+SeQTjf6srlKcOm+CpPNXn
-uLNm/8fdEnyOIuRXPRKmqhs1n0JkxEGHynELWMTuKXbQx9SRAGUXzyneGn+IJNnO
-vOKHWgKCouX2hfI8rtkdqJpqmO460gGsMgw+lsbeyWyW9lnfLxq+ZC7sqQIDAQAB
-AoGBALmUWZE8GBaQ3P4u9WUCSd3DJkkrmXIFSULSZeH/chlwCwDjbbhArHothVzo
-REE3hEFFlERvHbplZ+mNouzy7boduvgUzbksGrbGMLJ2qO1GzWWVwV+GzOWKd3ss
-/98Gwoy5R8pjnkqUE2wP1iJFw0FjvUTKcYv/z6t3LLJ0CsoBAkEA+c7ixvsviQ3J
-s0INytCKU2bf8fqFQJi1VI82ukxNsujGTQ9upVSjuvqPvWyDvvTdrUBHqO+3qPut
-sEh01Q8aiQJBAMQKDJPVRu4ud3mwUfEavzL5EjqwG1k9VCNGYsT4FwtrHcxu1oP/
-pk6M3rIZukqomoEEnHWPMwhrK3fhBqi0OSECQQDr40VXege4FnH5OI2Hj4afHMyp
-VdQQXGMWFyopnzXblFz0lXb43cTCIiorR9XcMqNFHybLypkWE5o+lRzlt55pAkBQ
-P/zeF5Sts//cpL0mgdh7OVKpC6ZmZaCnwAx2rUhhuDu+kDDoYCLoTOps5fNI1LRK
-1GRoC3LMo3Jr5IYhUYWBAkBpCpN6k4JU/mszq98EojHerQNxk8sPqvQKUzTutohT
-1gLX9yepGayB/TtT2EEJDkWOlnTy/dvN6W3vzbJYz97x
------END RSA PRIVATE KEY-----
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/stub_sis/TSTAPP_standalone_Stub.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,47 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TSTAPP_standalone"}, (10), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+""-"!:\sys\bin\tstapp.exe"
+""-"!:\private\10003a3f\import\apps\tstapp_reg.rsc"
+""-"!:\resource\apps\tstapp_loc.rsc"
+""-"!:\resource\apps\tstapp_loc.r01"
+""-"!:\resource\apps\tstapp_loc.r02"
+""-"!:\resource\apps\tstapp_loc.r03"
+""-"!:\resource\apps\tstapp_loc.r04"
+""-"!:\resource\apps\tstapp_loc.r05"
+""-"!:\resource\apps\TSTAPP.rsc"
+""-"!:\resource\apps\tstapp.mbm"
+""-"!:\resource\apps\tstappview01.m01"
+""-"!:\resource\apps\tstappview02.k"
+""-"!:\resource\apps\tstappviewneg.xyz"
+""-"!:\resource\apps\tstappviewneg.mbm"
+""-"!:\resource\apps\tstappview"
+""-"!:\resource\apps\tstapp02.m02"
+""-"!:\resource\apps\tstappview01.m02"
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/stub_sis/app_CTRL2_stub.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"app_CTRL2"}, (0x13008ADE), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+""-"!:\sys\bin\app_ctrl2.exe"
+""-"!:\private\10003a3f\import\apps\App_CTRL2_reg.rsc"
\ No newline at end of file
--- a/appfw/apparchitecture/tef/testpkg/stub_sis/app_ctrl2_stub.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"app_CTRL2"}, (0x13008ADE), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-""-"!:\sys\bin\app_ctrl2.exe"
-""-"!:\private\10003a3f\import\apps\App_CTRL2_reg.rsc"
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/stub_sis/m_ctrl_v2_Stub.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,33 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"m_ctrl_v2"}, (0x13008AEE), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+""-"!:\sys\bin\m_ctrl.exe"
+""-"!:\private\10003a3f\import\apps\M_CTRL_reg.rsc"
+""-"!:\resource\apps\M_CTRL.rsc"
+""-"!:\resource\apps\M_CTRL_loc.rsc"
+
--- a/appfw/apparchitecture/tef/testpkg/stub_sis/m_ctrl_v2_stub.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"m_ctrl_v2"}, (0x13008AEE), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-""-"!:\sys\bin\m_ctrl.exe"
-""-"!:\private\10003a3f\import\apps\M_CTRL_reg.rsc"
-""-"!:\resource\apps\M_CTRL.rsc"
-""-"!:\resource\apps\M_CTRL_loc.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/stub_sis/tstapp_standalone_stub.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TSTAPP_standalone"}, (10), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-""-"!:\sys\bin\tstapp.exe"
-""-"!:\private\10003a3f\import\apps\tstapp_reg.rsc"
-""-"!:\resource\apps\tstapp_loc.rsc"
-""-"!:\resource\apps\tstapp_loc.r01"
-""-"!:\resource\apps\tstapp_loc.r02"
-""-"!:\resource\apps\tstapp_loc.r03"
-""-"!:\resource\apps\tstapp_loc.r04"
-""-"!:\resource\apps\tstapp_loc.r05"
-""-"!:\resource\apps\TSTAPP.rsc"
-""-"!:\resource\apps\tstapp.mbm"
-""-"!:\resource\apps\tstappview01.m01"
-""-"!:\resource\apps\tstappview02.k"
-""-"!:\resource\apps\tstappviewneg.xyz"
-""-"!:\resource\apps\tstappviewneg.mbm"
-""-"!:\resource\apps\tstappview"
-""-"!:\resource\apps\tstapp02.m02"
-""-"!:\resource\apps\tstappview01.m02"
-
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/Corrupted.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,29 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"Corrupted"}, (0x10004c5f), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\z\apparctest\Corrupted_reg.rsc"-"!:\private\10003a3f\import\apps\Corrupted_reg.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/CustomiseDefaultIconApp.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"CustomiseDefaultIconApp"}, (0x10208181), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\CustomiseDefaultIconApp.exe"-"!:\sys\bin\CustomiseDefaultIconApp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\CustomiseDefaultIconApp_reg.rsc"-"!:\private\10003a3f\import\apps\CustomiseDefaultIconApp_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\CustomiseDefaultIconApp_loc.rsc"-"!:\resource\apps\CustomiseDefaultIconApp_loc.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/EndTaskTestApp.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"EndTaskTestApp"}, (0x10282B33), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\endtasktestapp.exe"-"!:\sys\bin\endtasktestapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\EndTask_reg.rsc"-"!:\private\10003a3f\import\apps\EndTask_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\EndTaskTestApp.rsc"-"!:\resource\apps\EndTaskTestApp.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/ForceRegApp1.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"ForceRegApp1"}, (0xA0001000), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\forceregapp1.exe"-"!:\sys\bin\forceregapp1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\forceregapp1_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp1_reg.rsc"
+"\epoc32\data\z\apparctest\forcegtestapp1.frg1"-"!:\apparctest\forcegtestapp1.frg1", RI
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/ForceRegApp2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"ForceRegApp2"}, (0xA0001001), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\forceregapp2.exe"-"!:\sys\bin\forceregapp2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\forceregapp2_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp2_reg.rsc"
+"\epoc32\data\z\apparctest\forcegtestapp2.frg2"-"!:\apparctest\forcegtestapp2.frg2", RI, RW
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/ForceRegMultipleApps.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,35 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"ForceRegMultipleApps"}, (0xA0001001), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\forceregapp1.exe"-"!:\sys\bin\forceregapp1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\forceregapp1_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp1_reg.rsc"
+"\epoc32\data\z\apparctest\forcegtestapp1.frg1"-"!:\apparctest\forcegtestapp1.frg1", RI
+
+"\epoc32\release\winscw\udeb\forceregapp2.exe"-"!:\sys\bin\forceregapp2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\forceregapp2_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp2_reg.rsc"
+"\epoc32\data\z\apparctest\forcegtestapp2.frg2"-"!:\apparctest\forcegtestapp2.frg2", RI, RW
Binary file appfw/apparchitecture/tef/testpkg/winscw/ParentProcess.sis has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/SimpleApparcTestApp.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"SimpleApparcTestApp"}, (0x12008ACE), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\simpleapparctestapp.exe"-"!:\sys\bin\simpleapparctestapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\SimpleApparcTestApp_Reg.rsc"-"!:\private\10003a3f\import\apps\SimpleApparcTestApp_Reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\SimpleApparcTestApp.rsc"-"!:\resource\apps\SimpleApparcTestApp.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddableOnly_v2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddableOnly_v2"}, (0x10004c5C), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tappembeddableonly.dll"-"!:\sys\bin\tappembeddableonly.dll"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppEmbeddableOnly_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableOnly_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tappembeddableonly.rsc"-"!:\resource\plugins\tappembeddableonly.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddableUiNotStandAlone_v2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddableUiNotStandAlone_v2"}, (0x10004c5E), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tappembeddableuinotstandalone.dll"-"!:\sys\bin\tappembeddableuinotstandalone.dll"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppEmbeddableUiNotStandAlone_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableUiNotStandAlone_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tappembeddableuinotstandalone.rsc"-"!:\resource\plugins\tappembeddableuinotstandalone.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddableUiOrStandAlone_embedded.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddableUiOrStandAlone_embedded"}, (0x10004c5D), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tappembeddableuiorstandalone_embedded.dll"-"!:\sys\bin\tappembeddableuiorstandalone_embedded.dll"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tappembeddableuiorstandalone_embedded.rsc"-"!:\resource\plugins\tappembeddableuiorstandalone_embedded.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddableUiOrStandalone_standalone.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddableUiOrStandalone_standalone"}, (0x10004c4A), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tappembeddableuiorstandalone.exe"-"!:\sys\bin\tappembeddableuiorstandalone.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppEmbeddableUiOrStandAlone_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableUiOrStandAlone_reg.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddable_embedded.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddable_embedded"}, (0x10004c5B), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tappembeddable_embedded.dll"-"!:\sys\bin\tappembeddable_embedded.dll"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tappembeddable_embedded.rsc"-"!:\resource\plugins\tappembeddable_embedded.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddable_standalone.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddable_standalone"}, (0x10004c48), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tappembeddable.exe"-"!:\sys\bin\tappembeddable.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppEmbeddable_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddable_reg.rsc"
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TAppInstall.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppInstall"}, (0x10207f7d), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\testappinstall.exe"-"!:\sys\bin\testappinstall.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestAppInstall_reg.rsc"-"!:\apparctest\TestAppInstall_reg.rsc"
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TAppNotEmbeddable_v2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppNotEmbeddable_v2"}, (0x10004c47), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tappnotembeddable.exe"-"!:\sys\bin\tappnotembeddable.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppNotEmbeddable_reg.rsc"-"!:\private\10003a3f\import\apps\TAppNotEmbeddable_reg.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TApparcTestApp.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,34 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TApparcTestApp"}, (0x100048F3), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tapparctestapp.exe"-"!:\sys\bin\tapparctestapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tapparctestapp_reg.rsc"-"!:\private\10003a3f\import\apps\tapparctestapp_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tapparctestapp.rsc"-"!:\resource\apps\tapparctestapp.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tapparctestapp_loc.rsc"-"!:\resource\apps\tapparctestapp_loc.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\svg_icon.svg"-"!:\resource\apps\svg_icon.svg"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TCtrlPnlApp.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TCtrlPnlApp"}, (0x10207f79), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\TCtrlPnlApp.exe"-"!:\sys\bin\TCtrlPnlApp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TCtrlPnlApp_reg.rsc"-"!:\private\10003a3f\import\apps\TCtrlPnlApp_reg.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TNNApp1.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TNNApp1"}, (0x10207f92), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tnnapp1.exe"-"!:\sys\bin\tnnapp1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TNNApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TNNApp1_reg.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TNNApp2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TNNApp2"}, (0x10207f94), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tnnapp2.exe"-"!:\sys\bin\tnnapp2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TNNApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TNNApp2_reg.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TRApaLsSessionStartAppTestApp_v2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TRApaLsSessionStartAppTestApp_v2"}, (0x10004c4f), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\trapalssessionstartapptestapp.exe"-"!:\sys\bin\trapalssessionstartapptestapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TRApaLsSessionStartAppTestApp_reg.rsc"-"!:\private\10003a3f\import\apps\TRApaLsSessionStartAppTestApp_reg.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TSTAPP_standalone.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,47 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TSTAPP_standalone"}, (10), 1, 0, 0, TYPE=SA, RU
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tstapp.exe"-"!:\sys\bin\tstapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_reg.rsc"-"!:\private\10003a3f\import\apps\tstapp_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.rsc"-"!:\resource\apps\tstapp_loc.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r01"-"!:\resource\apps\tstapp_loc.r01"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r02"-"!:\resource\apps\tstapp_loc.r02"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r03"-"!:\resource\apps\tstapp_loc.r03"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r04"-"!:\resource\apps\tstapp_loc.r04"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r05"-"!:\resource\apps\tstapp_loc.r05"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TSTAPP.rsc"-"!:\resource\apps\TSTAPP.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp.mbm"-"!:\resource\apps\tstapp.mbm"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappview01.m01"-"!:\resource\apps\tstappview01.m01"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappview02.k"-"!:\resource\apps\tstappview02.k"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappviewneg.xyz"-"!:\resource\apps\tstappviewneg.xyz"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappviewneg.mbm"-"!:\resource\apps\tstappviewneg.mbm"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappview"-"!:\resource\apps\tstappview"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp02.m02"-"!:\resource\apps\tstapp02.m02"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappview01.m02"-"!:\resource\apps\tstappview01.m02"
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TStartDocApp_v2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TStartDocApp_v2"}, (0x10004c4d), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tstartdocapp.exe"-"!:\sys\bin\tstartdocapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TStartDocApp_reg.rsc"-"!:\private\10003a3f\import\apps\TStartDocApp_reg.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/T_DataPrioritySystem1.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_DataPrioritySystem1"}, (0x10207f7b), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\t_dataprioritysystem1.exe"-"!:\sys\bin\t_dataprioritysystem1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem1_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem1_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem1_loc.rsc"-"!:\resource\apps\T_DataPrioritySystem1_loc.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/T_DataPrioritySystem2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_DataPrioritySystem2"}, (0x10207f7c), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\t_dataprioritysystem2.exe"-"!:\sys\bin\t_dataprioritysystem2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem2_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem2_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem2_loc.rsc"-"!:\resource\apps\T_DataPrioritySystem2_loc.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/T_DataPrioritySystem3.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_DataPrioritySystem3"}, (0x10207f7f), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\T_DataPrioritySystem3.exe"-"!:\sys\bin\T_DataPrioritySystem3.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem3_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem3_reg.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/T_EnvSlots.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_EnvSlots"}, (0x102032AB), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\t_envslots.exe"-"!:\sys\bin\t_envslots.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_EnvSlots_reg.rsc"-"!:\private\10003a3f\import\apps\T_EnvSlots_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_EnvSlots_loc.rsc"-"!:\resource\apps\T_EnvSlots_loc.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/T_groupname.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_groupname"}, (0x10208185), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\T_groupname.exe"-"!:\sys\bin\T_groupname.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupname_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupname_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupname_loc.rsc"-"!:\resource\apps\T_groupname_loc.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/T_groupname_ver1.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_groupname_ver1"}, (0x10208183), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\T_groupname_ver1.exe"-"!:\sys\bin\T_groupname_ver1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever1_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever1_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever1_loc.rsc"-"!:\resource\apps\T_groupnamever1_loc.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/T_groupname_ver2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_groupname_ver2"}, (0x10208184), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\T_groupname_ver2.exe"-"!:\sys\bin\T_groupname_ver2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever2_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever2_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever2_loc.rsc"-"!:\resource\apps\T_groupnamever2_loc.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TestTrustedPriorityApp1.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestTrustedPriorityApp1"}, (0x10207f8D), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\TestTrustedPriorityApp1.exe"-"!:\sys\bin\TestTrustedPriorityApp1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestTrustedPriorityApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TestTrustedPriorityApp1_reg.rsc"
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TestTrustedPriorityApp2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestTrustedPriorityApp2"}, (0x10207f8F), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\TestTrustedPriorityApp2.exe"-"!:\sys\bin\TestTrustedPriorityApp2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestTrustedPriorityApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TestTrustedPriorityApp2_reg.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TestUnTrustedPriorityApp1.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestUnTrustedPriorityApp1"}, (0x10207f8C), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\TestUnTrustedPriorityApp1.exe"-"!:\sys\bin\TestUnTrustedPriorityApp1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestUnTrustedPriorityApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TestUnTrustedPriorityApp1_reg.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TestUnTrustedPriorityApp2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestUnTrustedPriorityApp2"}, (0xA3010010), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\TestUnTrustedPriorityApp2.exe"-"!:\sys\bin\TestUnTrustedPriorityApp2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestUnTrustedPriorityApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TestUnTrustedPriorityApp2_reg.rsc"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/UnProctectedUidApp.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"UnProctectedUidApp"}, (0xA0001C5E), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\unproctecteduidapp.exe"-"!:\sys\bin\unproctecteduidapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\UnProctectedUidApp_reg.rsc"-"!:\private\10003a3f\import\apps\UnProctectedUidApp_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\UnProctectedUidApp.rsc"-"!:\resource\apps\UnProctectedUidApp.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/app_CTRL.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,34 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"app_CTRL"}, (0x13008ACE), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\app_ctrl.exe"-"!:\sys\bin\app_ctrl.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\App_CTRL_reg.rsc"-"!:\private\10003a3f\import\apps\App_CTRL_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\App_CTRL.rsc"-"!:\resource\apps\App_CTRL.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\App_ctrl_loc.rsc"-"!:\resource\apps\App_ctrl_loc.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\APP_CTRL.MBM"-"!:\resource\apps\APP_CTRL.MBM"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/app_CTRL2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"app_CTRL2"}, (0x13008ADE), 1, 0, 0, TYPE=SA, RU
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\app_ctrl2.exe"-"!:\sys\bin\app_ctrl2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\App_CTRL2_reg.rsc"-"!:\private\10003a3f\import\apps\App_CTRL2_reg.rsc"
\ No newline at end of file
--- a/appfw/apparchitecture/tef/testpkg/winscw/app_ctrl.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"app_CTRL"}, (0x13008ACE), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\app_ctrl.exe"-"!:\sys\bin\app_ctrl.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\App_CTRL_reg.rsc"-"!:\private\10003a3f\import\apps\App_CTRL_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\App_CTRL.rsc"-"!:\resource\apps\App_CTRL.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\App_ctrl_loc.rsc"-"!:\resource\apps\App_ctrl_loc.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\APP_CTRL.MBM"-"!:\resource\apps\APP_CTRL.MBM"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/app_ctrl2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"app_CTRL2"}, (0x13008ADE), 1, 0, 0, TYPE=SA, RU
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\app_ctrl2.exe"-"!:\sys\bin\app_ctrl2.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\App_CTRL2_reg.rsc"-"!:\private\10003a3f\import\apps\App_CTRL2_reg.rsc"
\ No newline at end of file
--- a/appfw/apparchitecture/tef/testpkg/winscw/corrupted.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"Corrupted"}, (0x10004c5f), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\z\apparctest\Corrupted_reg.rsc"-"!:\private\10003a3f\import\apps\Corrupted_reg.rsc"
--- a/appfw/apparchitecture/tef/testpkg/winscw/customisedefaulticonapp.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"CustomiseDefaultIconApp"}, (0x10208181), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\CustomiseDefaultIconApp.exe"-"!:\sys\bin\CustomiseDefaultIconApp.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\CustomiseDefaultIconApp_reg.rsc"-"!:\private\10003a3f\import\apps\CustomiseDefaultIconApp_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\CustomiseDefaultIconApp_loc.rsc"-"!:\resource\apps\CustomiseDefaultIconApp_loc.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/endtasktestapp.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"EndTaskTestApp"}, (0x10282B33), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\endtasktestapp.exe"-"!:\sys\bin\endtasktestapp.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\EndTask_reg.rsc"-"!:\private\10003a3f\import\apps\EndTask_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\EndTaskTestApp.rsc"-"!:\resource\apps\EndTaskTestApp.rsc"
--- a/appfw/apparchitecture/tef/testpkg/winscw/forceregapp1.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"ForceRegApp1"}, (0xA0001000), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\forceregapp1.exe"-"!:\sys\bin\forceregapp1.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\forceregapp1_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp1_reg.rsc"
-"\epoc32\data\z\apparctest\forcegtestapp1.frg1"-"!:\apparctest\forcegtestapp1.frg1", RI
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/forceregapp2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"ForceRegApp2"}, (0xA0001001), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\forceregapp2.exe"-"!:\sys\bin\forceregapp2.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\forceregapp2_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp2_reg.rsc"
-"\epoc32\data\z\apparctest\forcegtestapp2.frg2"-"!:\apparctest\forcegtestapp2.frg2", RI, RW
--- a/appfw/apparchitecture/tef/testpkg/winscw/forceregmultipleapps.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"ForceRegMultipleApps"}, (0xA0001001), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\forceregapp1.exe"-"!:\sys\bin\forceregapp1.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\forceregapp1_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp1_reg.rsc"
-"\epoc32\data\z\apparctest\forcegtestapp1.frg1"-"!:\apparctest\forcegtestapp1.frg1", RI
-
-"\epoc32\release\winscw\udeb\forceregapp2.exe"-"!:\sys\bin\forceregapp2.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\forceregapp2_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp2_reg.rsc"
-"\epoc32\data\z\apparctest\forcegtestapp2.frg2"-"!:\apparctest\forcegtestapp2.frg2", RI, RW
Binary file appfw/apparchitecture/tef/testpkg/winscw/parentprocess.sis has changed
--- a/appfw/apparchitecture/tef/testpkg/winscw/simpleapparctestapp.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"SimpleApparcTestApp"}, (0x12008ACE), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\simpleapparctestapp.exe"-"!:\sys\bin\simpleapparctestapp.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\SimpleApparcTestApp_Reg.rsc"-"!:\private\10003a3f\import\apps\SimpleApparcTestApp_Reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\SimpleApparcTestApp.rsc"-"!:\resource\apps\SimpleApparcTestApp.rsc"
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/tRuleBasedApp1.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tRuleBasedApp1"}, (0X1020D6FC), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\trulebasedapp1.exe"-"!:\sys\bin\trulebasedapp1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp1_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp1_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp1.rsc"-"!:\resource\apps\tRuleBasedApp1.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/tRuleBasedApp2.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tRuleBasedApp2"}, (0X1020D6FD), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\trulebasedapp2.exe"-"!:\sys\bin\trulebasedapp2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp2_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp2_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp2.rsc"-"!:\resource\apps\tRuleBasedApp2.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/tRuleBasedApp3.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tRuleBasedApp3"}, (0X1020D6FE), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\trulebasedapp3.exe"-"!:\sys\bin\trulebasedapp3.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp3_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp3_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp3.rsc"-"!:\resource\apps\tRuleBasedApp3.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/tRuleBasedApp4.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tRuleBasedApp4"}, (0x10210F77), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\trulebasedapp4.exe"-"!:\sys\bin\trulebasedapp4.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp4_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp4_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp4.rsc"-"!:\resource\apps\tRuleBasedApp4.rsc"
+
--- a/appfw/apparchitecture/tef/testpkg/winscw/t_dataprioritysystem1.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"T_DataPrioritySystem1"}, (0x10207f7b), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\t_dataprioritysystem1.exe"-"!:\sys\bin\t_dataprioritysystem1.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem1_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem1_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem1_loc.rsc"-"!:\resource\apps\T_DataPrioritySystem1_loc.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/t_dataprioritysystem2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"T_DataPrioritySystem2"}, (0x10207f7c), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\t_dataprioritysystem2.exe"-"!:\sys\bin\t_dataprioritysystem2.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem2_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem2_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem2_loc.rsc"-"!:\resource\apps\T_DataPrioritySystem2_loc.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/t_dataprioritysystem3.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"T_DataPrioritySystem3"}, (0x10207f7f), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\T_DataPrioritySystem3.exe"-"!:\sys\bin\T_DataPrioritySystem3.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem3_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem3_reg.rsc"
--- a/appfw/apparchitecture/tef/testpkg/winscw/t_envslots.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"T_EnvSlots"}, (0x102032AB), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\t_envslots.exe"-"!:\sys\bin\t_envslots.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_EnvSlots_reg.rsc"-"!:\private\10003a3f\import\apps\T_EnvSlots_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_EnvSlots_loc.rsc"-"!:\resource\apps\T_EnvSlots_loc.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/t_groupname.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"T_groupname"}, (0x10208185), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\T_groupname.exe"-"!:\sys\bin\T_groupname.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupname_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupname_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupname_loc.rsc"-"!:\resource\apps\T_groupname_loc.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/t_groupname_ver1.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"T_groupname_ver1"}, (0x10208183), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\T_groupname_ver1.exe"-"!:\sys\bin\T_groupname_ver1.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever1_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever1_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever1_loc.rsc"-"!:\resource\apps\T_groupnamever1_loc.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/t_groupname_ver2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"T_groupname_ver2"}, (0x10208184), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\T_groupname_ver2.exe"-"!:\sys\bin\T_groupname_ver2.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever2_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever2_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever2_loc.rsc"-"!:\resource\apps\T_groupnamever2_loc.rsc"
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/t_winchainChild.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"t_winchainChild"}, (0X10009e9f), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\t_winchainchild.exe"-"!:\sys\bin\t_winchainchild.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\t_winchainChild_reg.rsc"-"!:\private\10003a3f\import\apps\t_winchainChild_reg.rsc"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/t_winchainLaunch.pkg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"t_winchainLaunch"}, (0X10009f9a), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\t_winchainlaunch.exe"-"!:\sys\bin\t_winchainlaunch.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\t_winchainLaunch_reg.rsc"-"!:\private\10003a3f\import\apps\t_winchainLaunch_reg.rsc"
+
--- a/appfw/apparchitecture/tef/testpkg/winscw/t_winchainchild.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"t_winchainChild"}, (0X10009e9f), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\t_winchainchild.exe"-"!:\sys\bin\t_winchainchild.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\t_winchainChild_reg.rsc"-"!:\private\10003a3f\import\apps\t_winchainChild_reg.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/t_winchainlaunch.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"t_winchainLaunch"}, (0X10009f9a), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\t_winchainlaunch.exe"-"!:\sys\bin\t_winchainlaunch.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\t_winchainLaunch_reg.rsc"-"!:\private\10003a3f\import\apps\t_winchainLaunch_reg.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/tapparctestapp.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TApparcTestApp"}, (0x100048F3), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\tapparctestapp.exe"-"!:\sys\bin\tapparctestapp.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tapparctestapp_reg.rsc"-"!:\private\10003a3f\import\apps\tapparctestapp_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tapparctestapp.rsc"-"!:\resource\apps\tapparctestapp.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tapparctestapp_loc.rsc"-"!:\resource\apps\tapparctestapp_loc.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\svg_icon.svg"-"!:\resource\apps\svg_icon.svg"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/tappembeddable_embedded.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TAppEmbeddable_embedded"}, (0x10004c5B), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\tappembeddable_embedded.dll"-"!:\sys\bin\tappembeddable_embedded.dll"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tappembeddable_embedded.rsc"-"!:\resource\plugins\tappembeddable_embedded.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/tappembeddable_standalone.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TAppEmbeddable_standalone"}, (0x10004c48), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\tappembeddable.exe"-"!:\sys\bin\tappembeddable.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppEmbeddable_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddable_reg.rsc"
-
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/tappembeddableonly_v2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TAppEmbeddableOnly_v2"}, (0x10004c5C), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\tappembeddableonly.dll"-"!:\sys\bin\tappembeddableonly.dll"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppEmbeddableOnly_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableOnly_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tappembeddableonly.rsc"-"!:\resource\plugins\tappembeddableonly.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/tappembeddableuinotstandalone_v2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TAppEmbeddableUiNotStandAlone_v2"}, (0x10004c5E), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\tappembeddableuinotstandalone.dll"-"!:\sys\bin\tappembeddableuinotstandalone.dll"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppEmbeddableUiNotStandAlone_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableUiNotStandAlone_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tappembeddableuinotstandalone.rsc"-"!:\resource\plugins\tappembeddableuinotstandalone.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/tappembeddableuiorstandalone_embedded.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TAppEmbeddableUiOrStandAlone_embedded"}, (0x10004c5D), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\tappembeddableuiorstandalone_embedded.dll"-"!:\sys\bin\tappembeddableuiorstandalone_embedded.dll"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tappembeddableuiorstandalone_embedded.rsc"-"!:\resource\plugins\tappembeddableuiorstandalone_embedded.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/tappembeddableuiorstandalone_standalone.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TAppEmbeddableUiOrStandalone_standalone"}, (0x10004c4A), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\tappembeddableuiorstandalone.exe"-"!:\sys\bin\tappembeddableuiorstandalone.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppEmbeddableUiOrStandAlone_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableUiOrStandAlone_reg.rsc"
--- a/appfw/apparchitecture/tef/testpkg/winscw/tappinstall.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TAppInstall"}, (0x10207f7d), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\testappinstall.exe"-"!:\sys\bin\testappinstall.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestAppInstall_reg.rsc"-"!:\apparctest\TestAppInstall_reg.rsc"
\ No newline at end of file
--- a/appfw/apparchitecture/tef/testpkg/winscw/tappnotembeddable_v2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TAppNotEmbeddable_v2"}, (0x10004c47), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\tappnotembeddable.exe"-"!:\sys\bin\tappnotembeddable.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppNotEmbeddable_reg.rsc"-"!:\private\10003a3f\import\apps\TAppNotEmbeddable_reg.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/tctrlpnlapp.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TCtrlPnlApp"}, (0x10207f79), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\TCtrlPnlApp.exe"-"!:\sys\bin\TCtrlPnlApp.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\TCtrlPnlApp_reg.rsc"-"!:\private\10003a3f\import\apps\TCtrlPnlApp_reg.rsc"
--- a/appfw/apparchitecture/tef/testpkg/winscw/testtrustedpriorityapp1.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TestTrustedPriorityApp1"}, (0x10207f8D), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\TestTrustedPriorityApp1.exe"-"!:\sys\bin\TestTrustedPriorityApp1.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestTrustedPriorityApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TestTrustedPriorityApp1_reg.rsc"
-
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/testtrustedpriorityapp2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TestTrustedPriorityApp2"}, (0x10207f8F), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\TestTrustedPriorityApp2.exe"-"!:\sys\bin\TestTrustedPriorityApp2.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestTrustedPriorityApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TestTrustedPriorityApp2_reg.rsc"
--- a/appfw/apparchitecture/tef/testpkg/winscw/testuntrustedpriorityapp1.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TestUnTrustedPriorityApp1"}, (0x10207f8C), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\TestUnTrustedPriorityApp1.exe"-"!:\sys\bin\TestUnTrustedPriorityApp1.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestUnTrustedPriorityApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TestUnTrustedPriorityApp1_reg.rsc"
--- a/appfw/apparchitecture/tef/testpkg/winscw/testuntrustedpriorityapp2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TestUnTrustedPriorityApp2"}, (0xA3010010), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\TestUnTrustedPriorityApp2.exe"-"!:\sys\bin\TestUnTrustedPriorityApp2.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestUnTrustedPriorityApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TestUnTrustedPriorityApp2_reg.rsc"
--- a/appfw/apparchitecture/tef/testpkg/winscw/tnnapp1.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TNNApp1"}, (0x10207f92), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\tnnapp1.exe"-"!:\sys\bin\tnnapp1.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\TNNApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TNNApp1_reg.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/tnnapp2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TNNApp2"}, (0x10207f94), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\tnnapp2.exe"-"!:\sys\bin\tnnapp2.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\TNNApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TNNApp2_reg.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/trapalssessionstartapptestapp_v2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TRApaLsSessionStartAppTestApp_v2"}, (0x10004c4f), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\trapalssessionstartapptestapp.exe"-"!:\sys\bin\trapalssessionstartapptestapp.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\TRApaLsSessionStartAppTestApp_reg.rsc"-"!:\private\10003a3f\import\apps\TRApaLsSessionStartAppTestApp_reg.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/trulebasedapp1.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"tRuleBasedApp1"}, (0X1020D6FC), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\trulebasedapp1.exe"-"!:\sys\bin\trulebasedapp1.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp1_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp1_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp1.rsc"-"!:\resource\apps\tRuleBasedApp1.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/trulebasedapp2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"tRuleBasedApp2"}, (0X1020D6FD), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\trulebasedapp2.exe"-"!:\sys\bin\trulebasedapp2.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp2_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp2_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp2.rsc"-"!:\resource\apps\tRuleBasedApp2.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/trulebasedapp3.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"tRuleBasedApp3"}, (0X1020D6FE), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\trulebasedapp3.exe"-"!:\sys\bin\trulebasedapp3.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp3_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp3_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp3.rsc"-"!:\resource\apps\tRuleBasedApp3.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/trulebasedapp4.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"tRuleBasedApp4"}, (0x10210F77), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\trulebasedapp4.exe"-"!:\sys\bin\trulebasedapp4.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp4_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp4_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp4.rsc"-"!:\resource\apps\tRuleBasedApp4.rsc"
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/tstapp_standalone.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TSTAPP_standalone"}, (10), 1, 0, 0, TYPE=SA, RU
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\tstapp.exe"-"!:\sys\bin\tstapp.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_reg.rsc"-"!:\private\10003a3f\import\apps\tstapp_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.rsc"-"!:\resource\apps\tstapp_loc.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r01"-"!:\resource\apps\tstapp_loc.r01"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r02"-"!:\resource\apps\tstapp_loc.r02"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r03"-"!:\resource\apps\tstapp_loc.r03"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r04"-"!:\resource\apps\tstapp_loc.r04"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r05"-"!:\resource\apps\tstapp_loc.r05"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\TSTAPP.rsc"-"!:\resource\apps\TSTAPP.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp.mbm"-"!:\resource\apps\tstapp.mbm"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappview01.m01"-"!:\resource\apps\tstappview01.m01"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappview02.k"-"!:\resource\apps\tstappview02.k"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappviewneg.xyz"-"!:\resource\apps\tstappviewneg.xyz"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappviewneg.mbm"-"!:\resource\apps\tstappviewneg.mbm"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappview"-"!:\resource\apps\tstappview"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp02.m02"-"!:\resource\apps\tstapp02.m02"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappview01.m02"-"!:\resource\apps\tstappview01.m02"
-
-
--- a/appfw/apparchitecture/tef/testpkg/winscw/tstartdocapp_v2.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"TStartDocApp_v2"}, (0x10004c4d), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\tstartdocapp.exe"-"!:\sys\bin\tstartdocapp.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\TStartDocApp_reg.rsc"-"!:\private\10003a3f\import\apps\TStartDocApp_reg.rsc"
--- a/appfw/apparchitecture/tef/testpkg/winscw/unproctecteduidapp.pkg	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-;
-; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-; All rights reserved.
-; This component and the accompanying materials are made available
-; under the terms of the License "Eclipse Public License v1.0"
-; which accompanies this distribution, and is available
-; at the URL "http://www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description:
-;
-
-
-;Languages
-&EN
-
-;Header
-; SA = Symbian Application
-; RU = Rom Upgrade
-#{"UnProctectedUidApp"}, (0xA0001C5E), 1, 0, 0, TYPE=SA
-
-%{"Nokia India Pvt Ltd"}
-:"Nokia India Pvt Ltd"
-
-"\epoc32\release\winscw\udeb\unproctecteduidapp.exe"-"!:\sys\bin\unproctecteduidapp.exe"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\UnProctectedUidApp_reg.rsc"-"!:\private\10003a3f\import\apps\UnProctectedUidApp_reg.rsc"
-"\epoc32\release\winscw\udeb\z\apparctestregfiles\UnProctectedUidApp.rsc"-"!:\resource\apps\UnProctectedUidApp.rsc"
-
--- a/appfw/apparchitecture/tef/testtrustedpriorityapp1.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @internalComponent - Internal Symbian test code
-*/
-
-TARGET        	TestTrustedPriorityApp1.exe
-TARGETTYPE    	exe
-UID           	0x100039CE 0x10207f8D
-VENDORID  	0x70000001
-
-USERINCLUDE   	.
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
-//SYSTEMINCLUDE   /epoc32/include/techview
-
-// Application exe registration resource file
-resource  	TestTrustedPriorityApp1_reg.rss
-start resource 	TestTrustedPriorityApp1_reg.rss
-targetpath 	/apparctestregfiles
-lang		sc
-end
-
-SOURCEPATH		../tef
-// SOURCE T_RApaLsSessionStep.cpp
-SOURCE	app_CTRL.CPP
-
-LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
-LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
-LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
-LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
-LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
-LIBRARY		aplist.lib
-LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
-
-SMPSAFE
--- a/appfw/apparchitecture/tef/testtrustedpriorityapp2.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @internalComponent - Internal Symbian test code
-*/
-
-TARGET        	TestTrustedPriorityApp2.exe
-TARGETTYPE    	exe
-UID           	0x100039CE 0x10207f8F
-VENDORID  	0x70000001
-
-USERINCLUDE   	.
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
-//SYSTEMINCLUDE   /epoc32/include/techview
-
-// Application exe registration resource file
-resource  	TestTrustedPriorityApp2_reg.rss
-start resource 	TestTrustedPriorityApp2_reg.rss
-targetpath 	/apparctestregfiles
-lang		sc
-end
-
-SOURCEPATH		../tef
-// SOURCE T_RApaLsSessionStep.cpp T_DataTypeMappingWithSid1.cpp
-SOURCE	app_CTRL.CPP
-
-LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
-LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
-LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
-LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
-LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
-LIBRARY		aplist.lib
-LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
-
-SMPSAFE
--- a/appfw/apparchitecture/tef/testuntrustedpriorityapp1.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @internalComponent - Internal Symbian test code
-*/
-
-TARGET        	TestUnTrustedPriorityApp1.exe
-TARGETTYPE    	exe
-UID           	0x100039CE 0x10207f8C
-VENDORID  	0x70000001
-
-USERINCLUDE   	.
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
-//SYSTEMINCLUDE   /epoc32/include/techview
-
-// Application exe registration resource file
-resource  	TestUnTrustedPriorityApp1_reg.rss
-start resource 	TestUnTrustedPriorityApp1_reg.rss
-targetpath 	/apparctestregfiles
-lang		sc
-end
-
-SOURCEPATH		../tef
-// SOURCE T_RApaLsSessionStep.cpp T_DataTypeMappingWithSid1.cpp
-SOURCE	app_CTRL.CPP
-
-LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
-LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
-LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
-LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
-LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
-LIBRARY		aplist.lib
-LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
-
-SMPSAFE
--- a/appfw/apparchitecture/tef/testuntrustedpriorityapp2.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @internalComponent - Internal Symbian test code
-*/
-
-TARGET        	TestUnTrustedPriorityApp2.exe
-TARGETTYPE    	exe
-UID           	0x100039CE 0xA3010010
-VENDORID  	0x70000001
-
-USERINCLUDE   	.
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
-//SYSTEMINCLUDE   /epoc32/include/techview
-
-// Application exe registration resource file
-resource  	TestUnTrustedPriorityApp2_reg.rss
-start resource 	TestUnTrustedPriorityApp2_reg.rss
-targetpath 	/apparctestregfiles
-lang		sc
-end
-
-SOURCEPATH		../tef
-// SOURCE T_RApaLsSessionStep.cpp T_DataTypeMappingWithSid1.cpp
-SOURCE	app_CTRL.CPP
-
-LIBRARY		cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
-LIBRARY		testexecuteutils.lib  testexecutelogclient.lib
-LIBRARY		apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
-LIBRARY     	apfile.lib apgrfx.lib  bafl.lib apmime.lib apserv.lib
-LIBRARY		eikcore.lib appfwk_test_utils.lib serviceregistry.lib
-LIBRARY		aplist.lib
-LIBRARY     ticonloaderandiconarrayforleaks.lib centralrepository.lib
-
-SMPSAFE
--- a/appfw/apparchitecture/tef/tssaac/tssaac.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ b/appfw/apparchitecture/tef/tssaac/tssaac.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -41,7 +41,7 @@
 #else
 // startup with tssaac application for hardware
 START RESOURCE	tssaac_hardware.rss
-TARGETPATH		\private\10205C44
+TARGETPATH		/private/10205C44
 END
 #endif
 
--- a/appfw/apparchitecture/tef/tstapp_standalone_stub.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @test
- @internalComponent - Internal Symbian test code 
-*/
-
-
-
- TARGET        	tstapp.exe
- TARGETTYPE    	exe
- TARGETPATH		/sys/bin
-
-CAPABILITY 	All -Tcb
-
-UID           	0x100039CE 10 //the original UID
-VENDORID 		0x70000001 
-EPOCSTACKSIZE 	0x5000
-
-SOURCEPATH    	.
-SOURCE        	TSTAPP_standalone.CPP
-
-USERINCLUDE   	.
-
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
-//SYSTEMINCLUDE 	/epoc32/include/techview
-//systeminclude 	/epoc32/include/ecom
-
-
-//reg added for Datacaging
-START RESOURCE	tstapp_reg.rss
-TARGETPATH		/private/10003a3f/import/apps
-END
-
-START RESOURCE 	TSTAPP.rss
-TARGETPATH 		/resource/apps
-END
-
-START RESOURCE 	tstapp_loc.rss
-TARGETPATH 		/resource/apps
-LANG 			SC 01 02 03 04 05
-END
-
-START BITMAP 	tstapp.mbm
-TARGETPATH 		/resource/apps
-SOURCEPATH 		../tdatasrc
-SOURCE 			c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
-SOURCE 			c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
-SOURCE 			c8,1 tstappicon40x55.bmp tstappicon40x55m.bmp
-
-END
-
-START BITMAP 	tstapp02.m02
-TARGETPATH 		/resource/apps
-SOURCEPATH 		../tdatasrc
-SOURCE 			c8,1 def25.bmp def25m.bmp def25.bmp def25m.bmp def50.bmp def50m.bmp
-END
-
-START BITMAP 	tstappview01.m01
-TARGETPATH 		/resource/apps
-SOURCEPATH 		../tdatasrc
-SOURCE 			c8,1 def25.bmp def25m.bmp def35.bmp def35m.bmp def50.bmp def50m.bmp
-END
-
-START BITMAP 	tstappview02.k
-TARGETPATH 		/resource/apps
-SOURCEPATH 		../tdatasrc
-SOURCE 			c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
-SOURCE 			c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
-SOURCE 			c8,1 tstappicon40x55.bmp tstappicon40x55m.bmp
-END
-
-START BITMAP 	tstappview01.m02
-TARGETPATH 		/resource/apps
-SOURCEPATH 		../tdatasrc
-SOURCE 			c8,1 def25.bmp def25m.bmp def35.bmp def35m.bmp def50.bmp def50m.bmp
-END
-
-START BITMAP 	tstappview
-TARGETPATH 		/resource/apps
-SOURCEPATH 		../tdatasrc
-SOURCE 			c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
-SOURCE 			c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
-SOURCE 			c8,1 tstappicon40x55.bmp tstappicon40x55m.bmp
-END
-
-LIBRARY 	euser.lib apparc.lib eikcore.lib cone.lib  
-
-SMPSAFE
--- a/appfw/apparchitecture/tef/zerosizedicontestapp.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ b/appfw/apparchitecture/tef/zerosizedicontestapp.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -14,6 +14,8 @@
 // zerosizedicontestapp.mmp
 //
 
+#include <platform_paths.hrh>
+
 target		zerosizedicontestapp.exe
 TARGETTYPE 	exe
 	
@@ -27,7 +29,7 @@
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 USERINCLUDE   	.
-SYSTEMINCLUDE 	/epoc32/include
+MW_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE 	/epoc32/include/techview
 
 // Application exe specific resource which is localised to the application
--- a/appfw/uiftestfw/group/BLD.INF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-// test code only
-
-PRJ_MMPFILES
-// test code only
-
-PRJ_TESTMMPFILES
-../group/appfwk_test_AppUi.mmp
-../group/appfwk_test_utils.mmp
-../group/appfwk_test_utils_server.mmp
-../group/appfwk_test_dummytest.mmp
-
-PRJ_TESTEXPORTS
-// TestFramework IBY files
-../rom/afss_test.iby 				/epoc32/rom/include/afss_test.iby
-../rom/appfwk_test.iby 				/epoc32/rom/include/appfwk_test.iby
-../rom/appfwk_test_framework.iby 		/epoc32/rom/include/appfwk_test_framework.iby
-
-// TestFramework INCLUDE files
-../inc/appfwk_test.h 				MW_LAYER_PLATFORM_EXPORT_PATH(test/appfwk_test.h)
-../inc/appfwk_test_AppUi.h			MW_LAYER_PLATFORM_EXPORT_PATH(test/appfwk_test_appui.h)
-../inc/appfwk_test_utils.h 			MW_LAYER_PLATFORM_EXPORT_PATH(test/appfwk_test_utils.h)
-../inc/appfwk_tmsteststep.h 		MW_LAYER_PLATFORM_EXPORT_PATH(test/appfwk_tmsteststep.h)
-
-#if defined(SYMBIAN_WSERV_AND_CONE_MULTIPLE_SCREENS)
-../group/mulscreens.ini							/epoc32/data/z/appfwk/test/mulscreens.ini
-../group/mulscreens_changetracking.ini					/epoc32/data/z/appfwk/test/mulscreens_changetracking.ini
-../scripts/hardware/mulscreens_hw_test.cmd		/epoc32/data/z/appfwk/test/mulscreens_hw_test.cmd
-../group/mulscreens.ini							/epoc32/release/winscw/udeb/z/appfwk/test/mulscreens.ini
-../group/mulscreens.ini							/epoc32/release/winscw/urel/z/appfwk/test/mulscreens.ini
-../group/mulscreens_changetracking.ini					/epoc32/release/winscw/udeb/z/appfwk/test/mulscreens_changetracking.ini
-../group/mulscreens_changetracking.ini					/epoc32/release/winscw/urel/z/appfwk/test/mulscreens_changetracking.ini
-
-// Here we export the same script 3 times: first 2 for BATS, last 1 for Mistral.
-../scripts/emulator/mulscreens_sw_test.cmd		/epoc32/release/winscw/udeb/z/appfwk/test/mulscreens_sw_test.cmd
-../scripts/emulator/mulscreens_sw_test.cmd		/epoc32/release/winscw/urel/z/appfwk/test/mulscreens_sw_test.cmd
-../scripts/emulator/mulscreens_sw_test.cmd		/epoc32/data/z/appfwk/test/mulscreens_sw_test.cmd
-
-#endif
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/uiftestfw/group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,57 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+// test code only
+
+PRJ_MMPFILES
+// test code only
+
+PRJ_TESTMMPFILES
+../group/appfwk_test_AppUi.mmp
+../group/appfwk_test_utils.mmp
+../group/appfwk_test_utils_server.mmp
+../group/appfwk_test_dummytest.mmp
+
+PRJ_TESTEXPORTS
+// TestFramework IBY files
+../rom/afss_test.iby 				/epoc32/rom/include/afss_test.iby
+../rom/appfwk_test.iby 				/epoc32/rom/include/appfwk_test.iby
+../rom/appfwk_test_framework.iby 		/epoc32/rom/include/appfwk_test_framework.iby
+
+// TestFramework INCLUDE files
+../inc/appfwk_test.h 				MW_LAYER_PLATFORM_EXPORT_PATH(test/appfwk_test.h)
+../inc/appfwk_test_AppUi.h			MW_LAYER_PLATFORM_EXPORT_PATH(test/appfwk_test_appui.h)
+../inc/appfwk_test_utils.h 			MW_LAYER_PLATFORM_EXPORT_PATH(test/appfwk_test_utils.h)
+../inc/appfwk_tmsteststep.h 		MW_LAYER_PLATFORM_EXPORT_PATH(test/appfwk_tmsteststep.h)
+
+#if defined(SYMBIAN_WSERV_AND_CONE_MULTIPLE_SCREENS)
+../group/mulscreens.ini							/epoc32/data/z/appfwk/test/mulscreens.ini
+../group/mulscreens_changetracking.ini					/epoc32/data/z/appfwk/test/mulscreens_changetracking.ini
+../scripts/hardware/mulscreens_hw_test.cmd		/epoc32/data/z/appfwk/test/mulscreens_hw_test.cmd
+../group/mulscreens.ini							/epoc32/release/winscw/udeb/z/appfwk/test/mulscreens.ini
+../group/mulscreens.ini							/epoc32/release/winscw/urel/z/appfwk/test/mulscreens.ini
+../group/mulscreens_changetracking.ini					/epoc32/release/winscw/udeb/z/appfwk/test/mulscreens_changetracking.ini
+../group/mulscreens_changetracking.ini					/epoc32/release/winscw/urel/z/appfwk/test/mulscreens_changetracking.ini
+
+// Here we export the same script 3 times: first 2 for BATS, last 1 for Mistral.
+../scripts/emulator/mulscreens_sw_test.cmd		/epoc32/release/winscw/udeb/z/appfwk/test/mulscreens_sw_test.cmd
+../scripts/emulator/mulscreens_sw_test.cmd		/epoc32/release/winscw/urel/z/appfwk/test/mulscreens_sw_test.cmd
+../scripts/emulator/mulscreens_sw_test.cmd		/epoc32/data/z/appfwk/test/mulscreens_sw_test.cmd
+
+#endif
\ No newline at end of file
--- a/appfw/viewserver/group/BLD.INF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// View Server Build Information.
-// View server
-// 
-//
-
-/**
- @file
-*/
-
-// include test code
-#include "../test/group/BLD.INF"
-
-PRJ_EXPORTS
-../inc/VWSDEF.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(vwsdef.h)
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-../inc/vwsdefpartner.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(vwsdefpartner.h)
-#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
-../inc/VWSAPPST.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(vwsappst.h)
-../inc/VIEWCLI.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(viewcli.h)
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-../inc/viewclipartner.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(viewclipartner.h)
-#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
-
-PRJ_MMPFILES
-../group/VIEWSRV.MMP
-../group/VIEWCLI.MMP
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/viewserver/group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,39 @@
+// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// View Server Build Information.
+// View server
+// 
+//
+
+/**
+ @file
+*/
+
+// include test code
+#include "../test/group/BLD.INF"
+
+PRJ_EXPORTS
+../inc/VWSDEF.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(vwsdef.h)
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+../inc/vwsdefpartner.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(vwsdefpartner.h)
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
+../inc/VWSAPPST.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(vwsappst.h)
+../inc/VIEWCLI.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(viewcli.h)
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+../inc/viewclipartner.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(viewclipartner.h)
+#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
+
+PRJ_MMPFILES
+../group/VIEWSRV.MMP
+../group/VIEWCLI.MMP
--- a/appfw/viewserver/server/VWSERVER.CPP	Fri Jun 11 13:48:03 2010 +0300
+++ b/appfw/viewserver/server/VWSERVER.CPP	Tue Jun 29 10:40:11 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -206,7 +206,8 @@
 		iEnableBoostAppPriorityBeforePanic = valueOfKVwsBoostAppPriorityBeforePanic;
 		}
 #endif
-	
+	LOG3(CVwsLog::EQuiet,_L("CVwsServer::IsPriorityBoostBeforePanicEnabled(): iEnableBoostAppPriorityBeforePanic = [%d] "),iEnableBoostAppPriorityBeforePanic);
+		
 	if (iEnableBoostAppPriorityBeforePanic)
 		{
 		CVwsStartupAware* startupAware = new(ELeave)CVwsStartupAware(*this);
@@ -837,7 +838,7 @@
 		{
 		return;
 		}
-		
+	
 	if (starved.ProcessPriority() < EPriorityForeground)
 		{
 		RProcess owningProcess;
--- a/appfw/viewserver/server/VWSEVENT.CPP	Fri Jun 11 13:48:03 2010 +0300
+++ b/appfw/viewserver/server/VWSEVENT.CPP	Tue Jun 29 10:40:11 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -127,6 +127,7 @@
 		firstDelay=iServerEventTimeOut;
 		}
 
+	LOG3(CVwsLog::EQuiet,_L("CVwsEventTimer::Start : firstDelay [%d] "),firstDelay.Int());
 	TTimeIntervalMicroSeconds32 delay(firstDelay);
 	iPeriodic->Start(delay,delay,TCallBack(TimerCallBack,this));	
 	iScreenDeviceChangeEvent = aScreenDeviceChangeEvent;
@@ -167,7 +168,7 @@
 			else
 				{
 				//Delay of KTimeoutValueForPreemptedProcess is given after boosting priority of an application
-				TUint8 patchableConst = KTimeoutValueForPreemptedProcess;
+				TInt patchableConst = KTimeoutValueForPreemptedProcess;
 				#ifdef __WINS__
 				// For the emulator allow the constant to be patched via epoc.ini
 				UserSvr::HalFunction(EHalGroupEmulator, EEmulatorHalIntProperty,
@@ -175,8 +176,9 @@
 				#endif
 				delay = patchableConst;
 				iTimeOutState = EServerEventTimeOut;
+                LOG2(CVwsLog::ELoud,_L("CVwsEventTimer::DoTimerCallBack : iTimeOutState == EIntermediateEventTimeOut"));
 				}
-			
+            LOG3(CVwsLog::EQuiet,_L("CVwsEventTimer::DoTimerCallBack : delay = [%d] "),delay.Int());
             iPeriodic->Start(delay,delay,TCallBack(TimerCallBack,this));
 			}
 		}
--- a/appfw/viewserver/server/vwspatchdata.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/appfw/viewserver/server/vwspatchdata.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -15,6 +15,6 @@
 
 #include <e32std.h>
 
-EXPORT_C extern const TInt KVwsBoostAppPriorityBeforePanic = 0;
+EXPORT_C extern const TInt KVwsBoostAppPriorityBeforePanic = 1;
 
 EXPORT_C extern const TInt KTimeoutValueForPreemptedProcess = 4*1000*1000; //4 seconds
--- a/appfw/viewserver/test/group/BLD.INF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-// test code only
-
-PRJ_MMPFILES
-// test code only
-
-PRJ_TESTMMPFILES
-appfwk_viewsrv_test_server.mmp
-../tviews/applaunchtest/group/applaunchtest.mmp	support
-../tviews/tview1/tview1.MMP support
-../tviews/tview2/tview2.MMP support
-../tviews/tview3/tview3.MMP support
-../tviews/tview4/tview4.mmp support
-
-PRJ_TESTEXPORTS
-// ViewSrv IBY containing scripts for test execution on hardware
-../rom/appfwk_viewsrv_test.iby 				/epoc32/rom/include/viewsrvtest.iby
-
-// ViewSrv batch files for hardware test execution
-../scripts/hardware/viewsrvtest_run.bat 		/epoc32/data/z/viewsrvtest/viewsrvtest_run.bat
-
-// ViewSrv batch files for automated emulator (WINSCW UDEB) test execution 
-../scripts/emulator/viewsrvtest_run.bat			/epoc32/release/winscw/udeb/viewsrvtest_run.bat
-
-// ViewSrv batch files for automated emulator (WINSCW UREL) test execution 
-../scripts/emulator/viewsrvtest_run.bat			/epoc32/release/winscw/urel/viewsrvtest_run.bat
-
-// ViewSrv TEF scripts
-../scripts/appfwk_viewsrv_test_Capability1.script 	z:/viewsrvtest/viewsrvtest_capability1.script
-../scripts/appfwk_viewsrv_test_Capability2.script 	z:/viewsrvtest/viewsrvtest_capability2.script
-../scripts/appfwk_viewsrv_test_tvwa.script 	z:/viewsrvtest/viewsrvtest_tvwa.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/viewserver/test/group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,49 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+// test code only
+
+PRJ_MMPFILES
+// test code only
+
+PRJ_TESTMMPFILES
+appfwk_viewsrv_test_server.mmp
+../tviews/applaunchtest/group/applaunchtest.mmp	support
+../tviews/tview1/tview1.MMP support
+../tviews/tview2/tview2.MMP support
+../tviews/tview3/tview3.MMP support
+../tviews/tview4/tview4.mmp support
+
+PRJ_TESTEXPORTS
+// ViewSrv IBY containing scripts for test execution on hardware
+../rom/appfwk_viewsrv_test.iby 				/epoc32/rom/include/viewsrvtest.iby
+
+// ViewSrv batch files for hardware test execution
+../scripts/hardware/viewsrvtest_run.bat 		/epoc32/data/z/viewsrvtest/viewsrvtest_run.bat
+
+// ViewSrv batch files for automated emulator (WINSCW UDEB) test execution 
+../scripts/emulator/viewsrvtest_run.bat			/epoc32/release/winscw/udeb/viewsrvtest_run.bat
+
+// ViewSrv batch files for automated emulator (WINSCW UREL) test execution 
+../scripts/emulator/viewsrvtest_run.bat			/epoc32/release/winscw/urel/viewsrvtest_run.bat
+
+// ViewSrv TEF scripts
+../scripts/appfwk_viewsrv_test_Capability1.script 	z:/viewsrvtest/viewsrvtest_capability1.script
+../scripts/appfwk_viewsrv_test_Capability2.script 	z:/viewsrvtest/viewsrvtest_capability2.script
+../scripts/appfwk_viewsrv_test_tvwa.script 	z:/viewsrvtest/viewsrvtest_tvwa.script
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appsupport.pro	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+# 
+# Description: Project file for building phonesrv components
+#
+#
+
+TEMPLATE = subdirs
+CONFIG += ordered
+
+symbian: {
+:BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"group/bld.inf\""
+SUBDIRS += coreapplicationuis\devicepowermenuplugin
+SUBDIRS += systemsettings\accindicatorplugin
+SUBDIRS += systemsettings\accindicatorplugin\accindicatorsettings
+}
--- a/appsupport_plat/startup_configuration_api/inc/startupdomaincrkeys.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/appsupport_plat/startup_configuration_api/inc/startupdomaincrkeys.h	Tue Jun 29 10:40:11 2010 +0300
@@ -263,6 +263,13 @@
 */
 const TUint32 KStartupDefaultTime = 0x00000016;
 
+/**
+ * Enables or disables the FTU StartupSequence. This key is modified by ftu when user accepts the eterms
+ * Possible values true or false
+ */
+const TUint32 KFtuStartupEnabled = 0x0000001A;
+
+
 #endif // STARTUPDOMAINCRKEYS_H
 
 // End of File
--- a/appsupport_plat/system_application_notification_api/inc/coreapplicationuisdomainpskeys.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/appsupport_plat/system_application_notification_api/inc/coreapplicationuisdomainpskeys.h	Tue Jun 29 10:40:11 2010 +0300
@@ -215,6 +215,17 @@
      ECoreAppUIsVideoSharingIndicatorOff,
      ECoreAppUIsVideoSharingIndicatorOn
      };
+     
+/**
+* Used for notifying SysAp for releasing memory of power menu custom dialog
+*/
+const TUint32 KCoreAppUIsPowerMenuCustomDialogStatus= 0x00000207;
+enum TCoreAppUIsPowerMenuCustomDialog
+     {
+     ECoreAppUIsPowerMenuCustomDialogUninitialized = 0,
+     ECoreAppUIsPowerMenuCustomDialogOff,
+     ECoreAppUIsPowerMenuCustomDialogOn
+     };
 
 // =============================================================================
 // Contacts Database Recovery Status API
--- a/commonappservices/alarmserver/Group/Bld.inf	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Alarm server
-// 
-//
-
-PRJ_EXPORTS
-
-// AlarmShared
-../Shared/Include/ASShdAlarm.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(asshdalarm.h)
-../Shared/Include/ASShdDefs.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(asshddefs.h)
-../Shared/Include/ASShdBitFlags.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(asshdbitflags.h)
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-../Shared/Include/ASShdAlarmCal.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(ASShdAlarmCal.h)
-#endif
-
-// AlarmAlert
-../AlarmAlert/Shared/ASAltDefs.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(asaltdefs.h)
-
-// AlarmClient
-../Client/Include/ASCliSession.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(asclisession.h)
-../Client/Include/ASCliSoundPlay.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(asclisoundplay.h)
-../Client/Include/ASCliDefinitions.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(asclidefinitions.h)
-../Client/Include/ASCliClientUtils.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(ascliclientutils.h)
-
-// Console Alarm Alert Server
-../ConsoleAlarmAlertServer/Include/ConsoleAlarmAlertServerMain.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(consolealarmalertservermain.h)
-
-AlarmServer.iby			/epoc32/rom/include/alarmserver.iby   
-
-backup_registration.xml  /epoc32/data/z/private/101f5027/backup_registration.xml
-backup_registration.xml  /epoc32/release/winscw/udeb/z/private/101f5027/backup_registration.xml
-backup_registration.xml  /epoc32/release/winscw/urel/z/private/101f5027/backup_registration.xml
-
-
-PRJ_MMPFILES
-AlarmShared.mmp
-AlarmClient.mmp
-AlarmServer.mmp
-
-#include "../Test/group/bld.inf"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commonappservices/alarmserver/Group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,52 @@
+// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Alarm server
+// 
+//
+
+PRJ_EXPORTS
+
+// AlarmShared
+../Shared/Include/ASShdAlarm.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(asshdalarm.h)
+../Shared/Include/ASShdDefs.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(asshddefs.h)
+../Shared/Include/ASShdBitFlags.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(asshdbitflags.h)
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+../Shared/Include/ASShdAlarmCal.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(ASShdAlarmCal.h)
+#endif
+
+// AlarmAlert
+../AlarmAlert/Shared/ASAltDefs.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(asaltdefs.h)
+
+// AlarmClient
+../Client/Include/ASCliSession.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(asclisession.h)
+../Client/Include/ASCliSoundPlay.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(asclisoundplay.h)
+../Client/Include/ASCliDefinitions.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(asclidefinitions.h)
+../Client/Include/ASCliClientUtils.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(ascliclientutils.h)
+
+// Console Alarm Alert Server
+../ConsoleAlarmAlertServer/Include/ConsoleAlarmAlertServerMain.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(consolealarmalertservermain.h)
+
+AlarmServer.iby			/epoc32/rom/include/alarmserver.iby   
+
+backup_registration.xml  /epoc32/data/z/private/101f5027/backup_registration.xml
+backup_registration.xml  /epoc32/release/winscw/udeb/z/private/101f5027/backup_registration.xml
+backup_registration.xml  /epoc32/release/winscw/urel/z/private/101f5027/backup_registration.xml
+
+
+PRJ_MMPFILES
+AlarmShared.mmp
+AlarmClient.mmp
+AlarmServer.mmp
+
+#include "../Test/group/bld.inf"
Binary file commonappservices/alarmserver/doc_pub/AlarmStateTransitionAndAlarmAlertCom.xls has changed
--- a/commonappservices/alarmservertest/TestAlarmSrv/BLD.INF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_TESTMMPFILES
-
-
-Alarm.MMP
-AlarmCreateDelete/AlarmCreate.MMP
-AlarmCreateDelete/AlarmDelete.MMP
-startconsolealarmalertserver/startcaas.mmp
-
-
-
-PRJ_TESTEXPORTS
-
-
-Cap_00000004_AlarmSub_Custom.script c:/testdata/scripts/cap_00000004_alarmsub_custom.script
-Cap_00010004_AlarmSub.script c:/testdata/scripts/cap_00010004_alarmsub.script
-Cap_00008004_AlarmSub.script c:/testdata/scripts/cap_00008004_alarmsub.script
-Cap_00000024_AlarmSub.script c:/testdata/scripts/cap_00000024_alarmsub.script
-Cap_00000004_AlarmSub.script c:/testdata/scripts/cap_00000004_alarmsub.script
-TestAlarm.IBY /epoc32/rom/include/testalarm.iby
-
-AlarmCreateDelete/AlarmCreate.iby /epoc32/rom/include/alarmcreate.iby
-AlarmCreateDelete/AlarmDelete.iby /epoc32/rom/include/alarmdelete.iby
-startconsolealarmalertserver/startcaas.iby /epoc32/rom/include/startcaas.iby
-
-// Main test script file
-Alarm.script c:/testdata/scripts/alarm.script
-
-// Batch file for testing
-TestAlarm.bat /epoc32/tools/testalarm.bat
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commonappservices/alarmservertest/TestAlarmSrv/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,45 @@
+// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_TESTMMPFILES
+
+
+Alarm.MMP
+AlarmCreateDelete/AlarmCreate.MMP
+AlarmCreateDelete/AlarmDelete.MMP
+startconsolealarmalertserver/startcaas.mmp
+
+
+
+PRJ_TESTEXPORTS
+
+
+Cap_00000004_AlarmSub_Custom.script c:/testdata/scripts/cap_00000004_alarmsub_custom.script
+Cap_00010004_AlarmSub.script c:/testdata/scripts/cap_00010004_alarmsub.script
+Cap_00008004_AlarmSub.script c:/testdata/scripts/cap_00008004_alarmsub.script
+Cap_00000024_AlarmSub.script c:/testdata/scripts/cap_00000024_alarmsub.script
+Cap_00000004_AlarmSub.script c:/testdata/scripts/cap_00000004_alarmsub.script
+TestAlarm.IBY /epoc32/rom/include/testalarm.iby
+
+AlarmCreateDelete/AlarmCreate.iby /epoc32/rom/include/alarmcreate.iby
+AlarmCreateDelete/AlarmDelete.iby /epoc32/rom/include/alarmdelete.iby
+startconsolealarmalertserver/startcaas.iby /epoc32/rom/include/startcaas.iby
+
+// Main test script file
+Alarm.script c:/testdata/scripts/alarm.script
+
+// Batch file for testing
+TestAlarm.bat /epoc32/tools/testalarm.bat
+
--- a/commonappservices/appservicesdocs/app-services_documentation.history.xml	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<relnotes name="DEVELOPERLIBRARY">
-  <purpose>
-  </purpose>
-</relnotes>
--- a/commonappservices/appservicesdocs/app-services_documentation.mrp	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-component	app-services_documentation
-
-source	\sf\mw\appsupport\commonappservices\appservicesdocs\
-
-notes_source	\component_defs\release.src
-
-
-ipr E 
-
Binary file commonappservices/appservicesdocs/architecturaldescription.eap has changed
--- a/commonappservices/backuprestorenotification/group/Bld.inf	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Backup and Restore Notification "Wrapper" for Core Apps.
-// 
-//
-
-PRJ_PLATFORMS
-DEFAULT 
-
-PRJ_EXPORTS
-BackupRestoreNotification.iby	/epoc32/rom/include/backuprestorenotification.iby   
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/MBackupRestoreNotificationObserver.h /epoc32/include/app-services/private/mbackuprestorenotificationobserver.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/CBackupRestoreNotification.h /epoc32/include/app-services/private/cbackuprestorenotification.h
-#endif
-
-PRJ_MMPFILES
-BackupRestoreNotification.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commonappservices/backuprestorenotification/group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Backup and Restore Notification "Wrapper" for Core Apps.
+// 
+//
+
+PRJ_PLATFORMS
+DEFAULT 
+
+PRJ_EXPORTS
+BackupRestoreNotification.iby	/epoc32/rom/include/backuprestorenotification.iby   
+
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../inc/MBackupRestoreNotificationObserver.h /epoc32/include/app-services/private/mbackuprestorenotificationobserver.h
+#endif
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../inc/CBackupRestoreNotification.h /epoc32/include/app-services/private/cbackuprestorenotification.h
+#endif
+
+PRJ_MMPFILES
+BackupRestoreNotification.mmp
--- a/commonappservices/coreappstest/Group/BLD.INF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-client.mmp				support
-../TestServer/Server/server.mmp		support
-../TestServer/Test/TestServerTest.mmp
-../preparedrivec/preparedrivec.mmp
-
-PRJ_TESTEXPORTS
-CoreAppsTestTest.iby	/epoc32/rom/include/coreappstesttest.iby
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../Inc/TestServer.h	/epoc32/include/coreappstest/testserver.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../Inc/utilities.h	/epoc32/include/coreappstest/utilities.h
-#endif
-CoreAppsTest.iby	/epoc32/rom/include/coreappstest.iby
-runeshell.iby	/epoc32/rom/include/runeshell.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commonappservices/coreappstest/Group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,35 @@
+// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_EXPORTS
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+client.mmp				support
+../TestServer/Server/server.mmp		support
+../TestServer/Test/TestServerTest.mmp
+../preparedrivec/preparedrivec.mmp
+
+PRJ_TESTEXPORTS
+CoreAppsTestTest.iby	/epoc32/rom/include/coreappstesttest.iby
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../Inc/TestServer.h	/epoc32/include/coreappstest/testserver.h
+#endif
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../Inc/utilities.h	/epoc32/include/coreappstest/utilities.h
+#endif
+CoreAppsTest.iby	/epoc32/rom/include/coreappstest.iby
+runeshell.iby	/epoc32/rom/include/runeshell.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commonappservices/doc_pub/app-services_documentation.history.xml	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<relnotes name="DEVELOPERLIBRARY">
+  <purpose>
+  </purpose>
+</relnotes>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/commonappservices/doc_pub/app-services_documentation.mrp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,9 @@
+component	app-services_documentation
+
+source	\sf\mw\appsupport\commonappservices\doc_pub\
+
+notes_source	\component_defs\release.src
+
+
+ipr E 
+
Binary file commonappservices/doc_pub/architecturaldescription.eap has changed
--- a/contenthandling/webrecognisers/Test/Group/t_ebookmark.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ b/contenthandling/webrecognisers/Test/Group/t_ebookmark.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -13,6 +13,8 @@
 // Description:
 //
 
+#include <platform_paths.hrh>
+
 TARGET t_ebookmark.dll
 TARGETTYPE plugin
 CAPABILITY protserv
@@ -27,14 +29,13 @@
 
 USERINCLUDE		. ../t_recogtest
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE	/epoc32/include
+MW_LAYER_SYSTEMINCLUDE 
 SYSTEMINCLUDE	/epoc32/include/ecom
 #else
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 SYSTEMINCLUDE	/epoc32/include/ecom
 SYSTEMINCLUDE	/epoc32/include/platform/ecom
-SYSTEMINCLUDE	/epoc32/include/mw
-SYSTEMINCLUDE	/epoc32/include/platform/mw
+MW_LAYER_SYSTEMINCLUDE 
 #endif
 
 
--- a/contenthandling/webrecognisers/Test/Group/t_recogtest.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ b/contenthandling/webrecognisers/Test/Group/t_recogtest.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -13,6 +13,8 @@
 // Description:
 //
 
+#include <platform_paths.hrh>
+
 TARGET			t_recogtest.exe
 TARGETTYPE		exe
 CAPABILITY 		ProtServ
@@ -23,14 +25,13 @@
 
 USERINCLUDE		.
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE	/epoc32/include
+MW_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE	/epoc32/include/ecom
 #else
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 SYSTEMINCLUDE	/epoc32/include/ecom
 SYSTEMINCLUDE	/epoc32/include/platform/ecom
-SYSTEMINCLUDE	/epoc32/include/mw
-SYSTEMINCLUDE	/epoc32/include/platform/mw
+MW_LAYER_SYSTEMINCLUDE
 #endif
 
 LIBRARY			euser.lib ecom.lib
--- a/contenthandling/webrecognisers/Test/Group/t_recwap.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ b/contenthandling/webrecognisers/Test/Group/t_recwap.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -13,6 +13,8 @@
 // Description:
 //
 
+#include <platform_paths.hrh>
+
 TARGET t_recwap.dll
 TARGETTYPE plugin
 CAPABILITY protserv
@@ -27,14 +29,13 @@
 
 USERINCLUDE		. ../t_recogtest
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE	/epoc32/include
+MW_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE	/epoc32/include/ecom
 #else
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 SYSTEMINCLUDE	/epoc32/include/ecom
 SYSTEMINCLUDE	/epoc32/include/platform/ecom
-SYSTEMINCLUDE	/epoc32/include/mw
-SYSTEMINCLUDE	/epoc32/include/platform/mw
+MW_LAYER_SYSTEMINCLUDE
 #endif
 
 
--- a/contenthandling/webrecognisers/Test/Group/t_recweb.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ b/contenthandling/webrecognisers/Test/Group/t_recweb.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -13,6 +13,8 @@
 // Description:
 //
 
+#include <platform_paths.hrh>
+
 TARGET t_recweb.dll
 TARGETTYPE plugin
 CAPABILITY protserv
@@ -27,14 +29,13 @@
 
 USERINCLUDE		. ../t_recogtest
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE	/epoc32/include
+MW_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE	/epoc32/include/ecom
 #else
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 SYSTEMINCLUDE	/epoc32/include/ecom
 SYSTEMINCLUDE	/epoc32/include/platform/ecom
-SYSTEMINCLUDE	/epoc32/include/mw
-SYSTEMINCLUDE	/epoc32/include/platform/mw
+MW_LAYER_SYSTEMINCLUDE
 #endif
 
 
--- a/contenthandling/webrecognisers/Test/Group/t_weburlrec.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ b/contenthandling/webrecognisers/Test/Group/t_weburlrec.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -13,6 +13,8 @@
 // Description:
 //
 
+#include <platform_paths.hrh>
+
 TARGET t_weburlrec.dll
 TARGETTYPE plugin
 CAPABILITY protserv
@@ -27,14 +29,13 @@
 
 USERINCLUDE		. ../t_recogtest
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE	/epoc32/include
+MW_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE	/epoc32/include/ecom
 #else
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 SYSTEMINCLUDE	/epoc32/include/ecom
 SYSTEMINCLUDE	/epoc32/include/platform/ecom
-SYSTEMINCLUDE	/epoc32/include/mw
-SYSTEMINCLUDE	/epoc32/include/platform/mw
+MW_LAYER_SYSTEMINCLUDE
 #endif
 
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contenthandling/webrecognisers/doc_pub/Uid.txt	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+UIDs Allocated for Application-Protocol Recognisers
+
+KUidAppProtRecognisers
+
+101FD8D0	KUidRecogTestEcomInterface	ECom Interface for recogniser test plugins
+101FD8D1	KUidWebUrlRecogTestDll		Web URL recogniser test plugin DLL UID
+101FD8D2	KUidWebUrlRecogTest		Web URL recogniser ECom implementation UID
+101FD8D3	KUidEBookmarkRecogTestDll	EBookmark recogniser test plugin DLL UID
+101FD8D4	KUidEBookmarkRecogTest		EBookmark recogniser ECom implementation UID
+101FD8D5	KUidRecWebRecogTestDll		Web (html/xml) recogniser test plugin DLL UID
+101FD8D6	KUidRecWebRecogTest		Web (html/xml) recogniser ECom implementation UID
+101FD8D7
+101FD8D8
+101FD8D9
\ No newline at end of file
--- a/contenthandling/webrecognisers/group/BLD.INF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Data-type recognisers
-// 
-//
-
-/**
- @file
-*/
-
-
-PRJ_EXPORTS
-// If there's no destination then the source file will be copied
-// to the same name in /epoc32/include
-
-../group/recognisers.iby /epoc32/rom/include/recognisers.iby
-
-../waprecogniser/wapmime.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(wapmime.h)
-
-PRJ_TESTEXPORTS
-// Test Exports
-// Test data exports for t_ebookmark
-../Test/t_ebookmark/TestData/1.ebm 		z:/recogtestdata/1.ebm
-../Test/t_ebookmark/TestData/2.ebm 		z:/recogtestdata/2.ebm
-../Test/t_ebookmark/TestData/3.ebm 		z:/recogtestdata/3.ebm
-../Test/t_ebookmark/TestData/4.notebm 		z:/recogtestdata/4.notebm
-// Test data exports for t_recweb
-../Test/t_recweb/TestData/sample1 		z:/recogtestdata/sample1
-../Test/t_recweb/TestData/sample1.html 		z:/recogtestdata/sample1.html
-../Test/t_recweb/TestData/sample2 		z:/recogtestdata/sample2
-../Test/t_recweb/TestData/sample2.htm 		z:/recogtestdata/sample2.htm
-../Test/t_recweb/TestData/sample3 		z:/recogtestdata/sample3
-../Test/t_recweb/TestData/sample3.xhtml 	z:/recogtestdata/sample3.xhtml
-../Test/t_recweb/TestData/sample4 		z:/recogtestdata/sample4
-../Test/t_recweb/TestData/sample4.xml 		z:/recogtestdata/sample4.xml
-// Test data exports for t_recwap
-../Test/t_recwap/TestData/a.wml 		z:/recogtestdata/a.wml
-../Test/t_recwap/TestData/a.wmlc 		z:/recogtestdata/a.wmlc
-../Test/t_recwap/TestData/a.wmlsc 		z:/recogtestdata/a.wmlsc
-../Test/t_recwap/TestData/a.wmls 		z:/recogtestdata/a.wmls
-../Test/t_recwap/TestData/a.dtd 		z:/recogtestdata/a.dtd
-../Test/t_recwap/TestData/a.wbxml 		z:/recogtestdata/a.wbxml
-
-// Test iby file
-../Test/Group/recogniserstest.iby /epoc32/rom/include/recogniserstest.iby
-
-PRJ_MMPFILES
-
-../weburlrec/weburlrec.mmp
-../eBookmark/ebookmark.mmp
-../recweb/RECWEB.MMP
-../waprecogniser/waprecogniser.mmp
-
-PRJ_TESTMMPFILES
-
-// Application-Protocols Recogniser Test Framework
-../Test/Group/t_recogtest.mmp
-
-// Test Modules
-../Test/Group/t_ebookmark.mmp
-../Test/Group/t_weburlrec.mmp
-../Test/Group/t_recweb.mmp
-../Test/Group/t_recwap.mmp
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contenthandling/webrecognisers/group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,74 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Data-type recognisers
+// 
+//
+
+/**
+ @file
+*/
+
+
+PRJ_EXPORTS
+// If there's no destination then the source file will be copied
+// to the same name in /epoc32/include
+
+../group/recognisers.iby /epoc32/rom/include/recognisers.iby
+
+../waprecogniser/wapmime.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(wapmime.h)
+
+PRJ_TESTEXPORTS
+// Test Exports
+// Test data exports for t_ebookmark
+../Test/t_ebookmark/TestData/1.ebm 		z:/recogtestdata/1.ebm
+../Test/t_ebookmark/TestData/2.ebm 		z:/recogtestdata/2.ebm
+../Test/t_ebookmark/TestData/3.ebm 		z:/recogtestdata/3.ebm
+../Test/t_ebookmark/TestData/4.notebm 		z:/recogtestdata/4.notebm
+// Test data exports for t_recweb
+../Test/t_recweb/TestData/sample1 		z:/recogtestdata/sample1
+../Test/t_recweb/TestData/sample1.html 		z:/recogtestdata/sample1.html
+../Test/t_recweb/TestData/sample2 		z:/recogtestdata/sample2
+../Test/t_recweb/TestData/sample2.htm 		z:/recogtestdata/sample2.htm
+../Test/t_recweb/TestData/sample3 		z:/recogtestdata/sample3
+../Test/t_recweb/TestData/sample3.xhtml 	z:/recogtestdata/sample3.xhtml
+../Test/t_recweb/TestData/sample4 		z:/recogtestdata/sample4
+../Test/t_recweb/TestData/sample4.xml 		z:/recogtestdata/sample4.xml
+// Test data exports for t_recwap
+../Test/t_recwap/TestData/a.wml 		z:/recogtestdata/a.wml
+../Test/t_recwap/TestData/a.wmlc 		z:/recogtestdata/a.wmlc
+../Test/t_recwap/TestData/a.wmlsc 		z:/recogtestdata/a.wmlsc
+../Test/t_recwap/TestData/a.wmls 		z:/recogtestdata/a.wmls
+../Test/t_recwap/TestData/a.dtd 		z:/recogtestdata/a.dtd
+../Test/t_recwap/TestData/a.wbxml 		z:/recogtestdata/a.wbxml
+
+// Test iby file
+../Test/Group/recogniserstest.iby /epoc32/rom/include/recogniserstest.iby
+
+PRJ_MMPFILES
+
+../weburlrec/weburlrec.mmp
+../eBookmark/ebookmark.mmp
+../recweb/RECWEB.MMP
+../waprecogniser/waprecogniser.mmp
+
+PRJ_TESTMMPFILES
+
+// Application-Protocols Recogniser Test Framework
+../Test/Group/t_recogtest.mmp
+
+// Test Modules
+../Test/Group/t_ebookmark.mmp
+../Test/Group/t_weburlrec.mmp
+../Test/Group/t_recweb.mmp
+../Test/Group/t_recwap.mmp
\ No newline at end of file
Binary file contextframework/cfw/conf/contextframework.confml has changed
Binary file contextframework/cfw/conf/contextframework_10282BCD.crml has changed
--- a/contextframework/cfw/tsrc/public/basic/sis/rd-key.pem	Fri Jun 11 13:48:03 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/sis/rd-key.pem	Tue Jun 29 10:40:11 2010 +0300
@@ -1,15 +1,15 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDLRF+r1FGGkCwTrb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW4
-6Y+LWaA8HMlDdoHRB0FgASisYcFagwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh
-7W7Dt9F5FZij8F7/9Pi6+FhhxZFIf1DD+yry9D7+Sp+BgdNALe4XOpf25QIBAwKB
-gQCHgupyjYuvCsgNHn7PNtnvVxInrB5MQNoPli+O+uNJWUK/Q+57Rl+yO8AoEzDX
-pFaLWiuVVhsdloDnAgabT/FXzYncs6uOHyEUV+dSXb78vtLPJqAX+Fg2i3hOXreB
-yskcZ13/OsKVOu5wgrJkx2baZufkqMwOSytf5y9nwjEIKwJBAP+inobagVNrN62j
-KQva3cC+UN/6XnKdTc0CA6bHyLOaJoH1xiMwG/VS2PGjHI0tiSMNtLn/QPpHJ003
-iabGhdUCQQDLjp/9UjFT6K6CF66Chqf30pZXhx+GTSQZmv/gvZiMly7X9fX9BGX3
-2MbJohBC4yI21XKTbisWywkF73Hwh+TRAkEAqmxprzxWN5zPyRdwspHpKymLP/w+
-9xOJM1atGdqFzRFvAU6EF3Vn+OHl9my9s3OwwgkjJqorUYTE3iUGby8D4wJBAIe0
-aqjhdjfwdFa6dFcEb/qMZDpaFQQzbWZnVUB+ZbMPdI/5TqitmU/l2dvBYCyXbCSO
-TGJJcg8yBgP09qBamIsCQFL7j1tM0XPVQJQ89WpKCld7O9ORxRGVj1eG0tWijrH8
-mGbYh8SGCVoWV3vrKSS8GBrFVgQnqUaHuEdtM7tpCAQ=
------END RSA PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDLRF+r1FGGkCwTrb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW4
+6Y+LWaA8HMlDdoHRB0FgASisYcFagwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh
+7W7Dt9F5FZij8F7/9Pi6+FhhxZFIf1DD+yry9D7+Sp+BgdNALe4XOpf25QIBAwKB
+gQCHgupyjYuvCsgNHn7PNtnvVxInrB5MQNoPli+O+uNJWUK/Q+57Rl+yO8AoEzDX
+pFaLWiuVVhsdloDnAgabT/FXzYncs6uOHyEUV+dSXb78vtLPJqAX+Fg2i3hOXreB
+yskcZ13/OsKVOu5wgrJkx2baZufkqMwOSytf5y9nwjEIKwJBAP+inobagVNrN62j
+KQva3cC+UN/6XnKdTc0CA6bHyLOaJoH1xiMwG/VS2PGjHI0tiSMNtLn/QPpHJ003
+iabGhdUCQQDLjp/9UjFT6K6CF66Chqf30pZXhx+GTSQZmv/gvZiMly7X9fX9BGX3
+2MbJohBC4yI21XKTbisWywkF73Hwh+TRAkEAqmxprzxWN5zPyRdwspHpKymLP/w+
+9xOJM1atGdqFzRFvAU6EF3Vn+OHl9my9s3OwwgkjJqorUYTE3iUGby8D4wJBAIe0
+aqjhdjfwdFa6dFcEb/qMZDpaFQQzbWZnVUB+ZbMPdI/5TqitmU/l2dvBYCyXbCSO
+TGJJcg8yBgP09qBamIsCQFL7j1tM0XPVQJQ89WpKCld7O9ORxRGVj1eG0tWijrH8
+mGbYh8SGCVoWV3vrKSS8GBrFVgQnqUaHuEdtM7tpCAQ=
+-----END RSA PRIVATE KEY-----
--- a/contextframework/cfw/tsrc/public/basic/sis/rd.cer	Fri Jun 11 13:48:03 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/sis/rd.cer	Tue Jun 29 10:40:11 2010 +0300
@@ -1,17 +1,17 @@
------BEGIN CERTIFICATE-----
-MIICzDCCAjWgAwIBAgIBADANBgkqhkiG9w0BAQUFADArMRAwDgYDVQQKEwdSRCBD
-ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZTAeFw0wNDExMTUxMjQyMDZaFw0z
-NzA5MjMxMjQyMDZaMCsxEDAOBgNVBAoTB1JEIENlcnQxFzAVBgNVBAMTDlJEIENl
-cnRpZmljYXRlMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDLRF+r1FGGkCwT
-rb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW46Y+LWaA8HMlDdoHRB0FgASisYcFa
-gwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh7W7Dt9F5FZij8F7/9Pi6+FhhxZFI
-f1DD+yry9D7+Sp+BgdNALe4XOpf25QIBA6OCAQAwgf0wDAYDVR0TBAUwAwEB/zAL
-BgNVHQ8EBAMCAoQwHQYDVR0OBBYEFFi/kuGzxhVpjGxe9ZwlxC3fH9jFMFMGA1Ud
-IwRMMEqAFFi/kuGzxhVpjGxe9ZwlxC3fH9jFoS+kLTArMRAwDgYDVQQKEwdSRCBD
-ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZYIBADBsBgNVHSAEZTBjMGEGBFUd
-IAAwWTATBggrBgEFBQcCARYHaHR0cDovLzBCBggrBgEFBQcCAjA2GjRGb3IgUiZE
-IHVzYWdlIG9ubHkuIFRoaXMgY2VydGlmaWNhdGUgaXMgbm90IHRydXN0ZWQuMA0G
-CSqGSIb3DQEBBQUAA4GBAHGB4RQMAgBdeT2hxfOr6f2nA/dZm+M5yX5daUtZnET9
-Ed0A9sazLawfN2G1KFQT9kxEParAyoAkpbMAsRrnRz/9cM3OHgFm/NiKRnf50DpT
-7oCx0I/65mVD2kt+xXE62/Ii5KPnTufIkPi2uLvURCia1tTS8JmJ8dtxDGyQt8BR
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICzDCCAjWgAwIBAgIBADANBgkqhkiG9w0BAQUFADArMRAwDgYDVQQKEwdSRCBD
+ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZTAeFw0wNDExMTUxMjQyMDZaFw0z
+NzA5MjMxMjQyMDZaMCsxEDAOBgNVBAoTB1JEIENlcnQxFzAVBgNVBAMTDlJEIENl
+cnRpZmljYXRlMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDLRF+r1FGGkCwT
+rb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW46Y+LWaA8HMlDdoHRB0FgASisYcFa
+gwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh7W7Dt9F5FZij8F7/9Pi6+FhhxZFI
+f1DD+yry9D7+Sp+BgdNALe4XOpf25QIBA6OCAQAwgf0wDAYDVR0TBAUwAwEB/zAL
+BgNVHQ8EBAMCAoQwHQYDVR0OBBYEFFi/kuGzxhVpjGxe9ZwlxC3fH9jFMFMGA1Ud
+IwRMMEqAFFi/kuGzxhVpjGxe9ZwlxC3fH9jFoS+kLTArMRAwDgYDVQQKEwdSRCBD
+ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZYIBADBsBgNVHSAEZTBjMGEGBFUd
+IAAwWTATBggrBgEFBQcCARYHaHR0cDovLzBCBggrBgEFBQcCAjA2GjRGb3IgUiZE
+IHVzYWdlIG9ubHkuIFRoaXMgY2VydGlmaWNhdGUgaXMgbm90IHRydXN0ZWQuMA0G
+CSqGSIb3DQEBBQUAA4GBAHGB4RQMAgBdeT2hxfOr6f2nA/dZm+M5yX5daUtZnET9
+Ed0A9sazLawfN2G1KFQT9kxEParAyoAkpbMAsRrnRz/9cM3OHgFm/NiKRnf50DpT
+7oCx0I/65mVD2kt+xXE62/Ii5KPnTufIkPi2uLvURCia1tTS8JmJ8dtxDGyQt8BR
+-----END CERTIFICATE-----
--- a/coreapplicationuis/SysAp/CenRep/CoreApplicationUIsPrivateCRKeys.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/CenRep/CoreApplicationUIsPrivateCRKeys.h	Tue Jun 29 10:40:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
--- a/coreapplicationuis/SysAp/Data/SysAp.rss	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Data/SysAp.rss	Tue Jun 29 10:40:11 2010 +0300
@@ -31,12 +31,18 @@
 
 RESOURCE RSS_SIGNATURE { }
 
-RESOURCE TBUF { buf=""; }
+RESOURCE TBUF { buf="sysap"; }
 
 RESOURCE EIK_APP_INFO
-{
-    status_pane=R_AVKON_STATUS_PANE_LAYOUT_EMPTY;
-}
+    {
+        status_pane = r_status_pane;
+    }
+
+RESOURCE STATUS_PANE_APP_MODEL r_status_pane
+    {
+        layout= R_AVKON_STATUS_PANE_LAYOUT_EMPTY;
+    }
+
 
 //   LOCALIZED STRINGS 
 
--- a/coreapplicationuis/SysAp/Group/SysAp.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Group/SysAp.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -35,119 +35,46 @@
 MACRO SYSAP_USE_STARTUP_UI_PHASE
 #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION 
 
+
 SOURCEPATH  ../Src
 SOURCE SysApApp.cpp
+SOURCE SysApDocument.cpp
+//SOURCE main.cpp
 SOURCE SysApAppUi.cpp
-SOURCE SysApDocument.cpp
-SOURCE sysapkeymanagement.cpp
+//SOURCE SysApWsClient.cpp
+SOURCE SysApFeatureManager.cpp
 SOURCE SysApLightsController.cpp
 SOURCE SysApTimer.cpp
-
-SOURCE SysApPubSubObserver.cpp
-SOURCE SysApProfileObserver.cpp
-SOURCE SysApEtelNetworkBarObserver.cpp
-SOURCE sysapetelnetworkbargetter.cpp
-
-//SOURCE CenRepObservers/sysapcenrepfmtxobserver.cpp
-SOURCE CenRepObservers/SysApCenRepLogsObserver.cpp
-SOURCE CenRepObservers/SysApCenRepBTObserver.cpp
-SOURCE CenRepObservers/SysApCenRepHacSettingObserver.cpp
-SOURCE CenRepObservers/sysapcenreplightsettingsobserver.cpp
-SOURCE CenRepObservers/sysapcenrepcallforwardingobserver.cpp
-SOURCE CenRepObservers/sysapcenrepmsgwaitingobserver.cpp
-SOURCE SysApCenRepController.cpp
-
-SOURCE SysApStartupController.cpp
-SOURCE SysApConnectionMonitorObserver.cpp
-SOURCE SysApPowerKeyMenuObserver.cpp
-SOURCE SysApSsSettingsObserver.cpp
+SOURCE sysaplightpluginhandler.cpp
+SOURCE SysApNspsHandler.cpp
+SOURCE SysApNspsAnim.cpp 
+SOURCE SysApPubSubObserver.cpp SysApSubscriber.cpp sysapremconobserver.cpp
+SOURCE sysapdefaultkeyhandler.cpp SysApStartupController.cpp
 SOURCE SysApShutdownImage.cpp
-SOURCE SysApShutdownAnimation.cpp
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-SOURCE SysApShutdownTone.cpp
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-SOURCE SysApMsgSimMemLowQuery.cpp
-SOURCE SysApNspsAnim.cpp
-SOURCE SysApNspsHandler.cpp
-SOURCE SysApEtelNetworkStatusNspsObserver.cpp
-SOURCE SysApEtelSmsStoreObserver.cpp
-SOURCE SysApWaitNote.cpp
-SOURCE SysApConfirmationQuery.cpp
-SOURCE SysApFeatureManager.cpp
-SOURCE SysApSubscriber.cpp
-
-SOURCE SysApAnimKeySndControl.cpp
-SOURCE SysApKeySndAnim.cpp
-SOURCE SysApKeySndHandler.cpp
-
-SOURCE SysApSimChanged.cpp
-LIBRARY logcli.lib
-
-SOURCE SysApAccessoryObserver.cpp
-LIBRARY accclient.lib
-
-SOURCE SysApEtelConnector.cpp
+SOURCE hbdevicepowermenusymbian.cpp
 
 #ifdef __OFFLINE_MODE
 SOURCE OfflineModeController/SysApOfflineModeControllerImpl.cpp
-#else
-SOURCE OfflineModeController/SysApOfflineModeControllerStub.cpp
-#endif
-
-//Always use stub implementation of privacy framework, as it is no longer supported
-// Find out if/how a replacement must be done
-SOURCE PrivacyFramework/SysApLocationPrivacyIndicatorStub.cpp
-
-#ifdef __USB
-SOURCE Usb/SysApUsbIndicatorImpl.cpp
-LIBRARY     usbman.lib        // USB Manager
-#else
-SOURCE Usb/SysApUsbIndicatorStub.cpp
-#endif
-SOURCE Usb/sysapusbchargerdetector.cpp
-
-#ifdef __BT
-SOURCE Bt/SysApBtControllerImpl.cpp
-LIBRARY btengdevman.lib
-LIBRARY btengsettings.lib
-LIBRARY btmanclient.lib
-#else
-SOURCE Bt/SysApBtControllerStub.cpp
 #endif
 
-#ifdef __BT_SAP
-SOURCE BtSap/SysApBtSapControllerImpl.cpp
-LIBRARY btengconnman.lib
-LIBRARY btdevice.lib
-LIBRARY bluetooth.lib
-#else
-SOURCE BtSap/SysApBtSapControllerStub.cpp
-#endif
 
-SOURCE SysApMediatorObserver.cpp
-
-SOURCE sysapdefaultkeyhandler.cpp
-#ifdef RD_LIGHT_CONTROL_CHANGE
-SOURCE sysaplightpluginhandler.cpp
-#endif
+SYSTEMINCLUDE		/epoc32/include/mw/hb/hbwidgets
+SYSTEMINCLUDE		/epoc32/include/mw/hb/hbcore
+//SYSTEMINCLUDE		/epoc32/include/mw/QtCore
+SYSTEMINCLUDE      /epoc32/include/mw
 
-SOURCE sysapaudioroutingobserver.cpp
-SOURCE sysapeteldatabearerobserver.cpp
+USERINCLUDE        . 
+USERINCLUDE        ../Inc
+USERINCLUDE        ../Src/CenRepObservers 
+USERINCLUDE        ../Src/Usb 
+USERINCLUDE        ../Src/powersavemode
+USERINCLUDE        ../../inc // subsystem headers
+USERINCLUDE        ../../../inc // ado headers
+USERINCLUDE        ../CenRep
+USERINCLUDE        ../PubSub
 
-SOURCE memorycard/SysApMMCObserver.cpp
-#ifdef RD_MULTIPLE_DRIVE
-SOURCE memorycard/sysapdrivelist.cpp
-SOURCE memorycard/sysapdriveunlockhandler.cpp
-SOURCE memorycard/sysapdriveejecthandler.cpp
-#endif // RD_MULTIPLE_DRIVE
+MW_LAYER_SYSTEMINCLUDE 
 
-SOURCE sysapetelnetworkinfoobserver.cpp
-SOURCE sysapremconobserver.cpp
-SOURCE powersavemode/sysappsmcontroller.cpp
-SOURCE sysapbatteryinfocontroller.cpp
-
-SOURCE SysApSatObserver.cpp
-LIBRARY	    satclient.lib       // for sat refresh
 
 START RESOURCE ../Data/SysAp.rss
 HEADER
@@ -167,20 +94,6 @@
 TARGETPATH /private/10003a3f/apps
 END
 
-SOURCEPATH ../Data
-
-USERINCLUDE        . 
-USERINCLUDE        ../Inc
-USERINCLUDE        ../Src/CenRepObservers 
-USERINCLUDE        ../Src/memorycard 
-USERINCLUDE        ../Src/Usb 
-USERINCLUDE        ../Src/powersavemode
-USERINCLUDE        ../../inc // subsystem headers
-USERINCLUDE        ../../../inc // ado headers
-USERINCLUDE        ../CenRep
-USERINCLUDE        ../PubSub
-
-MW_LAYER_SYSTEMINCLUDE 
 
 LIBRARY euser.lib
 LIBRARY apparc.lib
@@ -188,67 +101,110 @@
 LIBRARY eikcore.lib
 LIBRARY apgrfx.lib
 LIBRARY ws32.lib
-LIBRARY avkon.lib
+
 LIBRARY bafl.lib
-LIBRARY aknnotify.lib
+
 LIBRARY eiksrvc.lib
 LIBRARY connmon.lib
 LIBRARY dsclient.lib
 LIBRARY profileeng.lib
 LIBRARY starterclient.lib
-LIBRARY centralrepository.lib
-LIBRARY cenrepnotifhandler.lib
-LIBRARY commonengine.lib
-LIBRARY activitymanager.lib
-LIBRARY akncapserverclient.lib
-LIBRARY secui.lib
-LIBRARY sssettings.lib
+
+
 LIBRARY fbscli.lib
 LIBRARY etel.lib
 LIBRARY etelmm.lib
-LIBRARY customapi.lib
+LIBRARY efsrv.lib
+
+LIBRARY esock.lib
+
+LIBRARY ecom.lib
+
+LIBRARY hbwidgets.lib
+//LIBRARY qtcore.lib
+
+//LIBRARY HbDeviceInputDialogWidget.lib
+
+//For CHbIndicatorSymbian and for CHbPowereMenusymbian
+LIBRARY hbcore.lib
+LIBRARY hwrmlightclient.lib
 LIBRARY featmgr.lib
-LIBRARY efsrv.lib
-LIBRARY aknmemorycardui.lib
-LIBRARY esock.lib
+LIBRARY activitymanager.lib
+LIBRARY	remconcoreapi.lib
+LIBRARY	remconinterfacebase.lib
+//LIBRARY hbpowermenuwidget.lib
+
+//  End of File
+
+
+#ifdef __USB
+SOURCEPATH ../Src/Usb
+SOURCE SysApUsbIndicatorImpl.cpp 
+LIBRARY     usbman.lib        // USB Manager
+#endif
+SOURCE sysapusbchargerdetector.cpp
+
+SOURCEPATH ../Src
+SOURCE SysApAccessoryObserver.cpp SysApCenRepController.cpp
+LIBRARY accclient.lib
+LIBRARY accpolicy.lib
+
+SOURCE CenRepObservers/SysApCenRepBTObserver.cpp
+SOURCE CenRepObservers/SysApCenRepHacSettingObserver.cpp
+SOURCE CenRepObservers/sysapcenreplightsettingsobserver.cpp
+SOURCE CenRepObservers/SysApCenRepLogsObserver.cpp
+SOURCE CenRepObservers/sysapcenrepofflinemodeobserver.cpp
+
+LIBRARY centralrepository.lib
+LIBRARY cenrepnotifhandler.lib
+
+SOURCE sysapaudioroutingobserver.cpp
+LIBRARY telephonyaudiorouting.lib
+
 #ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
 LIBRARY sanimctrl.lib
 #else // RD_STARTUP_ANIMATION_CUSTOMIZATION
 LIBRARY MediaClientAudio.lib
 #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-LIBRARY hwrmlightclient.lib
-//LIBRARY hwrmfmtxclient.lib
-LIBRARY	remconcoreapi.lib
-LIBRARY	remconinterfacebase.lib
-LIBRARY aknicon.lib
-LIBRARY cdlengine.lib
 
-// POC launching
-LIBRARY servicehandler.lib
-
-LIBRARY ecom.lib
-
-
-LIBRARY mediatorclient.lib
 LIBRARY bmpanim.lib
 
-LIBRARY telephonyaudiorouting.lib
-LIBRARY etelpckt.lib
-
-#ifdef RD_MULTIPLE_DRIVE
-LIBRARY platformenv.lib
-LIBRARY disknotifyhandler.lib
-#endif // RD_MULTIPLE_DRIVE
-
+SOURCEPATH ../Src/powersavemode
+SOURCE sysappsmcontroller.cpp 
 LIBRARY psmclient.lib
 
-LIBRARY keylockpolicyapi.lib
+SOURCEPATH ../Src
+SOURCE sysapbatteryinfocontroller.cpp SysApSimChanged.cpp
 
+LIBRARY secui.lib
 LIBRARY bsutil.lib
-LIBRARY batterypopupcontrol.lib
+//LIBRARY batterypopupcontrol.lib
+//LIBRARY CommonEngine.lib
+SOURCEPATH ../Src/Bt
+SOURCE SysApBtControllerImpl.cpp
+SOURCEPATH ../Src/BtSap
+SOURCE SysApBtSapControllerImpl.cpp
 
-LIBRARY eikcoctl.lib
-//  End of File
+//LIBRARY eikcoctl.lib
+//LIBRARY etelpckt.lib
 
 
+LIBRARY btengconnman.lib
+LIBRARY btdevice.lib
+LIBRARY bluetooth.lib
 
+LIBRARY btengdevman.lib
+LIBRARY btengsettings.lib
+LIBRARY btmanclient.lib
+
+LIBRARY lockclient.lib
+
+SOURCEPATH ../Src
+SOURCE sysapkeymanagement.cpp SysApTaskList.cpp
+SOURCE SysApKeySndHandler.cpp SysApKeySndAnim.cpp SysApAnimKeySndControl.cpp
+
+//For Shutdown
+LIBRARY	    SVGEngine.lib
+LIBRARY	    gdi.lib
+
+LIBRARY avkon.lib
--- a/coreapplicationuis/SysAp/Group/bld.inf	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -22,11 +22,6 @@
 DEFAULT
 
 PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
-  OPTION TARGETFILE sysap.mif
-  OPTION HEADERFILE sysap.mbg
-  OPTION SOURCES -c8 qgn_startup_screen
-END
 
 
 PRJ_EXPORTS
@@ -47,6 +42,9 @@
 
 ../PubSub/CoreApplicationUIsPrivatePSKeys.h |../../../inc/coreapplicationuisprivatepskeys.h // Illegal export for avoiding breaks
 
+/epoc32/s60/icons/qgn_startup_screen.svg          /epoc32/data/z/resource/apps/qgn_sysap_screen.svg
+/epoc32/s60/icons/qgn_startup_screen.svg          /epoc32/release/winscw/udeb/z/resource/apps/qgn_sysap_screen.svg
+/epoc32/s60/icons/qgn_startup_screen.svg          /epoc32/release/winscw/urel/z/resource/apps/qgn_sysap_screen.svg
 PRJ_MMPFILES
 //gnumakefile sysap_icons.mk 
 
--- a/coreapplicationuis/SysAp/Inc/SysApApp.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApApp.h	Tue Jun 29 10:40:11 2010 +0300
@@ -20,7 +20,8 @@
 #define SYSAPAPP_H
 
 // INCLUDES
-#include <aknapp.h>
+//#include <aknapp.h>
+#include <eikapp.h>
 
 // CONSTANTS
 const TUid KUidSysAp={0x100058F3};
@@ -33,7 +34,7 @@
 *  @since 1.0
 */
 
-class CSysApApp : public CAknApplication
+class CSysApApp : public CEikApplication 
     {
     private: // from CApaApplication
         /**
--- a/coreapplicationuis/SysAp/Inc/SysApAppUi.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApAppUi.h	Tue Jun 29 10:40:11 2010 +0300
@@ -1,116 +1,43 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  CSysApAppUi class definition. This class handles all user
-*                actions and also System Agent events.
-*
-*/
-
+ * Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
 
 #ifndef SYSAPAPPUI_H
 #define SYSAPAPPUI_H
-
-// INCLUDES
+//#include <QObject>
+//#include <aknappui.h>
+//#include <hbmessagebox.h>
 #include <aknappui.h>
-#include <aknkeylock.h>
-#ifndef RD_MULTIPLE_DRIVE
- #include <aknmemorycarddialog.h>
-#endif // RD_MULTIPLE_DRIVE
-#include <starterclient.h>
-#include <starter.hrh>
-#include <babackup.h>
-#include <rmmcustomapi.h>
-
-#include <DosSvrServices.h>
 #include "SysAp.hrh"
-#include "SysApMMCObserver.h"
-#include "MSysApPropertyResponder.h"
-#include "SysApTimer.h"
+#include <f32file.h> 
+#include <W32STD.H>
+#include <coedef.h>
 #include <e32property.h>
-#include "coreapplicationuisprivatecrkeys.h"
 #include <sysapcallback.h>
-
+#include <starterclient.h>
+#include "SysApTimer.h"
+#include "SysApLightsController.h"
+#include "coreapplicationuisprivatecrkeys.h"
+#include "sysapusbchargerdetector.h"
 #include "SysApAccessoryObserver.h"
-#ifdef RD_MULTIPLE_DRIVE
-  #include "sysapdrivelist.h"
-#endif // RD_MULTIPLE_DRIVE
-
-#include "sysapusbchargerdetector.h"
-#include "sysappsmcontroller.h"
+#include <hbsymbianvariant.h>
+//For Powermenu--CHbDevicePowerMenuSymbian
+#include "hbdevicepowermenusymbian.h"
 
-// FORWARD DECLARATIONS
-class CAknSmallIndicator;
-class CAknSignalNotify;
-class CAknBatteryNotify;
-class CAknGlobalListQuery;
-class CAknGlobalNote;
-class CSystemLock;
-class CSysApLightsController;
-class CSysApPubSubObserver;
-class CSysApProfileObserver;
-class CSysApConnectionMonitorObserver;
-class CSysApCenRepLightSettingsObserver;
-class CSysApCenRepLogsObserver;
-class CSysApCenRepBtObserver;
-//class CSysApCenRepFmTxObserver;
-class CSysApCenRepController;
-class CSysApStartupController;
-class CSysApPowerKeyMenuObserver;
-class CSysApWaitNote;
-class CSysApSsSettingsObserver;
-class CSysApShutdownImage;
-class CSysApShutdownAnimation;
-class CSysApEtelConnector;
-class CSysApMsgSimMemLowQuery;
-class CSysApNspsHandler;
-class CSysApConfirmationQuery;
-class CSysApFeatureManager;
-class MSysApOfflineModeController;
-class MSysApBtController;
-class MSysApBtSapController;
-class MSysApUsbIndicator;
-class MSysApLocationPrivacyIndicator;
-class MProfileEngine;
-class MProfilesNamesArray;
-class CSysApKeySndHandler;
-class CSysApKeyManagement;  // KEF
-class CSysApMediatorObserver;
-class CAknAppUiBase;
-class CSysApCenRepHacSettingObserver;
-class CSysApAudioRoutingObserver;
-class CSysApCenRepCallForwardingObserver;
-class CSysApCenRepMsgWaitingObserver;
-
-// POC launching
-class CAiwServiceHandler;
-
-class CSysApDefaultKeyHandler;
-class CSysApDriveUnlockHandler;
-class CSysApDriveEjectHandler;
-
-class CSysApBatteryInfoController;
-
-//CONSTANTS
-const TInt KDummyReason( -1 );
-const TInt KBluetoothModulePowerModeOn ( 1 );
-const TInt KBluetoothModulePowerModeOff ( 0 );
-const TInt KGeneralProfileId ( 0 );
-const TInt KOfflineModeProfileId ( 5 );
-const TInt KApplicationScanningInterval( 1 ); // 1 second
-_LIT( KFSName, "Fat" );                 // MMC file system name
-const TDriveNumber KMMCDrive = EDriveE; // MMC drive number
-
-
+#include "sysappsmcontroller.h"
 
 //CLASS DECLARATION
 /**
@@ -121,18 +48,49 @@
 *  @lib   sysap
 *  @since 1.0
 */
+#include <eikappui.h>
 
-class CSysApAppUi :
-                    public CAknAppUi,
-#ifndef RD_MULTIPLE_DRIVE
-                    public MAknMemoryCardDialogObserver,
-#endif // RD_MULTIPLE_DRIVE
-                    public MSysApMemoryCardObserver,
+
+//class CAknAppUiBase;
+//class CSysApKeySndHandler;
+//class  CSysApWsClient;
+class CSysApFeatureManager;
+class CSysApNspsHandler;
+class CSysApPubSubObserver;
+class CSysApStartupController;
+class CSysApDefaultKeyHandler;
+class CSysApKeyManagement; 
+class MSysApOfflineModeController;
+class CHbDevicePowerMenuSymbian;
+class CSysApShutdownImage;
+class CSysApKeySndHandler;
+class CSysApCenRepController;
+class CSysApCenRepLightSettingsObserver;
+class CSysApCenRepBtObserver;
+class CSysApCenRepHacSettingObserver;
+class CSysApAudioRoutingObserver;
+class CSysApSsSettingsObserver;
+class CSystemLock;
+class CSysApCenRepCallForwardingObserver;
+class CSysApBatteryInfoController;
+class MSysApBtSapController;
+class MSysApBtController;
+class CSysApCenRepLogsObserver;
+class MSysApUsbIndicator;
+class CKeyguardAccessApi;
+
+
+const TInt KBluetoothModulePowerModeOn ( 1 );
+const TInt KDummyReason( -1 );
+
+//class HbMessageBox;
+
+class CSysApAppUi : public CAknAppUi,
                     public MSysApTimerResponder,
                     public MSysapCallback,
                     public MSysApPsmControllerNotifyCallback
-{
-    public:
+	{
+		public:
         /**
         * C++ default constructor.
         * @param None
@@ -146,7 +104,10 @@
         * @return void
         */
         virtual ~CSysApAppUi();
-
+        
+        // from CCoeAppUiBase
+        void PrepareToExit();
+        
     protected: // From MSysApTimerResponder
 
         /**
@@ -155,1057 +116,7 @@
         * @return void
         */
         void TimerExpiredL();
-
-    public:
-
-        /**
-        * Gets called when shutdown continues after shutdown animation
-        * @param None
-        * @return void
-        */
-        void ContinueShutdown();
-
-        /**
-        * Gets called when there is need to shutdown the device initiated by Symbian side
-        * @param None
-        * @return void
-        */
-        void DoShutdownL( const TBool aReset, const TInt aResetReason );
-
-        /**
-        * Gets called by CSysApSharedDataObserver if user has selected "No" in
-        * "Do you want to use the phone in Off-line mode?" query in startup.
-        * @param aDoProfileChange if ETrue, the last active profile is restored
-        * @return void
-        */
-        void GoOnlineL( TBool aDoProfileChange = ETrue );
-
-        /**
-        * Gets called by CSysApSharedDataObserver in Simless Offline Mode startup.
-        * @param None
-        * @return void
-        */
-        void GoOfflineL();
-
-        /**
-        * Calls CSysApOfflineModeController::SwitchFromOnlineToOfflineModeL()
-        * @param None
-        * @return void
-        */
-        void SwitchFromOnlineToOfflineModeL();
-
-        /**
-        * Called when offline mode change has been finished.
-        */
-        void OfflineModeChangedL();
-
-        /**
-        * Gets called after changing the SW state.
-        * @param aSwState The new state
-        * @return void
-        */
-        void DoStateChangedL( const RStarterSession::TGlobalState aSwState  );
-
-#ifdef SYSAP_USE_STARTUP_UI_PHASE        
-        /**
-        * Called when UI is ready after boot.
-        */
-        void HandleUiReadyAfterBootL();
-
-#endif // SYSAP_USE_STARTUP_UI_PHASE
         
-        /**
-        * Returns whether UI is ready after boot.
-        */
-        TBool UiReady() const;
-
-        /**
-        * Gets called when any case selection on powerkey menu is done.
-        * Does what is needed per selection.
-        * @param TInt aSelection
-        * @return void
-        */
-        void PowerKeyPopUpMenuSelectionDoneL( TInt aSelection );
-
-        /**
-        * Gets called when Alarm is being shown to user and lights need to be blinked.
-        * @param TBool aAlerting
-        * @return void
-        */
-        void AlertUiAlertingL( const TBool aAlerting );
-
-        /**
-        * Gets called when Alarm is being shown to user and keylock need to be turned off.
-        * @param TBool aKeyLockOff
-        * @return void
-        */
-        void AlertUiKeyLockOff( const TBool aKeyLockOff );
-
-        /**
-        * Notifies changes in KPSUidCoreApplicationUIs::KLightControl to light controller.
-        */
-        void HandleLightsRequireL() const;
-
-        /**
-        * Notifies changes in KPSUidCoreApplicationUIs::KCoreAppUIsLightsRawKeyEvent to light controller.
-        *
-        * @since S60 3.2
-        */
-        void HandleRawKeyEventLightsRequireL() const;
-
-        /**
-        * Gets called when Video Telephony requests to force/cancel lights on/
-        * @param const TInt aLightsParameter
-        * @return void
-        */
-        void HandleForcedLightsVTRequireL( const TInt aLightsParameter ) const;
-
-        /**
-        * Gets called when Screen Saver requests to force lights on/off
-        * @param const TInt aLightsParameter
-        * @return void
-        */
-        void HandleForcedLightsSSRequireL( const TInt aLightsParameter ) const;
-				
-				/**
-        * Gets called when AT Command requests to force lights on/off
-        * @param const TInt aLightsParameter
-        * @return void
-        */
-				void HandleForcedLightsATCRequireL( const TInt aLightsParameter ) const;
-        /**
-        * Calls SysApLightsController::SwitchLightsOnSoftRejectL
-        *
-        * @since S60 3.1
-        * @param None.
-        * @return None.
-        */
-        void SwitchLightsOnSoftRejectL();
-
-        /**
-        * Asks state of one property from PubSub
-        * @param const TUid&
-        * @param const TUint
-        * @return const TInt ( value of property or error code )
-         */
-        TInt StateOfProperty( const TUid& aCategory, const TUint aKey ) const;
-
-        /**
-        * Sets the indicator's aIndicator state to state aState.
-        * @param TInt aIndicator
-        * @param TInt aState
-        * @return void
-        */
-        void SetIndicatorStateL( const TInt aIndicator, const TInt aState ) const;
-
-        /**
-        * Returns the state of keylock
-        * @param none
-        * @return TBool the state of keylock
-        */
-        TBool KeyLockState() const;
-
-        /**
-        * Returns the state of devicelock
-        * @param none
-        * @return TBool the state of devicelock
-        */
-        TBool DeviceLockState() const;
-
-        /*
-        * @param None
-        * @return void
-        */
-        void SetIhfIndicatorL();
-
-        /*
-        * Handles actions needed when either SIM memory gets too full to receive any more SMS's.
-        * @param aSimStoreFull If true, SIM memory is full.
-        * @return void
-        */
-        void HandleSmsStorageNotificationL( TBool aSimStoreFull );
-
-        void HandleNspsRawKeyEventL();
-
-        void HandleNetworkNspsNotification( RMmCustomAPI::TNspsStatus aNspsStatus );
-
-        void HandleMessageTonePlayingQuitability( TInt aTonePlayingStatus );
-
-        /*
-        * Called by SysApLightsController when the lights are switced on/off
-        * @param aActivate If ETrue forwarding is activated, otherwise deactivated
-        * @return void
-        */
-        void ActivateKeyeventForwardingForLights(TBool aActivate);
-
-        /**
-        * Gets called when shutdown requested when sw state == ESWStateAlarm
-        * context active.
-        * @param None
-        * @return void
-        */
-        void StartShutDownTimerOnAlarmAndChargingStates();
-        static TInt DoShutdownOnAlarmStateAfterCallBack( TAny* aObject );
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-        /**
-        * Starts shutdown animation timing after shutdown tone sync is done
-        */
-        void StartAnimTiming();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-        /**
-        * Stops shutdown animation timing and continues shutdown.
-        */
-        static TInt DoStopAnimTiming( TAny* aObject );
-
-        /**
-        * Gets called when GPRS is suspended because of a phone call established while
-        * context active. Delay (KDelayBeforeShowingGprsSuspendedNote) required to ensure
-        * that the phone call was really established.
-        * @param None
-        * @return void
-        */
-        void StartGprsSuspendedTimer();
-        static TInt ShowGprsSuspendedNoteAfterCallBack( TAny* aObject );
-
-        /**
-        * Gets called when an accessory was connected to device. The indicator
-        * is shown and profile gets changed if needed.
-        * @param aAccessoryState Indicates the new accessory state
-        * @return void
-        */
-        void HandleAccessoryConnectedL( TAccMode aAccessoryState );
-
-        /**
-        * Gets called when headset/loopset was disconnected from device. The indicator
-        * is hidden and the original profile gets restored if needed.
-        * @param None
-        * @return void
-        */
-        void HandleAccessoryDisconnectedL();
-
-        /**
-        * Gets called when SysAp receives KSysApSatRefreshStart. All
-        * non-system UI applications are closed
-        * and an information note is shown to the user.
-        * @param None
-        * @return void
-        */
-        void HandleSatRefreshL();
-
-#ifndef RD_MULTIPLE_DRIVE
-        /**
-        * Mounts MMC drive
-        * @param None
-        * @return TInt : error value from RFs::MountFileSystem()
-        */
-        TInt MountMMC();
-
-        /**
-        * Dismounts MMC drive
-        * @param None
-        * @return TInt : error value from RFs::MountFileSystem()
-        */
-        TInt DismountMMC();
-#endif // RD_MULTIPLE_DRIVE
-
-        /**
-        * MMC Hot Swap Ejection from powerkey menu
-        * @param None
-        * @return void
-        */
-        void EjectMMCL();
-
-        /**
-        * Disconnect BtSap from powerkey meny
-        * @param None
-        * @return void
-        */
-        void DisconnectBtSap();
-
-         /**
-         * Enable or disable FM transmission 
-         */
-//         void ChangeFmTxStateL( TBool aEnable );
-
-#ifndef RD_MULTIPLE_DRIVE
-    public: // from MAknMemoryCardDialogObserver
-
-        /**
-        * To be notified when unlock completed
-        * @param TInt aResult
-        * @return void
-        */
-        void UnlockComplete( TInt aResult );
-#endif // RD_MULTIPLE_DRIVE
-
-    public:
-
-        /**
-        * Plays the sound EAvkonSIDInformationTone
-        * @param None
-        * @return void
-        */
-        void Beep();
-
-#ifndef RD_MULTIPLE_DRIVE
-        /**
-        * Unlocks MMC
-        * @param None
-        * @return void
-        */
-        void RunUnlockNotifierL( TSysApMemoryCardStatus aMemoryCardStatus = ESysApMemoryCardStatusNotKnown );
-
-        /**
-        * From MSysApMemoryCardObserver.
-        * Gets called by CSysApMMCObserver when an MMC is inserted/removed
-        * @return void
-        */
-        void MMCStatusChangedL();
-
-        /**
-        * Shows "MMC removed..." dialogs
-        * @param None
-        * @return void
-        */
-        void ShowMMCDismountedDialogL();
-#else // RD_MULTIPLE_DRIVE
-
-        /**
-        * Updates PS key during boot
-        * @return void
-        */
-        void MMCInsertedL();
-
-        /**
-        * Unlocks MMC
-        * @param None
-        * @return void
-        */
-        void RunUnlockNotifierL();
-
-        /**
-        * From MSysApMemoryCardObserver.
-        * Gets called by CSysApMMCObserver when an MMC is inserted/removed
-        * @param aDrive Changed drive
-        * @return void
-        */
-        void MMCStatusChangedL( TInt aDrive );
-
-        /**
-        * Shows "MMC removed..." dialogs
-        * @param aDrive Drive to dismount
-        * @param aEjectType Eject type used for the drive
-        * @return void
-        */
-        TBool ShowMMCDismountedDialogL(
-            TInt aDrive, CSysApDriveList::TDriveEjectType aEjectType );
-#endif // RD_MULTIPLE_DRIVE
-
-        /**
-        * Called after confirming dialog "MMC removed..."
-        * @param None
-        * @return void
-        */
-        void MMCDismountedDialogConfirmed();
-
-        /**
-        * Gets called by CSysApSharedDataObserver when "Eject" is started
-        * or finished in File Manager application.
-        * @param None
-        * @return void
-        */
-        void EjectStarted( TBool ejectStarted );
-
-    private:
-        /**
-        * EPOC default constructor.
-        * @param None
-        * @return void
-        */
-        void ConstructL();
-
-    private:
-
-#ifndef RD_MULTIPLE_DRIVE
-
-        /**
-        * Resolves process UID based on its thread id
-        *
-        * @since S60 3.1
-        * @param aThreadId id of the thread
-        * @return TInt32 process UID
-        */
-        TInt32 ResolveUidFromThread( TUint aThreadId ) const;
-
-        /**
-        * Called recursively when shutting down apps in Hot Swap
-        * @param None
-        * @return void
-        */
-        void CloseUIAppsInHotSwapL();
-
-        /**
-        * Called by CloseUIApplicationsHotSwapL when completing
-        * shutting apps
-        * @param None
-        * @return void
-        */
-        void CompleteAppsShuttingInHotSwapL();
-#endif // RD_MULTIPLE_DRIVE
-
-     public:
-
-        /**
-        * Initializes parameters used in shutting down apps in BT SAP
-        * @param None
-        * @return void
-        */
-        void InitCloseSimApplicationsL();
-
-      private:
-
-        /**
-        * Called recursively when shutting down apps in BT SAP
-        * @param None
-        * @return void
-        */
-        void CloseSimApplicationsL();
-
-        /**
-        * Called to re-envoke CloseSimApplicationsL()
-        * @param None
-        * @return void
-        */
-        static TInt DoCloseSimApplicationsAfterCallBack( TAny* aObject );
-
-    private:
-        /**
-        * Takes care of command handling.
-        * @param aCommand command to be handled
-        * @return void
-        */
-        void HandleCommandL( TInt aCommand);
-
-        /**
-        * handles key events
-        * @param TKeyEvent& aKeyEvent
-        * @param TEventCode aType
-        * @return TKeyResponse
-        */
-        TKeyResponse HandleKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );
-
-    private:
-        // By default, prohibit copy constructor
-        CSysApAppUi( const CSysApAppUi& );
-
-        // Prohibit assigment operator
-        CSysApAppUi& operator= ( const CSysApAppUi& );
-
-    private:
-        void HandleApplicationSpecificEventL(TInt aType,const TWsEvent& aEvent);
-        /**
-        * Gets called by ConstructL function to set initial states to indicators etc
-        * Needed state information is got from Shared Data and status pane's components
-        * are set to the correct states.
-        * @param None
-        * @return void
-        */
-        void InitializeStatusPaneAreaL();
-
-        /**
-        * Gets called by HandleKeyEventL after detecting a long press of powerkey.
-        * According to current state of the device desides if it is time to either
-        * shutdown or make startup (from charging state ) to normal state
-        * @param None
-        * @return void
-        */
-        void HandleLongPowerKeyPressedL();
-
-        /**
-        * Gets called by HandleKeyEventL after a short press of powerkey.
-        * According to current state of the device desides if it is time to
-        * either switch lights on and show mode selection dialog(normal state)
-        * or to shutdown the phone (in alarm state).
-        * @param None
-        * @return void
-        */
-        void HandleShortPowerKeyPressedL();
-
-        /**
-        * Frees SysAp's reserved memory, closes connections to servers etc.
-        * @param None
-        * @return void
-        */
-        void FreeResources();
-
-    public:
-
-        /**
-        * Displays a UI query.
-        * @param TSysApConfirmationQueryIds
-        * @param aValue query related value
-        * @return void
-        */
-        void ShowQueryL( const TSysApConfirmationQueryIds aQueryId,
-            const TDesC& aValue = KNullDesC );
-
-        /**
-        * Displays a UI note.
-        * @param TSysApNoteIds aSysApNoteIds
-        * @return void
-        */
-        void ShowUiNoteL( const TSysApNoteIds aNote ) const;
-
-        /**
-        * Displays a "Charger connected" note.
-        * @param None
-        * @return void
-        */
-        void ShowChargingNoteL();
-
-        /**
-        * Handles charger related notes
-        * @param TInt : KPSUidChargerCStatusValue
-        * @return void
-        */
-        void HandleChargerNotesL( const TInt aValue );
-
-        /**
-        * Displays a "Selected profile" note.
-        * @param None
-        * @return void
-        */
-        void ShowProfileNoteL();
-
-        /**
-        * Cancels a UI wait note.
-        * @param None
-        * @return void
-        */
-        void CancelWaitNote();
-
-        /**
-        * Cancels the global list query
-        * @param None
-        * @return void
-        */
-        void CancelGlobalListQuery();
-
-        /**
-        * Updates signal bars to the value cached by Etel connector.
-        * @return void
-        */
-        void UpdateSignalBarsL();
-
-        /**
-        * Updates signal bars to specified state.
-        * @param TInt aState Number of bars or KAknSignalOffLineMode
-        * @return void
-        */
-        void UpdateSignalBarsL( const TInt aState );
-
-        /**
-        * Gets called by HandleSystemAgentEventL to singal availability indicator
-        * ie. Gprs state icon or common signal icon.
-        * @param None
-        * @return void
-        */
-        void SetSignalIndicatorL();
-
-        /**
-        * Gets called by SetSignalIndicatorL() when in GSM network
-        * @param None
-        * @return void
-        */
-        void SetSignalIndicatorGsmL();
-
-        /**
-        * Gets called by SetSignalIndicatorL() when in Wcdma network
-        * @param None
-        * @return void
-        */
-        void SetSignalIndicatorWcdmaL();
-
-        /**
-        * Handles GPRS suspend/resume notes if feature supported.
-        * ie. Gprs state icon or common signal icon.
-        * @param None
-        * @return void
-        */
-        void HandleGprsNotesL();
-
-        /**
-        * Returns the current bluetooth power mode setting using CSysApSharedDataObserver
-        * @param None
-        * @return TInt
-        */
-        TInt BluetoothPowerMode() const;
-
-        /**
-        * Activates the profile given as a parameter
-        * @param TInt aProfileId
-        * @return void
-        */
-        void ActivateProfileL( const TInt aProfileId ) const;
-
-        /**
-        * Activates the profile saved in iProfileToBeActivated.
-        * @param None
-        * @return void
-        */
-        void ActivateOnlineProfileL() const;
-
-        /**
-        * Checks whether Offline Mode is activated
-        * @param TBool
-        * @return void
-        */
-        TBool OfflineModeActive();
-
-        /**
-        * Tolds Offline Mode controller not to activate BT
-        * when next going online.
-        * @param None
-        * @return void
-        */
-        void DoNotActivateBt();
-
-        /**
-        * Switches BT module on/off using BT Engine
-        * @param TBool: ETrue = on, EFalse = off
-        * @return void
-        */
-        TInt SetBtPowerState( TBool aBtState );
-
-        /**
-        * Sets iKeyLockOnBeforeCall = EFalse.
-        * @param None
-        * @return void
-        */
-        void DoNotEnableKeylock();
-
-#ifdef RD_MULTIPLE_DRIVE
-        /*
-        * Starts wait note for eject
-        */
-        void ShowEjectWaitNoteL(  TInt aDriveToEject );
-
-        /*
-        * Checks is eject query visible
-        */
-        TBool IsEjectQueryVisible();
-#endif // RD_MULTIPLE_DRIVE
-
-        /**
-        * Gets called by CSysApSharedDataObserver when "Eject" is selected
-        * in File Manager application.
-        * @param aDrive Drive to eject
-        * @return void
-        */
-        void EjectUsed( TInt aDrive );
-
-        /**
-        * MMC Hot Swap Ejection from powerkey menu was canceled
-        * @param None
-        * @return void
-        */
-        void EjectMMCCanceled();
-
-    private:
-
-        /**
-        * Gets currently active profile's name.
-        * @param TPtr aProfileName
-        * @return void
-        */
-        void ActiveProfileNameL( TPtr aProfileName );
-
-    public:
-
-        /**
-        * Gets called by HandleSystemAgentEventL to update battery bars.
-        * @param TInt aState
-        * @return void
-        */
-        void UpdateBatteryBarsL( const TInt aState );
-
-        /**
-        * Gets called by HandleSystemAgentEventL when profile was changed.
-        * Profile selected Global Note is shown.
-        * @param TInt aValue
-        * @return void
-        */
-        void HandleProfileChangedL( const TInt aValue );
-
-        /**
-        * Checks if the active profile is silent and updates CSysApLightsController
-        * if needed.
-        * @param None
-        * @return void
-        */
-        void CheckSilentModeL();
-
-        /**
-        * Gets called by CSysApOfflineModeController when activation/deactivation
-        * of Offline Mode fails
-        * @param TBool aOffline
-        * @return void
-        */
-        void RestoreProfileL( const TBool aOffline );
-
-        /**
-        * Returns the id of the active profile.
-        * @param None
-        * @return Int
-        */
-        TInt ActiveProfileId();
-
-        /**
-        * Gets called when the value of the SD key KGSDisplayLightsTimeout
-        * changes
-        * @param TInt : lights timeout in seconds
-        * @return void
-        */
-        void DoLightsTimeoutChangedL( const TInt aTimeout );
-
-    private:
-
-        /**
-        * Checks whether it is necessary to change profiles in case an accessory
-        * was connected/disconnected while the device was powered down.
-        *
-        * @param TInt aValue
-        * @return void
-        */
-        void HandleAccessoryProfileInStartupL( );
-
-    public:
-        /**
-        * Gets called by HandleSystemAgentEventL to Disable keylock when devicelock is activated.
-        * This is done already when device lock is activated because this
-        * @param None
-        * @return void
-        */
-        void SetDeviceLockEnabledL( const TBool aLockEnabled );
-
-    private:
-
-        /**
-        * Gets called by HandleShortPowerKeyPressedL to display the power key popup menu
-        * @param None
-        * @return void
-        */
-        void ShowPowerKeyPopUpMenuL();
-
-        /**
-        * Does what is needed to do inside SysAp before actually doing
-        * other shutdown related things. This is used when shutdown image is enabled.
-        * @param None
-        * @return void
-        */
-        void PrepareForShutdownImage();
-
-        /**
-        * Does what is needed to do inside SysAp before actually doing
-        * other shutdown related things. This is used when shutdown animation is enabled.
-        * @param None
-        * @return void
-        */
-        void PrepareForShutdownAnimation();
-
-        /**
-        * Show shutdown animation
-        *
-        * @param
-        * @return ETrue if animation is enabled
-        */
-    #ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
-        void
-    #else // RD_STARTUP_ANIMATION_CUSTOMIZATION
-        TBool
-    #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-        ShowAnimationL();
-
-        /**
-        * Makes Status pane visible/invisible when needed and changes it's layout between Charging/Alarm
-        * @param None
-        * @return void
-        */
-        void SetStatusPaneLayoutL( const TSysApPhoneState aState );
-
-        /**
-        * Checks from current Symbian swstate if it is ok to initiate shutdown
-        * @param None
-        * @return const TBool
-        */
-        TBool OkToInitiateShutdown();
-
-        /**
-        * Shows shutdown animation or shutdown image
-        * @param None
-        * @return void
-        */
-        void PrepareForCompleteShutdown();
-
-        /**
-        * Makes the end part of shutdown sequence.
-        * @param None
-        * @return void
-        */
-        void CompleteShutdown( const TBool aReset = EFalse, const TInt aResetReason = KDummyReason );
-
-        /**
-        * Sets calls forwarding indicators on/off accrding to aCallsForwardingState
-        * @param TInt aCallsForwardingState
-        * @return void
-        */
-        void DoSwStateNormalConstructionL();
-
-    public:
-
-        /**
-        * Starts an application or brings an already running application
-        * to foreground.
-        * @param TUid: UID of the application that is activated
-        * @return void
-        */
-        void ActivateApplicationL( const TUid aUid );
-
-        void HandleCurrentCallStateChangeL( TInt aCurrentCallState );
-
-        void DoSimChangedFromPreviousBootL();
-
-        /**
-        * Gets called in SysAp construction or when SysAp gets a SA/P&S notification
-        * @param const TInt: indicator status
-        * @return void
-        */
-        void HandleLocationPrivacyIndicatorL( const TInt aState );
-
-        /**
-        * Return value of the__SIMCARD feature
-        * @param None
-        * @return TBool
-        */
-        TBool SimSupported();
-
-        /**
-        * Notify CSysApLightController of the empty battery.
-        * @param None
-        * @return void
-        */
-        void BatteryEmptyL();
-
-        /**
-        * Prompt starter to change mode
-        * @param aState The new state
-        * @return KErrArgument if the state change is illegal (from current state
-        * it is not possible to change to the requested state), KErrNone if the
-        * global state change has been successfully initiated.
-        */
-        TInt SetStarterState( const RStarterSession::TGlobalState aState );
-
-        /**
-        * Creates the device name string for BT Sap disconnect prompt.
-        * @return device name string.
-        */
-        HBufC* GetBtSapDeviceNameL();
-
-        /**
-        * Handle alarm indicator
-        * @param aShowIndicator If ETrue, indicator is show, otherwise it is hidden.
-        */
-        void ShowAlarmIndicatorL( TBool aShowIndicator );
-
-        /**
-        * Informs lights controller that flip has been opened/close
-        * @param aFlipOpen ETrue if flip is open, EFalse otherwise
-        */
-        void SetFlipOpenL( TBool aFlipOpen );
-
-        /**
-        * Creates a virtual flip key event that is passed to the key management
-        * of SysAp.
-        *
-        * @since S60 3.2
-        * @param aFlipOpen ETrue if flip is open, EFalse otherwise
-        * @return None
-        */
-        void SimulateFlipKeyEventL( TBool aFlipOpen );
-
-        /**
-        * Informs lights controller that grip has been opened/close
-        * @param aGripOpen ETrue if grip is open, EFalse otherwise
-        */
-        void SetGripOpenL( TBool aGripOpen );
-
-        /**
-        * Sets the status of the Central Repository key
-        * KCRUidCoreApplicationUIs / KCoreAppUIsNetworkConnectionAllowed
-        * @param TInt
-        * @return void
-        */
-        void SetNetworkConnectionAllowed( TCoreAppUIsNetworkConnectionAllowed aNetworkConnectionAllowed );
-
-        /**
-        * Get pointer to RTelServer
-        *
-        * @return pointer to RTelServer if iSysApEtelConnector is initialized. Otherwise return NULL.
-        */
-        RTelServer* GetTelServer();
-
-        /**
-        * Show WLan indicator
-        *
-        * @param aValue The value of KPSWlanIndicator PS key.
-        */
-        void HandleWlanIndicatorL( TInt aValue );
-
-        /**
-        * Show TARM indicator
-        *
-        * @param aValue The value of KCoreAppUIsTarmIndicator PS key
-        */
-        void HandleTarmIndicatorL( TInt aValue );
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-        /**
-        * Continue shutdown animation showing after sync request
-        */
-        void ShutdownAnimationSyncOK();
-#endif RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-        /**
-        * Skip shutdown animation (i.e. stop showing it). Initiated by CoverUI.
-        */
-        void SkipShutdownAnimation();
-
-        /**
-        * Notifies CoverUI about skipping shutdown animation.
-        */
-        void NotifyShutdownAnimationSkip();
-
-        /**
-        * Check cover display support
-        *
-        * @return ETrue if cover display is supported, EFalse otherwise
-        */
-        TBool CoverDisplaySupported();
-
-        /**
-        * Returns reference to RStarterSession
-        * RStarterSession is connected when this method is called
-        * for the first time.
-        *
-        * Always (except when freeing resources) access the starter session via this method,
-        * don't use the member variable directly.
-        *
-        * @return reference to RStarterSession
-        */
-        RStarterSession& StarterSession();
-
-        /**
-        * Returns reference to SysAp's CenRep controller
-        *
-        * @since S60 3.1
-        * @param None
-        * @return reference to CSysApCenRepController
-        */
-        CSysApCenRepController& CenRepController();
-
-        /**
-        * Ignore zero network bars signal notifies.
-        * This is needed in BT SAP mode.
-        *
-        * @param aIgnore If ETrue, ignore any future zero network bars notifications.
-        */
-        void IgnoreZeroNetworkBarNotifications(TBool aIgnore);
-
-        /**
-        * Check if BT SAP is enabled
-        *
-        * @return ETrue if BT SAP is enabled, EFalse otherwise
-        */
-        TBool BtSapEnabled();
-
-        /**
-        * Deactivate BT when changing to normal mode.
-        * Can only be used during startup, has no effect after that.
-        */
-        void DeactivateBT();
-
-    private:
-        /**
-        * Returns reference to SysAp's keylock session
-        * RAknKeylock2 session is connected when this method is called
-        * for the first time.
-        *
-        * Always (except when freeing resources) access the keylock session via this method,
-        * don't use the member variable directly.
-        *
-        * @since S60 3.1
-        * @param None
-        * @return reference to RAknKeylock2
-        */
-        RAknKeylock2& KeyLock();
-
-
-
-#ifdef __SYSAP_MODULE_TEST
-
-        /**
-        * Can be used for showing a CAknGlobalNote in module tests
-        * @param noteText : text to be shown in the note
-        * @return void
-        */
-        void ModuleTestShowUiNoteL( const TDesC& noteText ) const;
-#endif
-
-        /**
-        * shows power down note before displaying shutdown image
-        * @param: none
-        * @return void
-        */
-        void ShowShutdownNoteL();
-
-        /** Return ETrue if the global system state is one of the 'normal'
-        * states: ESwStateNormalRfOn, ESwStateNormalRfOff or
-        * ESwStateNormalBTSap.
-        */
-        TBool IsStateNormal() const;
-
-        /**
-        * Returns max of three integers
-        * @param: TInt
-        * @return void
-        */
-        TInt Max( const TInt aA, const TInt aB, const TInt aC );
-
-        /**
-        * Displays shutdown image.
-        * This method is just a nonleaving implementation,
-        * calls ShowShutdownImageL for performing the task.
-        *
-        * @since S60 3.1
-        * @param aBitmapId  bitmap identifier
-        * @return TInt an error value
-        * @see CSysApAppUi::ShowShutdownImageL
-        */
-        TInt ShowShutdownImage( TInt aBitmapId );
-
-        /**
-        * Displays shutdown image. If a CSysApShutdownImage instance
-        * does not exist, it will be created.
-        *
-        * @since S60 3.1
-        * @param aBitmapId  bitmap identifier
-        * @return None
-        * @leave Symbian error code
-        */
-        void ShowShutdownImageL( TInt aBitmapId );
-
     private: // from MSysapCallback
         /**
         * Executes a command in SysAp.
@@ -1258,19 +169,60 @@
         * @see MSysapCallback::TSysapQuery
         */
         void ExecQueryL( TSysapQuery aQuery, TDes8& aReturn, const TDesC8& aParam );
-
-    public:
+        
+//    private:
+        /**
+        * EPOC default constructor.
+        * @param None
+        * @return void
+        */
+    public: 
+        void ConstructL();
+        
+    private: // from CEikAppUi
+        /**
+        * Handles a change to the application's resources which are shared across the environment.
+        *
+        * @since S60 3.1
+        * @param aType The type of resources that have changed.
+        * @return None.
+        */
+//        void HandleResourceChangeL(TInt aType);
+        
+    private:
         /**
-        * Sets HAC (Hearing Aid Compatibility) indicator according to its CenRep-setting
-        * state.
-        * HAC indicator is not displayed if an accessory is connected.
-        *
-        * @param None
-        * @return None
+        * Takes care of command handling.
+        * @param aCommand command to be handled
+        * @return void
+        */
+        void HandleCommandL( TInt aCommand);
+
+        /**
+        * handles key events
+        * @param TKeyEvent& aKeyEvent
+        * @param TEventCode aType
+        * @return TKeyResponse
         */
-        void SetHacIndicatorL();
+        TKeyResponse HandleKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );
+      
+     public:
+     	//	void CallFromMain();
+     		
+     		 /**
+        * Returns the state of keylock
+        * @param none
+        * @return TBool the state of keylock
+        */
+        TBool KeyLockState() const;
 
         /**
+        * Returns the state of devicelock
+        * @param none
+        * @return TBool the state of devicelock
+        */
+        TBool DeviceLockState() const;
+        
+        /**
         * Returns reference to SysAp's internal feature manager.
         *
         * @since S60 3.1
@@ -1278,387 +230,198 @@
         */
         CSysApFeatureManager& SysApFeatureManager();
         
-        /**
-        * Handles response to power save activation query.
-        *
-        * @param aEnable If ETrue, the user has accepted the query.
-        */
-        void HandleActivatePsmQueryResponse( TBool aEnable );
-
-        /**
-        * Handles response to power save deactivation query.
-        *
-        * @param aDisable If ETrue, the user has accepted the query.
-        */
-        void HandleDeactivatePsmQueryResponse( TBool aDisable );
-
-    private: // from CAknAppUi
-        /**
-        * Handles a change to the application's resources which are shared across the environment.
-        *
-        * @since S60 3.1
-        * @param aType The type of resources that have changed.
-        * @return None.
-        */
-        void HandleResourceChangeL(TInt aType);
-
-    private:
-        /**
-        * Shows and hides the memory card indicator depending on whether the memory card is inserted or not.
-        *
-        * @since S60 3.1
-        * @param None.
-        * @return None.
-        */
-        void SetMemoryCardIndicatorL();
-
-        /**
-        * Returns whether IHF has been enabled.
-        * Creates audio routing observer if it does not exist..
-        *
-        * @since S60 3.2
-        * @return TBool ETrue if IHF is enabled
+                /*
+        * Called by SysApLightsController when the lights are switced on/off
+        * @param aActivate If ETrue forwarding is activated, otherwise deactivated
+        * @return void
         */
-        TBool IhfEnabledL();
-
-#ifdef RD_MULTIPLE_DRIVE
-        void UpdateInsertedMemoryCardsL();
-#endif // RD_MULTIPLE_DRIVE
-
-    	/**
-    	* Handles setup of USB charger from given charging status.
-    	*
-    	* @since S60 3.2
-    	* @param aValue Given charging status
-    	*/
-        void HandleUsbCharger( const TInt aValue );
-
-    public:
-        /**
-        * Sets USB connection attach status.
-        * This prevents double beep when USB file transfer gets activated.
-        *
-        * @since S60 3.2
-        * @param aUsbConnected ETrue if USB cable has just been attached, otherwise EFalse
-        */
+        void ActivateKeyeventForwardingForLights(TBool aActivate);
+        
+        TBool IsEncryptionOperationOngoingL() const;
+//        void ConnectToFileServerL();
+//        void ConnectToWindowServerL();
+        void ShowExampleUiNoteL ( const TDesC& noteText )const;
+        void ShowNotificationDialog(const TDesC& noteText)const;
+        void PopupNote();
+//        void CreateWindowGroup();
+        TBool ResourcesFreed() const;
+        void ShowUiNoteL( const TSysApNoteIds aNote ) const;        
+        TInt StateOfProperty( const TUid& aCategory, const TUint aKey ) const;
+        TBool OfflineModeActive();
+        void GoOnlineL( TBool aDoProfileChange = ETrue );
+        void GoOfflineL();
+        void SwitchFromOnlineToOfflineModeL();
+        
+        void DoStateChangedL( const RStarterSession::TGlobalState aSwState  );
+        TInt SetStarterState( const RStarterSession::TGlobalState aState );
+        TInt BluetoothPowerMode() const;
+        void SetNetworkConnectionAllowed( TCoreAppUIsNetworkConnectionAllowed aNetworkConnectionAllowed );
+        RStarterSession& StarterSession();
+        TInt SetBtPowerState( TBool aBtState );
+        TBool SimSupported();
+        TBool BtSapEnabled();
+        void OfflineModeChangedL();
+        TBool UiReady() const;
+        void DoShutdownL( const TBool aReset, const TInt aResetReason );
+        TBool IsDeviceModeKey( const TKeyEvent& aKeyEvent ) const;
         void SetUsbAttachStatus( const TBool aUsbAttached );
-
-        /**
-    	* Returns whether the key event is considered to be a device mode key event,
-    	* which usually causes a transition in the device mode (e.g. grip, flip or twist).
-    	*
-    	* @since S60 3.2
-    	* @param aKeyEvent key event
-    	* @return TBool ETrue key event is considered to be a device mode key
-    	*               EFalse not a device moed key
-    	*/
-    	TBool IsDeviceModeKey( const TKeyEvent& aKeyEvent ) const;
-
-    	/**
-    	* Returns whether resources (objects, server connections) owned by this
-    	* class has been freed.
-    	*
-    	* @since S60 3.2
-    	* @return TBool ETrue if resource deallocation has been performed.
-    	*/
-    	TBool ResourcesFreed() const;
-
-    	/**
-    	* Returns pointer to CSysApEtelConnector.
-    	*
-    	* @since S60 3.2
-    	* @return pointer to CSysApEtelConnector instance owned by this class.
-    	*         NULL if the object creation has failed.
-    	*/
-    	CSysApEtelConnector* EtelConnector() const;
-    	
-    	/**
-    	* Returns reference to USB charger detector, TSysApUsbChargerDetector.
-    	*
-    	* @since S60 3.2
-    	* @return Reference to USB charger detector.
-    	*/
         TSysApUsbChargerDetector& UsbChargerDetector();
-
-    	/**
-    	* Sets envelope indicator according to current messaging status.
-    	*
-    	* @since S60 3.2
-    	*/
-        void SetEnvelopeIndicatorL();
-
-    	/**
-    	* Handles value changes of the key KHWRMBatteryStatus.
-    	*
-    	* @since S60 3.2
-    	* @param aValue the updated key value
-    	*/
-    	void HandleBatteryStatusL( const TInt aValue );
         
-        /**
-    	* Handles value changes of the key KHWRMChargingStatus.
-    	*
-    	* @since S60 3.2
-    	* @param aValue the updated key value
-    	*/
-        void HandleChargingStatusL( const TInt aValue );
-        
-        /**
-        * Cancel the specified query if it is active.
-        *
-        * @param aQueryId ID of the query that must be cancelled.
-        *                 If ESysApNoQuery is given, the active query is cancelled.
-        *                 without checking its ID.
-        */
-        void CancelQuery( TSysApConfirmationQueryIds aQueryId );
-    
-    private:
-        // from MSysApPsmControllerNotifyCallback
-        void NotifyPowerSaveModeL( TSysApPsmStatus aStatus );
-
-    private:
-        /**
-        * Get the logs observer. Created if does not exist.
-        * 
-        * @since S60 3.2
-        * @return reference to CSysApCenRepLogsObserver object
-        */
-        CSysApCenRepLogsObserver& CSysApAppUi::LogsObserverL();
-
-    private: //Data members
+        void HandleAccessoryConnectedL( TAccMode aAccessoryState );
 
-        /*****************************************************
-         * Series 60 Customer / DOS
-         * Series 60 Domestic OS API
-         *****************************************************/
-
-        CSysApLightsController*         iSysApLightsController;
-
-        CSysApPubSubObserver*           iSysApPubSubObserver;
-        CSysApProfileObserver*          iSysApProfileObserver;
+        void HandleAccessoryDisconnectedL();
+        void DoLightsTimeoutChangedL( const TInt aTimeout );
+        void SetHacIndicatorL();
+        void DoNotActivateBt();
+        void SetIhfIndicatorL();
+		void HandleLongPowerKeyPressedL();
+        void IgnoreZeroNetworkBarNotifications(TBool aIgnore);
+        void InitCloseSimApplicationsL();
+        void CloseSimApplicationsL();
+        void DoSimChangedFromPreviousBootL();
+        void ShowAlarmIndicatorL( TBool aShowIndicator );
+        void AlertUiAlertingL( const TBool aAlerting );
+        void HandleForcedLightsVTRequireL( const TInt aLightsParameter ) const;
+        void HandleForcedLightsSSRequireL( const TInt aLightsParameter ) const;
+        void HandleForcedLightsATCRequireL( const TInt aLightsParameter ) const;
+        void HandleLightsRequireL() const;
+        void AlertUiKeyLockOff( const TBool aKeyLockOff );
+        void DoNotEnableKeylock();
+        void SwitchLightsOnSoftRejectL();
+        void SetDeviceLockEnabledL( const TBool aLockEnabled );
+        void HandleBatteryStatusL( const TInt aValue );
+        void BatteryEmptyL();
+        void ShowQueryL( const TSysApConfirmationQueryIds aQueryId,
+            const TDesC& aValue = KNullDesC );
+        void HandleChargingStatusL( const TInt aValue );
+        void HandleChargerNotesL( const TInt aValue );
+        void UpdateBatteryBarsL( const TInt aState );
+        void ShowChargingNoteL();
+        void HandleCurrentCallStateChangeL( TInt aCurrentCallState );
+        TBool IsEmergencyCall();
+        CSysApCenRepController& CenRepController();
+        void HandleWlanIndicatorL( TInt aValue );
 
-        CSysApCenRepLightSettingsObserver*  iSysApCenRepLightSettingsObserver;
-        CSysApCenRepLogsObserver*                iSysApCenRepLogsObserver;
-        CSysApCenRepBtObserver*                  iSysApCenRepBtObserver;
-        CSysApCenRepHacSettingObserver* iSysApCenRepHacSettingObserver;
-//        CSysApCenRepFmTxObserver*      iSysApCenRepFmTxObserver;
-        CSysApCenRepController*                  iSysApCenRepController;
-        CSysApStartupController*        iSysApStartupController;
-        CSysApConnectionMonitorObserver*	iSysApConnectionMonitorObserver;
-        CSysApPowerKeyMenuObserver*     iSysApPowerKeyMenuObserver;
-        CSysApSsSettingsObserver*       iSysApSsSettingsObserver;
-        CSysApShutdownImage*            iSysApShutdownImage;
-        CSysApShutdownAnimation*        iSysApShutdownAnimation;
-        CSysApEtelConnector*            iSysApEtelConnector;
-        CSysApAccessoryObserver*        iSysApAccessoryObserver;
-        CSysApMsgSimMemLowQuery*        iSysApMsgSimMemLowQuery;
-        CSysApWaitNote*                 iSysApWaitNote;
-        CSysApConfirmationQuery*        iSysApConfirmationQuery;
-        CSysApConfirmationQuery*        iSysApConfirmationQueryForRestart;
-        CSysApFeatureManager*           iSysApFeatureManager;
-        MSysApOfflineModeController*    iSysApOfflineModeController;
-        CSysApMMCObserver*              iSysApMMCObserver;
-        CSysApNspsHandler*              iSysApNspsHandler;
-        MSysApUsbIndicator*             iSysApUsbIndicatorController;
-        MSysApBtController*             iSysApBtController;
-        MSysApBtSapController*          iSysApBtSapController;
-        MSysApLocationPrivacyIndicator* iSysApLocationPrivacyIndicator;
-        CAknBatteryNotify*              iBatteryNotify;
-        CAknSignalNotify*               iSignalNotify;
-        CAknGlobalListQuery*            iGlobalListQuery;
+        void SetKeyLockEnabledL();
+        void SetKeyLockDisabledL();
+        void SetLightsOnUnlockNoteL();
+        void SetLightsOnEcsQueryL();
+        void SetLightsOnSecurityQueryL();  
+        TBool CheckLongPowerKeyPressed();
+        TBool ReleasePowerMenuCustomDialogMemory();
+        
+#ifdef SYSAP_USE_STARTUP_UI_PHASE        
+        /**
+        * Called when UI is ready after boot.
+        */
+        void HandleUiReadyAfterBootL();
 
-        CSystemLock*                    iSysApSystemLock;
-        MProfileEngine*                 iProfileEngine;
-        MProfilesNamesArray*            iProfileNamesArray;
-        RStarterSession                 iStarterSession;
-        RAknKeylock2                    iKeyLock;
-#ifndef RD_MULTIPLE_DRIVE
-        CAknMemoryCardDialog*           iMemoryCardDialog;
-#endif // RD_MULTIPLE_DRIVE
-        TInt                            iCapturedEKeyPowerOff;
-        TInt                            iCapturedEKeyPowerOffUpAndDowns;
-        TInt                            iCapturedAppskey;
-        TInt                            iCapturedAppskeyUpAndDowns;
+#endif // SYSAP_USE_STARTUP_UI_PHASE
+
+     
+     private:
+         /**
+         * Frees SysAp's reserved memory, closes connections to servers etc.
+         * @param None
+         * @return void
+         */
+         void FreeResources();
+         TBool OkToInitiateShutdown();
 
 
-        TInt                            iNumberOfProfileNamesInPowerKeyMenu;
-
-        TBool                           iPowerkeyMenuLockKeypadShown;
-        TBool                           iPowerkeyMenuExitSapShown;
-        TBool                           iPowerkeyMenuLockSystemShown;
-        TBool                           iPowerkeyMenuEjectShown;
-
-        TInt                            iPowerkeyMenuLockKeypadSelection;
-        TInt                            iPowerkeyMenuExitSapSelection;
-        TInt                            iPowerkeyMenuLockSystemSelection;
-#ifndef RD_MULTIPLE_DRIVE
-        TInt                            iPowerkeyMenuEjectSelection;
-#endif // RD_MULTIPLE_DRIVE
+         void CompleteShutdown( const TBool aReset = EFalse, const TInt aResetReason = KDummyReason );
+         void PrepareForShutdownImage();
+         TInt ShowShutdownImage( TInt aBitmapId );
+         void ShowShutdownImageL( TInt aBitmapId );
+         TBool IhfEnabledL();
+         void DoSwStateNormalConstructionL();
+         static TInt DoCloseSimApplicationsAfterCallBack( TAny* aObject );
+         
+         // from MSysApPsmControllerNotifyCallback
+         void NotifyPowerSaveModeL( TSysApPsmStatus aStatus );
+         
+         void HandleUsbCharger( const TInt aValue );
+         TBool IsStateNormal() const;
+         void HandleAccessoryProfileInStartupL( );
+         
+         CSysApCenRepLogsObserver& CSysApAppUi::LogsObserverL();
 
-        TInt                            iProfileToBeActivated;
-        TInt                            iActiveProfileBeforeOfflineMode;
-
-        TInt                            iApplicationScanningRoundNumberInBtSap;
-        TBool                           iTimeToKillInBtSap;
+        
+     private:
+//          CSysApWsClient*                 iSysApWsClient;
+          CSysApLightsController*         iSysApLightsController;
+          CSysApFeatureManager*           iSysApFeatureManager;
+          CSysApNspsHandler*              iSysApNspsHandler;
+          CSysApPubSubObserver*           iSysApPubSubObserver;
+    
+          CSysApDefaultKeyHandler*          iSysApDefaultKeyHandler;
+//          RWindowGroup                      groupWin;
+          CSysApStartupController*        iSysApStartupController;
+          MSysApOfflineModeController*    iSysApOfflineModeController;
+          RStarterSession                 iStarterSession;
+          TSysApUsbChargerDetector        iSysApUsbChargerDetector;
+          CSysApAccessoryObserver*        iSysApAccessoryObserver;
+          CSysApShutdownImage*            iSysApShutdownImage;
+          CSysApKeySndHandler*            iSysApKeySndHandler;
+          CSysApCenRepController*                  iSysApCenRepController;
+          CSysApCenRepLightSettingsObserver*  iSysApCenRepLightSettingsObserver;
+          CSysApCenRepBtObserver*                  iSysApCenRepBtObserver;
+          CSysApCenRepHacSettingObserver* iSysApCenRepHacSettingObserver;
+          
+          CSysApAudioRoutingObserver* iSysApAudioRoutingObserver;
+          CSysApPsmController* iSysApPsmController;
+		  CHbSymbianVariant* iVariantAccState ;
+          CSysApSsSettingsObserver*       iSysApSsSettingsObserver;
+          CSystemLock*                    iSysApSystemLock;
+          CSysApCenRepCallForwardingObserver* iSysApCenRepCallForwardingObserver;
+          CSysApBatteryInfoController* iSysApBatteryInfoController;
+          MSysApBtSapController*          iSysApBtSapController;
+          CPeriodic*                      iSapTimer;
+          MSysApBtController*             iSysApBtController;
+          CSysApCenRepLogsObserver*                iSysApCenRepLogsObserver;
+		  MSysApUsbIndicator*             iSysApUsbIndicatorController;
+		  CKeyguardAccessApi*             iKeyguardController;
+		  CHbDevicePowerMenuSymbian*            iPowerMenuDialog;
+	      CSysApKeyManagement*            iSysApKeyManagement;
+		  
+//	      CSysApDriveList* iSysApDriveList;
 
-        CAknGlobalNote*                 iProfileNote;
-        TInt                            iProfileNoteId;
-
-        TBool                           iLastPowerKeyWasShort;
-        TBool                           iIgnoreNextPowerKeyUpEvent;
-        TBool                           iIgnoreNextPowerKeyRepeats;
-        TBool                           iPowerKeyPopupMenuActive;
-        TBool                           iDisablePowerkeyMenu;
-        TBool                           iPowerkeyMenuPowerOffShown;
-
+     private:         
+        TBool                           iPowerKeyPopupMenuActive;   
         TBool                           iDeviceLockEnabled;
         TBool                           iKeyLockEnabled;
         TBool                           iKeyLockOnBeforeCall;
         TBool                           iKeyLockOnBeforeAlarm;
         TBool                           iKeyLockOnBeforeCradle;
-        TBool                           iShowkeypadActivatedNoteAfterSoftReject;
-
-        TBool                           iEmergencyCallActive;
+        TBool                           iResourcesFreed;        
+        TInt                            iCapturedEKeyPowerOff;
+        TInt                            iCapturedEKeyPowerOffUpAndDowns;
+        TBool                           iOfflineModeActive;
+        TBool                           iShutdownStarted;
+        
+        TBool                           iIgnoreNextPowerKeyUpEvent;  // need to be added this flag in maliks client side apis.
+        TBool                           iLastPowerKeyWasShort;
+        TBool                           iPowerKeyPopupMenuDismissed; // need to be added this flag in malik implementation.
+        TInt                            iKeyBoardRepeatCount;
+        TBool                           iIgnoreNextPowerKeyRepeats;
+        TInt                            iActiveProfileBeforeOfflineMode;
+        
         TBool                           iSimChangedDone;
-        TBool                           iResourcesFreed;
-        TBool                           iNsps;
-#ifndef RD_MULTIPLE_DRIVE
-        TBool                           iHideFirstBeep;
-#endif // RD_MULTIPLE_DRIVE
-        TBool                           iShutdownStarted;
-        TBool                           iAlarmOrChargingStateShutdownStarted;
+        TBool                           iIgnoreZeroNetworkBarNotifications;
+        TInt                            iApplicationScanningRoundNumberInBtSap;
+        TBool                           iTimeToKillInBtSap;
+        TBool                           iShowkeypadActivatedNoteAfterSoftReject;
+        TBool                           iCharging;  // Indicates if charging is currently on
+        TBool                           iEmergencyCallActive;
+        TBool                           iCallActivated; // used    in defining whether to show GPRS suspended note
 
-        TBool                           iIgnoreAccessorySpecificProfileChanges;
-        TBool                           iAccessoryJustConnected;
-
-        TBool                           iHandleNextProfileEvent;
         TBool                           iActivateBt;
         TBool                           iDeactivateBt;
-#ifndef RD_MULTIPLE_DRIVE
-        TBool                           iTimeToKill;                     // MMC Hot Swap
-        TInt                            iApplicationScanningRoundNumber; // MMC Hot Swap
-#endif // RD_MULTIPLE_DRIVE
-        TBool                           iGprsActivated; // used    in defining whether to show GPRS suspended note
-        TBool                           iGprsSuspended; // used    in defining whether to show GPRS suspended note
-        TBool                           iCallActivated; // used    in defining whether to show GPRS suspended note
-        TBool                           iGprsSuspendedNoteShown;
-
-        TBool                           iMMCEjectUsed;
-#ifndef RD_MULTIPLE_DRIVE
-        TBool                           iMMCPowerMenuEjectUsed;
-        TBool                           iMMCInserted;
-#endif // RD_MULTIPLE_DRIVE
-
-        CPeriodic*                      iTimer;
-        CPeriodic*                      iSapTimer;
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-        CPeriodic*                      iAnimTimer;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-        CSysApTimer*                    iSysApTimer;
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-        TInt                            iAnimationShowingTime;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-        CSysApKeySndHandler*            iSysApKeySndHandler;
-
-        TBool                           iIgnoreZeroNetworkBarNotifications;
-
-        TBool                           iCharging;  // Indicates if charging is currently on
-        CSysApKeyManagement* 			iSysApKeyManagement;
-
-        CSysApMediatorObserver*         iSysApMediatorObserver;
-        TBool                           iShutdownContinued;
-
-        /**
-        * The default key handler.
-        * Own.
-        */
-        CSysApDefaultKeyHandler* iSysApDefaultKeyHandler;
-
-        TBool iPowerKeyPopupMenuDismissed; // Indicates if the popup menu has been dismissed
-
-#ifndef RD_MULTIPLE_DRIVE
-        TBool iHideNextBeep; // Prevents double beep when USB file transfer gets activated
-        TBool iFileManagerCloseDisabled; // Prevents File Manager to close on hotswap
-#endif // RD_MULTIPLE_DRIVE
-
-        CSysApAudioRoutingObserver* iSysApAudioRoutingObserver;
-
-        /**
-        * Call forwarding status CenRep key observer.
-        * Own.
-        */
-        CSysApCenRepCallForwardingObserver* iSysApCenRepCallForwardingObserver;
-
-        /**
-        * Message waiting status CenRep key observer.
-        * Own.
-        */
-        CSysApCenRepMsgWaitingObserver* iSysApCenRepMsgWaitingObserver;
-
-#ifdef RD_MULTIPLE_DRIVE
-        // First power menu index used for eject
-        TInt iPowerkeyMenuEjectSelectionBase;
-
-        /**
-        * Drive list container
-        * Own.
-        */
-        CSysApDriveList* iSysApDriveList;
-
-        /**
-        * Drive unlock handler.
-        * Own.
-        */
-        CSysApDriveUnlockHandler* iSysApDriveUnlockHandler;
-
-        /**
-        * Drive eject handler.
-        * Own.
-        */
-        CSysApDriveEjectHandler* iSysApDriveEjectHandler;
-
-        /**
-        * Array for storing inserted memory cards.
-        * Own.
-        */
-        RArray< CSysApDriveList::TMemoryCardEntry > iInsertedMemoryCards;
-
-        // Stores drive for dismount query
-        TInt iDriveToDismount;
-
-        // Stores drive for eject query
-        TInt iDriveToEject;
-#endif // RD_MULTIPLE_DRIVE
-
-        /**
-        * For USB charger detection.
-        */
-        TSysApUsbChargerDetector iSysApUsbChargerDetector;
-
-        /**
-        * SysAp power save mode controller.
-        * Own.
-        */
-        CSysApPsmController* iSysApPsmController;
+        
+        TBool                           iIgnoreAccessorySpecificProfileChanges;
+        TBool                           iCheckLongPowerKeyEvent;
         
-        /**
-        * SysAp battery info controller.
-        * Own.
-        */
-        CSysApBatteryInfoController* iSysApBatteryInfoController;
-
-		        /**
-         * Returns whether a de/encrypting operation is ongoing
-         *
-     	* @since S60 3.1
-     	* @return TBool ETrue if a de/encrypting operation is in progress
-     	*/
-         TBool IsEncryptionOperationOngoingL() const;
-		 TInt iKeyBoardRepeatCount;
-		     };
-
-#endif      // SYSAPAPPUI_H
-
-// End of File
+//        friend class CSysApWsClient;
+	};
+	
+#endif
--- a/coreapplicationuis/SysAp/Inc/SysApDocument.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApDocument.h	Tue Jun 29 10:40:11 2010 +0300
@@ -20,7 +20,8 @@
 #define SYSAPDOCUMENT_H
 
 // INCLUDES
-#include <AknDoc.h>
+//#include <AknDoc.h>
+#include <eikdoc.h>
 
 // FORWARD DECLARATIONS
 class  CEikAppUi;
@@ -32,7 +33,7 @@
 *  @since 1.0
 */
 
-class CSysApDocument : public CAknDocument
+class CSysApDocument : public CEikDocument
     {
     public:
         /**
@@ -40,7 +41,12 @@
         * @param CEikApplication& aApp
         * @return void
         */
-        CSysApDocument(CEikApplication& aApp): CAknDocument(aApp) { }
+        CSysApDocument(CEikApplication& aApp): CEikDocument(aApp) { }
+        
+        /**
+        *   Two-phased constructor.
+        */
+//        static CSysApDocument* NewL(CEikApplication& aApp);
 
         /**
         * Destructor.
@@ -50,6 +56,12 @@
         virtual ~CSysApDocument();
 
     private:
+        
+        /**
+        *   EPOC default constructor.
+        */
+//        void ConstructL();
+        
         /**
         * C++ default constructor.
         * @param None
--- a/coreapplicationuis/SysAp/Inc/SysApFeatureManager.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApFeatureManager.h	Tue Jun 29 10:40:11 2010 +0300
@@ -209,7 +209,7 @@
     * @since S60 3.2
     * @return ETrue if feature is supported
     */ 
-//    TBool FmTxSupported() const;
+    // TBool FmTxSupported() const;
 
     /**
     * Returns whether pen is enabled.
@@ -244,7 +244,7 @@
     * @since S60 5.1
     * @return ETrue if feature is supported
     */
-//    TBool FmTxRdsTextSupported() const;
+    // TBool FmTxRdsTextSupported() const;
 
 private:
 
@@ -339,7 +339,7 @@
     /**
     * FM TX supported status
     */
-//    TBool iFmTxSupported;
+    // TBool iFmTxSupported;
     
     /**
     * Pen enabled status.
@@ -359,7 +359,7 @@
     /**
     * FM TX RDS Text support status.
     */
-//    TBool iFmTxRdsTextSupported;
+    // TBool iFmTxRdsTextSupported;
 };
 
 #endif // SYSAPFEATUREMANAGER_H
--- a/coreapplicationuis/SysAp/Inc/SysApPubSubObserver.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApPubSubObserver.h	Tue Jun 29 10:40:11 2010 +0300
@@ -38,6 +38,15 @@
 *  @since 2.X 
 */
 
+enum TSecurityUIsLights
+    {
+    ESecurityUIsLightsUninitialized = 0,
+    ESecurityUIsLightsLockOnRequest,
+    ESecurityUIsLightsQueryOnRequest,
+    ESecurityUIsLightsLockOffRequest,
+    ESecurityUIsLightsLastValue
+    };
+
 class CSysApPubSubObserver : 
               public CBase, 
               public MSysApPropertyResponder
@@ -99,7 +108,7 @@
     /**
     * Handle keys under category KPSUidHWRMFmTx
     */
-//    void HandleHwrmFmTxCategoryL( const TUint aKey, const TInt aValue );
+    // void HandleHwrmFmTxCategoryL( const TUint aKey, const TInt aValue );
     
     /**
     * Handle keys under category KPSUidDataSynchronizationInternalKeys
@@ -134,6 +143,9 @@
     */         
     CSysApPubSubObserver( CSysApAppUi& aSysApAppUi );
     void ConstructL();
+    
+    void HandleLKeylockEventL( const TUint aKey, const TInt aValue  );
+    void HandleLightsOnRequestL( const TUint aKey, const TInt aValue  );
 
 protected: // From MSysApPropertyResponder
 
@@ -151,8 +163,8 @@
     CSysApSubscriber*   iInboxStatusSubscriber;              // KUidInboxStatusValue
     CSysApSubscriber*   iOutboxStatusSubscriber;             // KUidOutboxStatus
     CSysApSubscriber*   iIrdaStatusSubscriber;               // KPSUidIrdaStatus
-    CSysApSubscriber*   iGprsStatusSubscriber;               // KPSUidGprsStatus
-    CSysApSubscriber*   iWcdmaStatusSubscriber;              // KPSUidWcdmaStatus
+//    CSysApSubscriber*   iGprsStatusSubscriber;               // KPSUidGprsStatus
+//    CSysApSubscriber*   iWcdmaStatusSubscriber;              // KPSUidWcdmaStatus
     CSysApSubscriber*   iLocationGlobalPrivacySubscriber;    // KPSUidLocationGlobalPrivacy
     CSysApSubscriber*   iRestoreBackupSubscriber;            // KUidBackupRestoreKey
 
@@ -160,11 +172,11 @@
     CSysApSubscriber*   iSimChangedSubscriber;               // KPSSimChanged
 
     // Category KHWRMFmTxStatus
-//    CSysApSubscriber*   iFmTxStatusSubscriber;   // KPSUidHWRMFmTx
+    // CSysApSubscriber*   iFmTxStatusSubscriber;   // KPSUidHWRMFmTx
     
-//    TInt iPreviousFmTxPSValue;
+    // TInt iPreviousFmTxPSValue;
     
-//    CSysApRemConObserver* iFmTxRemConObserver;
+    // CSysApRemConObserver* iFmTxRemConObserver;
     
     // Category KPSUidCoreApplicationUIs
 
@@ -238,6 +250,13 @@
     * Own.
     */
     CSysApSubscriber* iSmsPhoneStoreSubscriber;
+    
+    CSysApSubscriber* iKeylockEventSubscriber;
+    
+    CSysApSubscriber* iLightsOnRequestSubscriber;
+    
+    CSysApSubscriber* iPowerMenuCustomDialogSubscriber;
+    
 };
 
 #endif // SYSAPPUBSUBOBSERVER_H
--- a/coreapplicationuis/SysAp/Inc/SysApShutdownImage.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApShutdownImage.h	Tue Jun 29 10:40:11 2010 +0300
@@ -131,6 +131,7 @@
         */
         TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType);
 
+        CFbsBitmap* ReadSVGL (TFileName aFileName);
     private:    // Data
 
         //Used for showing user selected image
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Inc/SysApTaskList.h	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,104 @@
+/*
+* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*
+*/
+
+
+#ifndef SYSAPTASKLIST_H
+#define SYSAPTASKLIST_H
+
+// INCLUDES
+
+#include <w32std.h>
+#include <apgtask.h>
+
+// CLASS DECLARATION
+
+/**
+*  Class for finding out about running applications.
+*  This class specialises in locating and identifying root applications,
+*  those applications who do not have any parent window group.
+*  It can be used along-side TApaTaskList.
+*
+*  @since Series 60 3.0
+*/
+class CSysApTaskList : public CBase
+	{
+public:
+    /**
+    * Factory function
+    * @param aWsSession an open session to the window server, often from CEikonEnv::WsSession()
+    * @return a new fully constructed instance of CSysApTaskList
+    */
+	static CSysApTaskList* NewL(RWsSession& aWsSession);
+    /**
+    * Factory function
+    * @param aWsSession an open session to the window server, often from CEikonEnv::WsSession()
+    * @return a new fully constructed instance of CSysApTaskList, which is on the cleanup stack
+    */
+	static CSysApTaskList* NewLC(RWsSession& aWsSession);
+    /**
+    * Destructor.
+    */
+	~CSysApTaskList();
+	
+	/**
+	* Refresh the window group array
+	*/
+	void UpdateListL();
+	/**
+	* Accessor for the window group array
+	* @return an array containing the window groups of running applications.
+	*/
+	const RArray<RWsSession::TWindowGroupChainInfo>& WgArray() const;
+
+	/**
+	* Find an application with the requested UID 3, which is running as a root application
+	* @param aAppUid the UID 3 of the target application.
+	* @return a TApaTask which refers to the running instance of the application.
+	* if the application is not running, the TApaTask's Exists() function will return EFalse.
+	*/	
+	TApaTask FindRootApp(TUid aAppUid) const;
+	/**
+	* Query whether an application's window group is running as a root application.
+	* @param aWgId the window group identifier of the target application.
+	* @return ETrue if this window group is running as a root window group.
+	*/
+	TBool IsRootWindowGroup(TInt aWgId) const;
+	
+	/**
+	* Find the parent window group. If there is no parent, 0 is returned.
+	* @param aWgId the window group id that you want to find the parent of.
+	* @return The window group id of the parent, or 0 if there is no parent.
+	*/
+	TInt FindParentWgId(TInt aWgId) const;
+	/**
+	* Find the child window group. If there is no child, 0 is returned.
+	* @param aWgId the window group id that you want to find the child of.
+	* @return The window group id of the child, or 0 if there is no child.
+	*/
+	TInt FindChildWgId(TInt aWgId) const;
+	
+private:
+	CSysApTaskList(RWsSession& aWsSession);
+	void ConstructL();
+
+private:
+	RWsSession& iWs;
+	RArray<RWsSession::TWindowGroupChainInfo> iWgs;
+	};
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Inc/hbdevicepowermenusymbian.h	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#ifndef HBDEVICEPOWERMENUSYMBIAN_H
+#define HBDEVICEPOWERMENUSYMBIAN_H
+
+#if defined(__SYMBIAN32__) || defined(SYMBIAN) || defined(HB_DOXYGEN)
+
+#include <e32base.h>
+#include <centralrepository.h>
+#include <settingsinternalcrkeys.h>
+#include <ProfileEngineInternalCRKeys.h>
+#include <ProfileEngineSDKCRKeys.h>
+#include <MProfileEngineExtended2.h>
+#include "SysApAppUi.h"
+
+class CHbDevicePowerMenuPrivate;
+
+class CHbDevicePowerMenuSymbian : public CBase
+{
+public:
+
+	static CHbDevicePowerMenuSymbian* NewL(CSysApAppUi& aSysApServer );
+    virtual ~CHbDevicePowerMenuSymbian();
+    
+    //Displays Dialog
+    void ShowL();
+    //Getters and Setters
+    void SetVolume(TInt aVolume);
+    void SetSilenceMode(TBool aEnable);
+    void SetOfflineMode(TBool aChecked);
+    void SetVibrationEnabled(TBool aEnable);
+    void SetPowerOffEnabled(TBool aEnable);
+
+private:
+
+    CHbDevicePowerMenuSymbian(CSysApAppUi& aSysApServer);
+    void ConstructL();
+
+private:
+    friend class CHbDevicePowerMenuPrivate;
+    //Used to set master Volume/Vibrate/Silence Mode in Control Panel
+    MProfileEngineExtended2* 	iProfileEngine;
+    //Used to Set and Get OfflineMode to and from Control Panel
+    CRepository* 				iCenrepOffline;
+    //Used to Get Master Volume/Vibrate/Silence Mode in Control Panel
+    CRepository* 				iCenrepProfile;
+    //Used to handle ShutDown
+    CSysApAppUi& 				iSysApServer;
+    CHbDevicePowerMenuPrivate* 	iPowerMenuPrivate;
+};
+
+#endif // defined(__SYMBIAN32__) || defined(SYMBIAN) || defined(HB_DOXYGEN)
+
+#endif // HBDEVICEPOWERMENUSYMBIAN_H
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Inc/sysapaudioroutingobserver.h	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,127 @@
+/*
+* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Observes audio output routing changes
+*
+*/
+
+
+#ifndef SYSAPAUDIOROUTINGONBSERVER_H
+#define SYSAPAUDIOROUTINGONBSERVER_H
+
+#include <MTelephonyAudioRoutingObserver.h>
+class CSysApAppUi;
+
+/**
+ *  ?one_line_short_description
+ *
+ *  ?more_complete_description
+ *
+ *  @lib ?library
+ *  @since S60 ?S60_version *** for example, S60 v3.0
+ */
+class CSysApAudioRoutingObserver : public CBase,
+                                   public MTelephonyAudioRoutingObserver
+    {
+
+public:
+
+    /**
+    * Symbian two-phased constructor.
+    * 
+    * @param aSysApAppUi    reference to System Application's application UI class
+    */
+    static CSysApAudioRoutingObserver* NewL( CSysApAppUi& aSysApAppUi );
+    
+    /**
+    * Destructor.
+    */
+    virtual ~CSysApAudioRoutingObserver();
+    
+    /**
+    * Returns whether audio output is routed to IHF.
+    * 
+    * @since S60 3.2
+    * @return   TBool   ETrue audios routed to IHF
+    *                   EFalse audios not routed to IHF.
+    */
+    TBool IhfEnabled() const;
+
+private: // from MTelephonyAudioRoutingObserver
+    /**
+    * Signals that available audio outputs have changed.
+    *
+    * @since S60 3.2
+    * @param CTelephonyAudioRouting& aTelephonyAudioRouting reference.
+    * @see MTelephonyAudioRoutingObserver::AvailableOutputsChanged
+    */
+    virtual void AvailableOutputsChanged( CTelephonyAudioRouting& aTelephonyAudioRouting);
+
+    /**
+    * Signals that current output has changed. 
+    *
+    * @since 60 3.2
+    * @param CTelephonyAudioRouting& aTelephonyAudioRouting reference.
+    * @see MTelephonyAudioRoutingObserver::OutputChanged
+    */
+    virtual void OutputChanged( CTelephonyAudioRouting& aTelephonyAudioRouting);
+
+    /**
+    * Signals that CTelephonyAudioRouting::SetOutputL request issued by this
+    * application (on CTelephonyAudioRouting instance) was serviced by the
+    * Adaptation.
+    *
+    * @since S60 3.2
+    * @param CTelephonyAudioRouting& aTelephonyAudioRouting reference.
+    * @param aError KErrNone if output requested by application is set, else
+    *        system-wide error code.
+    * @see MTelephonyAudioRoutingObserver::SetOutputComplete
+    */
+    virtual void SetOutputComplete( CTelephonyAudioRouting& aTelephonyAudioRouting, TInt aError);
+
+private:
+
+    /**
+    * C++ default constructor.
+    */
+    CSysApAudioRoutingObserver();
+
+    /**
+    * Constructor.
+    * 
+    * @param aSysApAppUi    reference to System Application's application UI class
+    */
+    CSysApAudioRoutingObserver( CSysApAppUi& aSysApAppUi );
+    
+    /**
+    * Symbian 2nd-phase constructor.
+    */
+    void ConstructL();
+
+private: // data
+
+    /**
+    * Telephony audio routing instance.
+    * Own.
+    */
+    CTelephonyAudioRouting* iTelephonyAudioRouting;
+
+    /**
+    * System Application application UI class.
+    */
+    CSysApAppUi& iSysApAppUi;
+
+    };
+
+
+#endif // SYSAPAUDIOROUTINGONBSERVER_H
--- a/coreapplicationuis/SysAp/Inc/sysapbatteryinfocontroller.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/sysapbatteryinfocontroller.h	Tue Jun 29 10:40:11 2010 +0300
@@ -22,7 +22,7 @@
 #include <e32base.h>
 
 class CBSUtil;
-class CBatteryPopupControl;
+// class CBatteryPopupControl;
 
 /**
  *  Controller for enhanced battery information.
@@ -151,7 +151,7 @@
     * Battery popup control.
     * Own.
     */
-    CBatteryPopupControl* iBatteryPopup;
+    // CBatteryPopupControl* iBatteryPopup;
     };
 
 
--- a/coreapplicationuis/SysAp/Inc/sysapdefaultkeyhandler.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/sysapdefaultkeyhandler.h	Tue Jun 29 10:40:11 2010 +0300
@@ -21,10 +21,13 @@
 
 #include <e32base.h>
 #include <coedef.h>
-#include <AknCapServerClient.h>
+//#include <AknCapServerClient.h>
 
+class RWindowGroup;
 class MSysapCallback;
-class RAknKeylock2;
+
+//class RAknKeylock2;
+//class CSysApAppUi;
 
 
 /**
@@ -49,7 +52,7 @@
         * @param aCallback reference to System Application callback interface.
         * @return pointer to a new instance of CSysApDefaultKeyHandler.
         */
-        static CSysApDefaultKeyHandler* NewL( MSysapCallback& callback );
+        static CSysApDefaultKeyHandler* NewL(MSysapCallback& callback);
 
         /**
         * Destructor.
@@ -85,7 +88,7 @@
         *
         * @param aCallback reference to System Application callback interface.
         */
-        CSysApDefaultKeyHandler( MSysapCallback& callback );
+        CSysApDefaultKeyHandler(MSysapCallback& callback );
 
     private:
     
@@ -162,7 +165,10 @@
         TBool DoShowKeysLockedNote();
         
     private: // data
-
+        
+        // Our window group from SysappUi
+ //       RWindowGroup& iRootWindowGroup;
+        
         /**
         * Reference to callback object.
         */
@@ -182,7 +188,7 @@
         * Pointer to sysap-owned RAknKeylock2*
         * Not own.
         */
-        RAknKeylock2* iKeylock;
+//        RAknKeylock2* iKeylock;
         
         /**
         * Handle of the captured camera key event.
@@ -222,7 +228,7 @@
         /**
         * Avkon UI Server
         */
-        RAknUiServer iAknUiServer;
+//        RAknUiServer iAknUiServer;
         
     };
 
--- a/coreapplicationuis/SysAp/Inc/sysapkeymanagement.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/sysapkeymanagement.h	Tue Jun 29 10:40:11 2010 +0300
@@ -88,6 +88,7 @@
                 */
                 RArray<TInt32> iUpAndDownKeyHandles; //Handles of keys when capturing them
                 
+                RArray<TInt32> iLongKeyPressHandle ; //Handles long key when capturing them
                 /**
                  * Tells if the plugin is a key provider plugin (plugin version 2)
                  */
--- a/coreapplicationuis/SysAp/Src/BtSap/SysApBtSapControllerImpl.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/BtSap/SysApBtSapControllerImpl.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -26,7 +26,7 @@
 #include <btengconnman.h>
 #include <StringLoader.h>
 #include <coemain.h>
-#include <SysAp.rsg>
+//#include <SysAp.rsg>
 
 
 MSysApBtSapController* CreateSysApBtSapControllerL( CSysApAppUi& aSysApAppUi )
@@ -162,7 +162,7 @@
         
         // No RF available so signal bars should be same as in offline mode.
         iSysApAppUi.IgnoreZeroNetworkBarNotifications(ETrue);
-        TRAP( err, iSysApAppUi.UpdateSignalBarsL( KAknSignalOffLineMode ) );
+//        TRAP( err, iSysApAppUi.UpdateSignalBarsL( KAknSignalOffLineMode ) );
 
         iSysApAppUi.SetNetworkConnectionAllowed( ECoreAppUIsNetworkConnectionNotAllowed );
 
@@ -183,7 +183,8 @@
     iFinalizeDisconnectNeeded = EFalse;
     iSysApAppUi.IgnoreZeroNetworkBarNotifications(EFalse);
 
-    if ( iSysApAppUi.ActiveProfileId() == KOfflineModeProfileId )
+//    if ( iSysApAppUi.ActiveProfileId() == KOfflineModeProfileId )
+      if(0)
         {
         if ( iSwitchingToOffline )
             {
--- a/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -154,9 +154,9 @@
     
     if ( iSimChangedCheckDone && iUiReady )
         {
-        TInt newState( iMissedCallsValue > 0 ? EAknIndicatorStateOn : EAknIndicatorStateOff );
+//        TInt newState( iMissedCallsValue > 0 ? EAknIndicatorStateOn : EAknIndicatorStateOff );
         
-        iSysApAppUi.SetIndicatorStateL( EAknIndicatorMissedCalls, newState );
+//        iSysApAppUi.SetIndicatorStateL( EAknIndicatorMissedCalls, newState );
         }
     }
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Src/CenRepObservers/sysapcenrepofflinemodeobserver.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ * CSysApCenRepOfflineModeObserver is a an observer for the Offline Mode central Repository key.
+ * This class handles the changes to the offline mode changes done from Power Menu or Control Panel 
+ *
+ */
+
+#include "sysapcenrepofflinemodeobserver.h"
+#include "CoreApplicationUIsSDKCRKeys.h"
+#include "SysAp.hrh"
+
+#ifdef _DEBUG
+#include <e32debug.h>
+#endif
+
+// ----------------------------------------------------------------------------
+// CSysApCenRepOfflineModeObserver::NewL( MSysApOfflineModeController& )
+// Creates an instance of CSysApCenRepOfflineModeObserver and returns
+// ----------------------------------------------------------------------------
+
+CSysApCenRepOfflineModeObserver* CSysApCenRepOfflineModeObserver::NewL( 
+                    MSysApOfflineModeController& aSysApOfflineModeController )
+    {
+    TRACES( RDebug::Printf("CSysApCenRepOfflineModeObserver::NewL") );
+    CSysApCenRepOfflineModeObserver* self = 
+    new (ELeave) CSysApCenRepOfflineModeObserver(aSysApOfflineModeController);
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop(); //self
+    return self;
+    }
+
+
+// ----------------------------------------------------------------------------
+// CSysApCenRepOfflineModeObserver::CSysApCenRepOfflineModeObserver( MSysApOfflineModeController& )
+// ----------------------------------------------------------------------------
+
+CSysApCenRepOfflineModeObserver::CSysApCenRepOfflineModeObserver( 
+                MSysApOfflineModeController& aSysApOfflineModeController  )
+            : iSysApOfflineModeController( aSysApOfflineModeController )
+    {
+    TRACES( RDebug::Printf("CSysApCenRepOfflineModeObserver::CSysApCenRepOfflineModeObserver" ) );
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApCenRepOfflineModeObserver::~CSysApCenRepOfflineModeObserver()
+// ----------------------------------------------------------------------------
+
+CSysApCenRepOfflineModeObserver::~CSysApCenRepOfflineModeObserver()
+    {
+    TRACES( RDebug::Printf("~CSysApCenRepOfflineModeObserver" ) );
+    if( iOfflineModeHandler )
+    {
+    iOfflineModeHandler->StopListening();
+    }
+    delete iOfflineModeHandler;
+    delete iOfflineCenRep;
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApCenRepOfflineModeObserver::ConstructL()
+// ----------------------------------------------------------------------------
+
+void CSysApCenRepOfflineModeObserver::ConstructL()
+    {
+    TRACES(RDebug::Printf("CSysApCenRepOfflineModeObserver::ConstructL: trying CRepository::NewL(KCRUidCoreApplicationUIs)"));
+    
+    iOfflineCenRep = CRepository::NewL( KCRUidCoreApplicationUIs );
+    
+    iOfflineModeHandler =
+    CCenRepNotifyHandler::NewL( *this,
+    *iOfflineCenRep,
+    CCenRepNotifyHandler::EIntKey,
+    KCoreAppUIsNetworkConnectionAllowed );
+    iOfflineModeHandler->StartListeningL();    
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApCenRepOfflineModeObserver::HandleNotifyInt()
+// Handles the changes to offline mode state
+// ----------------------------------------------------------------------------
+
+void CSysApCenRepOfflineModeObserver::HandleNotifyInt( TUint32 aId, TInt aNewValue  )
+    {
+    TRACES(RDebug::Printf("CSysApCenRepOfflineModeObserver::HandleNotifyInt(), aId=0x%x, aNewValue=%d", aId, aNewValue));    
+    if ( aId == KCoreAppUIsNetworkConnectionAllowed )
+    {
+        if( aNewValue == ECoreAppUIsNetworkConnectionNotAllowed )
+        {
+        // Offline mode enabled. Go Offline
+        TRACES( RDebug::Printf("CSysApCenRepOfflineModeObserver::HandleNotifyInt() Offline mode Enabled"));
+        // Ignore any leave because it will have already been handled by showing an 
+        // error notification to the user
+        TRAP_IGNORE(iSysApOfflineModeController.SwitchFromOnlineToOfflineModeL());
+        }
+    else if( aNewValue == ECoreAppUIsNetworkConnectionAllowed )
+    {
+        // Offline mode disabled. Go Online
+        TRACES( RDebug::Printf("CSysApCenRepOfflineModeObserver::HandleNotifyInt() Offline mode Disabled"));
+        // Ignore any leave because it will have already been handled by showing an 
+        // error notification to the user
+        TRAP_IGNORE(iSysApOfflineModeController.GoOnlineIfOkL());
+    }
+    else
+    {		
+        // Any other value is invalid	
+        TRACES(RDebug::Printf("CSysApCenRepOfflineModeObserver::HandleNotifyInt() Invalid Value %d", aNewValue));
+    }
+    }
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApCenRepOfflineModeObserver::HandleNotifyError()
+// ----------------------------------------------------------------------------
+
+void CSysApCenRepOfflineModeObserver::HandleNotifyError( TUint32, TInt, CCenRepNotifyHandler* )
+    {
+    TRACES(RDebug::Printf("CSysApCenRepOfflineModeObserver::HandleNotifyError()"));
+    // Nothing to do if start listening leaves
+    TRAP_IGNORE(iOfflineModeHandler->StartListeningL());    
+    }
+
+
+
+// ----------------------------------------------------------------------------
+// CSysApCenRepOfflineModeObserver::IsOffline()
+// Fetches the Cen Rep for Offline mode and 
+// Return true if Offline mode is enabled, false otherwise
+// ----------------------------------------------------------------------------
+TBool CSysApCenRepOfflineModeObserver::IsOffline() const
+    {
+    TRACES(RDebug::Printf("CSysApCenRepOfflineModeObserver::IsOffline"));
+    TBool nwConnAllowed = ETrue;
+    iOfflineCenRep->Get(KCoreAppUIsNetworkConnectionAllowed, nwConnAllowed);
+    TRACES(RDebug::Printf("CSysApCenRepOfflineModeObserver::IsOffline returns %d",!nwConnAllowed));
+    return !nwConnAllowed;
+    }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Src/CenRepObservers/sysapcenrepofflinemodeobserver.h	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ * CSysApCenRepOfflineModeObserver is a an observer for the Offline Mode central Repository key.
+ * This class handles the changes to the offline mode changes done from Power Menu or Control Panel 
+ *
+ */
+
+
+#ifndef SYSAPCENREPOFFLINEMODEOBSERVER_H
+#define SYSAPCENREPOFFLINEMODEOBSERVER_H
+
+// INCLUDES
+#include <e32base.h>
+#include <centralrepository.h>
+#include <cenrepnotifyhandler.h>
+
+#include "MSysApOfflineModeController.h"
+
+NONSHARABLE_CLASS(CSysApCenRepOfflineModeObserver) : public CBase, 
+                                                     public MCenRepNotifyHandlerCallback
+    {
+public: // Constructors and destructor
+    /**
+    * Default constructor
+    */
+    static CSysApCenRepOfflineModeObserver* NewL( 
+            MSysApOfflineModeController& aSysApOfflineModeController );
+    
+    /**
+    * Destructor.
+    */
+    ~CSysApCenRepOfflineModeObserver();
+    
+private:    
+    /**
+    * Two phase ConstructL
+    */
+    void ConstructL( );
+    
+    /**
+    * Constructor 
+    * @param aSysApOfflineModeController is the instance of Offline mode controller
+    */
+    CSysApCenRepOfflineModeObserver( MSysApOfflineModeController& aSysApOfflineModeController );
+    
+    /**
+    * default constructor.
+    */
+    CSysApCenRepOfflineModeObserver();
+    
+public: // From MCenRepNotifyHandlerCallback
+    /**
+    * Handles the changes to offline mode state
+    * @param aId is the cen rep key which was changed
+    * @param aNewValue is the new value		
+    */
+    void HandleNotifyInt( TUint32 aId, TInt aNewValue );
+    
+    /**
+    * Handles the error in changing offline mode state
+    * @param aId is the cen rep key which was changed
+    * @param aError is the error id		
+    * @param aHandler is Offline cep rep handler same as iOfflineModeHandler		
+    */
+    void HandleNotifyError( TUint32 aId, TInt aError, CCenRepNotifyHandler* aHandler );
+    
+    /**
+    * Returns whether Offline mode is currently active or not
+    * @return ETrue if Offline mode is active, else EFalse
+    */		
+    TBool IsOffline() const;
+    
+private:
+    /**
+    * Instance of Offline mode controller. Used for enabling or disabling offline mode
+    */	
+    MSysApOfflineModeController& iSysApOfflineModeController;
+    
+    /**
+    * Central Repository for gettting the Offline Mode
+    */	
+    CRepository*          iOfflineCenRep;
+    
+    /**
+    * Handler to the cen rep for listening to the offline changes
+    */
+    CCenRepNotifyHandler* iOfflineModeHandler;
+    };
+
+#endif      // SYSAPCENREPBTOBSERVER_H
--- a/coreapplicationuis/SysAp/Src/OfflineModeController/SysApOfflineModeControllerImpl.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/OfflineModeController/SysApOfflineModeControllerImpl.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -1,19 +1,22 @@
 /*
-* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  CSysApOfflineModeController implementation
+ * Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
  *
-*/
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ * CSysApOfflineModeController controls the offline mode.
+ * It turns OFF RF, BT and WLAN when offline mode is enabled and turns them ON when
+ * Offline mode is disabled
+ *
+ */
 
 
 // INCLUDES
@@ -23,8 +26,10 @@
 #include "SysAp.hrh"
 #include "DosSvrServices.h"
 #include "SysApCenRepController.h"
+#include "sysapcenrepofflinemodeobserver.h"
 #include <startupdomainpskeys.h>
 #include <PSVariables.h>
+#include <wlandevicesettingsinternalcrkeys.h> // For Turning ON/OFF WLAN
 
 
 MSysApOfflineModeController* CreateSysApOfflineModeControllerL( CSysApAppUi& aSysApAppUi )
@@ -53,22 +58,18 @@
 void CSysApOfflineModeController::ConstructL()
     {
     TRACES( RDebug::Print( _L("CSysApOfflineModeController::ConstructL") ) ); 
-    // Check the active profile
-    TInt activeProfile( iSysApAppUi.ActiveProfileId() );
-    activeProfile = iSysApAppUi.ActiveProfileId();
-    if ( activeProfile == KOfflineModeProfileId )
-        {
-        iOfflineModeActive = ETrue;
-        }
+    
+    // create an observer for Offline Mode
+    TRACES( RDebug::Print( _L("CSysApOfflineModeController::ConstructL: trying CSysApCenRepOfflineModeObserver::NewL") ) );
+    iSysApCenRepOfflineModeObserver = CSysApCenRepOfflineModeObserver::NewL(*this );         
+    iOfflineModeActive = iSysApCenRepOfflineModeObserver->IsOffline();
     }
 
 // ----------------------------------------------------------------------------
 // CSysApOfflineModeController::CSysApOfflineModeController() 
 // ----------------------------------------------------------------------------
 CSysApOfflineModeController::CSysApOfflineModeController( CSysApAppUi& aSysApAppUi ) :
-  iSysApAppUi( aSysApAppUi ),
-  iOfflineModeActive( EFalse ),
-  iDoNotActivateRF( EFalse )
+  iSysApAppUi( aSysApAppUi )
     {
 
     }
@@ -79,6 +80,7 @@
 
 CSysApOfflineModeController::~CSysApOfflineModeController()
     {
+    delete iSysApCenRepOfflineModeObserver;
     }
 
 // ----------------------------------------------------------------------------
@@ -87,6 +89,7 @@
 
 TBool CSysApOfflineModeController::OfflineModeActive()
     {
+    TRACES( RDebug::Print( _L("CSysApOfflineModeController::OfflineModeActive returns %d"), iOfflineModeActive ) );
     return iOfflineModeActive;
     }
 
@@ -97,6 +100,7 @@
 void CSysApOfflineModeController::SwitchFromOnlineToOfflineModeL()
     {
     TRACES( RDebug::Print( _L("CSysApOfflineModeController::SwitchFromOnlineToOfflineModeL") ) ); 
+        
     TInt err ( 0 );
 
     // Set state to starter. Note that if state is same as the current state, then nothing happens.
@@ -104,7 +108,6 @@
 
     if ( err )
         {
-        iSysApAppUi.RestoreProfileL( EFalse );
         iSysApAppUi.ShowUiNoteL( ECannotActivateOfflineModeNote );
         }
     else
@@ -119,8 +122,22 @@
             SetBtActiveBeforeOfflineMode( ETrue );       // Update "BT active" setting
             TRACES( RDebug::Print( _L("CSysApOfflineModeController SetBtPowerStateL returned %d"), err ) );
             }
-        
-        iSysApAppUi.OfflineModeChangedL();
+        /* Turn OFF WLAN */        
+        TInt err( KErrNone );
+        CRepository* repository = CRepository::NewL( KCRUidWlanDeviceSettingsRegistryId );
+        err = repository->Set(KWlanOnOff, 0);
+        delete repository;
+        if(err) 
+		{
+           TRACES( RDebug::Printf("CSysApOfflineModeController::SwitchFromOnlineToOfflineModeL Could not disable WLAN") );
+		    User::Leave(err);
+        }
+        else 
+		{
+            TRACES( RDebug::Printf("CSysApOfflineModeController::SwitchFromOnlineToOfflineModeL WLAN Disabled" ) );
+        }
+		
+		iSysApAppUi.OfflineModeChangedL();
         }
     }
 
@@ -144,7 +161,6 @@
         
     if ( err )
         {
-        iSysApAppUi.RestoreProfileL( ETrue );
         iSysApAppUi.ShowUiNoteL( ECannotDeactivateOfflineModeNote );
         }
     else
@@ -159,11 +175,25 @@
             TRACES( RDebug::Print( _L("CSysApOfflineModeController SetBtPowerStateL returned %d"), err ) );
             }
         
-        iSysApAppUi.OfflineModeChangedL();
+		        /* Turn ON WLAN */    
+           TInt err( KErrNone );
+           CRepository* repository = CRepository::NewL( KCRUidWlanDeviceSettingsRegistryId );
+           err = repository->Set(KWlanOnOff, 1);
+           delete repository;
+           if(err)
+		   {
+               TRACES( RDebug::Printf("CSysApOfflineModeController::SwitchFromOfflineToOnlineModeL Could not enable WLAN") );
+		       User::Leave(err);
+           }
+           else
+		   {
+               TRACES( RDebug::Printf("CSysApOfflineModeController::SwitchFromOfflineToOnlineModeL WLAN Enabled") );
+           }
 
-        iSysApAppUi.SetNetworkConnectionAllowed( ECoreAppUIsNetworkConnectionAllowed );
-        }
-    }
+        iSysApAppUi.OfflineModeChangedL();
+		iSysApAppUi.SetNetworkConnectionAllowed( ECoreAppUIsNetworkConnectionAllowed );
+		}
+	}
 
 // ----------------------------------------------------------------------------
 // CSysApOfflineModeController::CheckOfflineModeInitialStatusesL()
@@ -204,10 +234,12 @@
          ( iSysApAppUi.BtSapEnabled() && simStatus != ESimNotPresent ) ||     
          simStatus == ESimUsable )
         {
-        iSysApAppUi.ShowQueryL( ESysApLeaveOfflineModeQuery );
+        TRACES( RDebug::Printf("CSysApOfflineModeController::GoOnlineIfOkL SIM check PASSED") );
+        SwitchFromOfflineToOnlineModeL();
         }
     else    
         {
+        TRACES( RDebug::Printf("CSysApOfflineModeController::GoOnlineIfOkL SIM check FALIED" ) );
         iSysApAppUi.ShowUiNoteL( EInsertSimNote );
         }
     }
@@ -233,6 +265,7 @@
     TInt btToBeActivated = iSysApAppUi.CenRepController().GetInt( KCRUidCoreApplicationUIsSysAp,
                                                                   KSysApBtStatusBeforeOfflineMode,
                                                                   &err );
+
     if ( err )
         {
         TRACES( RDebug::Print( _L("CSysApOfflineModeController::BtActiveBeforeOfflineMode: ERROR: %d" ), err ) );
@@ -241,6 +274,7 @@
     else
         {
         return ( TBool ) btToBeActivated;
+        //return ETrue;
         }
 
     }
@@ -253,6 +287,7 @@
     return BtActiveBeforeOfflineMode();
     }
 
+
 // End of File
 
 
--- a/coreapplicationuis/SysAp/Src/OfflineModeController/SysApOfflineModeControllerImpl.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/OfflineModeController/SysApOfflineModeControllerImpl.h	Tue Jun 29 10:40:11 2010 +0300
@@ -1,19 +1,22 @@
 /*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  The stub implementation of MSysApOfflineModeController.
-*
-*/
+ * Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ * CSysApOfflineModeController controls the offline mode.
+ * It turns OFF RF, BT and WLAN when offline mode is enabled and turns them ON when
+ * Offline mode is disabled
+ *
+ */
 
 
 #ifndef SYSAPOFFLINEMODECONTROLLERIMPL_H
@@ -27,6 +30,7 @@
 // FORWARD DECLARATIONS
 
 class CSysApAppUi;
+class CSysApCenRepOfflineModeObserver;
 
 // CLASS DECLARATION
 /**
@@ -160,6 +164,11 @@
 private:
 
     CSysApAppUi&        iSysApAppUi;
+	
+    /**
+    * Instance of the Offline mode observer. Listens to offline mode changes
+	*/	
+    CSysApCenRepOfflineModeObserver*         iSysApCenRepOfflineModeObserver;
 
     TBool               iOfflineModeActive;
     TBool               iDoNotActivateRF;
--- a/coreapplicationuis/SysAp/Src/SysApApp.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApApp.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -40,6 +40,8 @@
 CApaDocument* CSysApApp::CreateDocumentL()
     {
     return new( ELeave ) CSysApDocument( *this );
+    
+    // return CSysApDocument::NewL(*this);
     }
 
 // ===================== OTHER EXPORTED FUNCTIONS ============================
--- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -14,178 +14,72 @@
 * Description:  CSysApAppUi implementation.
 *
 */
-
-
 // INCLUDES
 
-#include <avkon.hrh>
-#include <avkon.rsg>
-#include <eikon.hrh>
-#include <apgwgnam.h>
-#include <eiksrv.h>
-#include <eikdll.h>
-#include <AknSmallIndicator.h>
-#include <AknBatteryNotify.h>
-#include <AknSignalNotify.h>
-#include <AknGlobalNote.h>
-#include <AknGlobalListQuery.h>
-#include <aknsoundsystem.h>
-#include <apgcli.h>
-
+#include <startupdomainpskeys.h>
+#include "sysapappui.h"
+#include "coreapplicationuisprivatepskeys.h"
+#include <HbDeviceMessageBoxSymbian.h>
+//#include <hbdevicepowermenusymbian.h>
+#include <sacls.h>
+#include <featmgr.h>
+#include <DevEncProtectedPSKey.h>
+#include <ctsydomainpskeys.h>
+#include <secuisystemlock.h>
+#include <apgtask.h>
 #include <hwrmpowerstatesdkpskeys.h>
-#include <hwrmdomainpskeys.h>
-
-#include <PSVariables.h>
-#include "coreapplicationuisprivatepskeys.h"
-#include <ctsydomainpskeys.h>
-#include <startupdomainpskeys.h>
-#include <startupdomaincrkeys.h>
+#include <wlaninternalpskeys.h> 
+#include <HbDeviceNotificationDialogSymbian.h>
+//#include <HbDeviceInputDialogSymbian.h>
+#include <hbsymbianvariant.h>
+//#include <hbtextresolversymbian.h>
+#include <UikonInternalPSKeys.h>
 
-#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
-  #include <ASShdAlarm.h>
-#else
-  #include <asshddefs.h>
-  #include <ASShdAlarmCal.h>
-  #include <asshdalarm.h>
-#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
-
-#include <MProfileEngine.h>
-#include <MProfileName.h>
-#include <MProfilesNamesArray.h>
-#include <MProfile.h>
-#include <StringLoader.h>
-#include <secuisystemlock.h>
-#include <secui.h>
-#include <settingsinternalcrkeys.h>
-
-#include <AknNotifierController.h>
-#include <eikappui.h>
-#include <es_enum.h>
-#include <data_caging_path_literals.hrh>
-#include <eikon.hrh>
-
-#include "SysApSimChanged.h"
-
-#include <SysAp.rsg>
-#include "SysApLightsController.h"
-
+//#include "SysApWsClient.h"
+#include "SysApFeatureManager.h"
+#include "SysApNspsHandler.h"
 #include "SysApPubSubObserver.h"
-#include "SysApProfileObserver.h"
-
+#include "sysapdefaultkeyhandler.h"
+#include "SysApStartupController.h"
+#include "MSysApOfflineModeController.h"
+#include "SysApCenRepController.h"
 #include "sysapcenreplightsettingsobserver.h"
 #include "SysApCenRepLogsObserver.h"
 #include "SysApCenRepBTObserver.h"
 #include "SysApCenRepHacSettingObserver.h"
-#include "SysApCenRepController.h"
-#include "coreapplicationuisprivatecrkeys.h"
-#include "coreapplicationuisprivatepskeys.h"
-#include <UikonInternalPSKeys.h>
-
-#include "SysApStartupController.h"
-#include "SysApConnectionMonitorObserver.h"
-#include "SysApPowerKeyMenuObserver.h"
-#include "SysApSsSettingsObserver.h"
-#include "SysApAppUi.h"
+#include "sysapaudioroutingobserver.h"
+#include "sysapbatteryinfocontroller.h"
+#include "SysApSimChanged.h"
+#include "MSysApBtSapController.h"
+#include "MSysApBtController.h"
+#include "MSysApUsbIndicator.h"
+//#include <hbindicatorsymbian.h>
+//#include <psmclient.h>
+//#include <psmsettings.h>
+#include "sysapkeymanagement.h"
 #include "SysApShutdownImage.h"
-#include "SysApEtelConnector.h"
-
-#include "SysApApp.h"
-#include "SysApMsgSimMemLowQuery.h"
-#include "SysApNspsHandler.h"
-#include "SysApWaitNote.h"
-#include "SysApConfirmationQuery.h"
-#include "SysApFeatureManager.h"
-#include "SysApSubscriber.h"
-#include "MSysApOfflineModeController.h"
-#include "MSysApBtController.h"
-#include "MSysApBtSapController.h"
-#include "MSysApLocationPrivacyIndicator.h"
-#include "MSysApUsbIndicator.h"
-
-#include <sysap.mbg>
-
-#include "SysApShutdownAnimation.h"
-
-//#include <hwrmfmtx.h>
-//#include <hwrmfmtxdomainpskeys.h>
-//#include <hwrmfmtxdomaincrkeys.h>
-//#include "sysapcenrepfmtxobserver.h"
-
 #include "SysApKeySndHandler.h"
 
-#include <ir_sock.h> // KIrdaPropertyCategory // KIrdaStatus
-
-#include <networkhandlingdomainpskeys.h>
-
-// POC launching
-#include <AiwServiceHandler.h>
-#include <AiwPoCParameters.h>
-
-#include <sacls.h>  // KUidPhonePwr
-
-#include <wlaninternalpskeys.h>  // WLan indicator
-
-#include <ecom/ecom.h>
-#include "sysapkeymanagement.h"
-
-#include "SysApMediatorObserver.h"
-
-#include <SecondaryDisplay/SecondaryDisplaySysApAPI.h>
-#include "aknSDData.h"
-
-#include <AknTaskList.h>
-#include <layoutmetadata.cdl.h>
-
-#include "sysapdefaultkeyhandler.h"
-#include "sysapaudioroutingobserver.h"
-#include "sysapcenrepcallforwardingobserver.h"
-#include "sysapcenrepmsgwaitingobserver.h"
-
-#ifdef RD_MULTIPLE_DRIVE
- #include "sysapdrivelist.h"
- #include "sysapdriveunlockhandler.h"
- #include "sysapdriveejecthandler.h"
-#endif // RD_MULTIPLE_DRIVE
+#include <settingsinternalcrkeys.h>
+#include <keyguardaccessapi.h>
+#include <eikdef.h>
+#include <eikenv.h>
 
-#include "sysappsmcontroller.h"
-#include "sysapbatteryinfocontroller.h"
-
-#include <keylockpolicyapi.h>
-
-#include <UsbWatcherInternalPSKeys.h> // USB transfer modes
-#include <usbpersonalityids.h>
-#include <smsuaddr.h>
-#include <featmgr.h>
-#include <DevEncProtectedPSKey.h>
-
-// CONSTANTS
-const TInt KPowerKeyMenuSelectionCancelled( -1 );
-const TInt KPowerKeyMenuSelectionSwitchOff( 0 );
+class CHbSymbianVariant;
 const TInt KModifierMask( 0 );
-const TInt KDelayBeforeShuttingDownInAlarmAndChargingStates( 500000 );
-const TInt KDelayBeforeShowingGprsSuspendedNote( 500000 );
-const TInt KDelayBeforeNextScanningRound( 1000000 );
-const TInt KActiveProfile( 0 ); //The value of ActiveProfile for accessory default profile selection in GS/SD.
-const TInt KProfileListInitialIndex( 0 );
-const TInt KMaxProfileNameLength( 64 );
-const TInt KTimeToShowShutdownNote( 2000000 ); //2 seconds time for Goodbye note to show before being shutdown
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-const TInt KCoefficientToMakeMicroToMilliSeconds = 1000;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-/* ENABLE ANIMATION: Add id of background image.
-   Example: const TInt KBackgroundImageID = EMbmSysapQgn_graf_startup_bg;
-   If there is no image defined, clear screen is used.*/
-const TInt KBackgroundImageID = 0;
-#ifndef RD_MULTIPLE_DRIVE
-const TInt32 KAutolockAppUid = 0x100059B5;
-const TInt KFileManagerAppUid = 0x101F84EB;
-#endif // RD_MULTIPLE_DRIVE
-const TInt KCoefficientKhzToMhz = 1000;
-const TInt KDecimalsInMhzFrequency = 2;
-
 _LIT_SECURITY_POLICY_PASS(KAlwaysPassPolicy);
 _LIT_SECURITY_POLICY_C1(KWriteDeviceDataPolicy, ECapabilityWriteDeviceData);
+const TInt KDelayBeforeNextScanningRound( 1000000 );
+/*
+_LIT(KPsmPlugin,"com.nokia.hb.powersavemodeplugin/1.0");
+_LIT(KPsm,"PSM");
+_LIT(KCharging,"Charging");
+_LIT(KPsmlocalisationfile, "powermanagement_");
+_LIT(KtsfilePath, "z:/resource/qt/translations/");
+_LIT(KlowbatteryIcon,"qtg_small_bt_low_battery.svg");
+_LIT(KbatteryFullIcon,"qtg_status_battery.svg");
+
+*/
 
 // ============================ MEMBER FUNCTIONS ==============================
 
@@ -193,61 +87,25 @@
 // CSysApAppUi::CSysApAppUi()
 // ----------------------------------------------------------------------------
 
-CSysApAppUi::CSysApAppUi() :
-    iSysApCenRepLogsObserver( NULL ),
-    iSysApCenRepHacSettingObserver( NULL ),
-    iSysApPowerKeyMenuObserver( NULL ),
-    iSysApShutdownImage( NULL ),
-    iSysApConfirmationQuery( NULL ),
-    iSysApConfirmationQueryForRestart( NULL ),
-    iSignalNotify( NULL ),
-#ifndef RD_MULTIPLE_DRIVE
-    iMemoryCardDialog( 0 ),
-#endif // RD_MULTIPLE_DRIVE
-    iProfileNote( NULL ),
-    iProfileNoteId( 0 ),
-    iPowerKeyPopupMenuActive( EFalse ),
-    iDisablePowerkeyMenu( EFalse ),
-    iDeviceLockEnabled( EFalse ),
-    iKeyLockEnabled( EFalse ),
-    iShowkeypadActivatedNoteAfterSoftReject( EFalse ),
-    iEmergencyCallActive( EFalse ),
-    iSimChangedDone( EFalse ),
-    iResourcesFreed( EFalse ),
-#ifndef RD_MULTIPLE_DRIVE
-    iHideFirstBeep( ETrue ),
-#endif // RD_MULTIPLE_DRIVE
-    iShutdownStarted( EFalse ),
-    iIgnoreAccessorySpecificProfileChanges( ETrue ),
-    iAccessoryJustConnected( EFalse ),
-    iHandleNextProfileEvent( ETrue ),
-    iActivateBt( EFalse ),
-    iDeactivateBt( EFalse ),
-    iGprsActivated( EFalse ),
-    iGprsSuspended( EFalse ),
-    iCallActivated( EFalse ),
-    iGprsSuspendedNoteShown( EFalse ),
-    iMMCEjectUsed( EFalse ),
-#ifndef RD_MULTIPLE_DRIVE
-    iMMCPowerMenuEjectUsed( EFalse ),
-    iMMCInserted( EFalse ),
-#endif // RD_MULTIPLE_DRIVE
-    iTimer( NULL ),
-    iSapTimer( NULL ),
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-    iAnimTimer( NULL ),
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-    iSysApTimer( NULL ),
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-    iAnimationShowingTime( 0 ),
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-    iShutdownContinued( EFalse ),
-    iSysApAudioRoutingObserver( NULL ),
-    iSysApCenRepCallForwardingObserver( NULL ),
-    iSysApCenRepMsgWaitingObserver( NULL ),
-	iKeyBoardRepeatCount(-1)
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::CSysApAppUi()") ) );
+CSysApAppUi::CSysApAppUi()
+    :iSysApShutdownImage(NULL),
+     iPowerMenuDialog(NULL),
+     iDeviceLockEnabled(EFalse),
+     iKeyLockEnabled(EFalse),
+     iPowerKeyPopupMenuActive(EFalse),
+     iResourcesFreed (EFalse),
+     iShutdownStarted (EFalse),
+     iSysApAudioRoutingObserver (NULL),
+     iSysApBatteryInfoController (NULL),
+     iSysApPsmController(NULL),
+     iSapTimer (NULL),
+     iSysApCenRepLogsObserver (NULL),
+     iSysApUsbIndicatorController(NULL),
+     iKeyguardController (NULL),
+     iKeyLockOnBeforeCall (EFalse),
+     iCheckLongPowerKeyEvent (EFalse)
+	{
+	TRACES( RDebug::Print( _L("CSysApAppUi::CSysApAppUi()") ) );
     }
 
 // ----------------------------------------------------------------------------
@@ -257,61 +115,59 @@
 void CSysApAppUi::ConstructL()
     {
     TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: START") ) );
-    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying BaseConstructL( EAknEnableSkin )") ) );
-    BaseConstructL( EAknEnableSkin );
+    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying BaseConstructL()") ) );
+    BaseConstructL();
     TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: BaseConstructL() OK") ) );
-    
-   
 
-    /*SysAp is set as system application (Symbian terminology). This means some special privilege compared
-      to other applications. For example it does not get closed when system is asked to close applications
-    */
     iEikonEnv->SetSystem( ETrue );
 
     iEikonEnv->WsSession().ComputeMode( RWsSession::EPriorityControlDisabled );
-
-    static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->PushContextL( R_AVKON_SILENT_SKEY_LIST );
-
+    
     RThread().SetProcessPriority( EPriorityForeground );
-
-    /*SysAp does not have any visible Status pane. An exception will be Charging state
-    where SysAp shows Status Pane as it is the only running application.
-    */
+    
     TInt mode;
     User::LeaveIfError( RProperty::Get( KPSUidStartup, KPSGlobalStartupMode, mode ) );
-
-    if( mode == EStartupModeCharging || mode == EStartupModeAlarm )
-        {
-        SetStatusPaneLayoutL(
-            mode == EStartupModeCharging ? ESysApCharging : ESysApAlarm );
-
-        SetKeyEventFlags(
-            CAknAppUiBase::EDisableSendKeyShort |
-            CAknAppUiBase::EDisableSendKeyLong );
-        }
-    else
-        {
-        SetStatusPaneLayoutL( ESysApNormal );
-        }
-
+    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: KPSGlobalStartupMode = %d"), mode ) );
+    
+    //SysAp needs to capture PowerKey events because it handles all functionality related to that
+    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CEikApplication::RootWin()") ) );
+    RWindowGroup groupWin = iCoeEnv->RootWin();
+    User::LeaveIfError ( iCapturedEKeyPowerOff = groupWin.CaptureKey( EKeyPowerOff, KModifierMask, KModifierMask ) );
+    User::LeaveIfError ( iCapturedEKeyPowerOffUpAndDowns = groupWin.CaptureKeyUpAndDowns( EStdKeyDevice2, KModifierMask, KModifierMask ) );
+     
+    TRACES ( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApDefaultKeyHandler::NewL()") ) );
+    iSysApDefaultKeyHandler = CSysApDefaultKeyHandler::NewL(*this);
+    
+    // Define P&S keys "owned" by SysAp
+    RProperty::Define( KPSUidUikon, KUikMMCInserted, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
+    //initially assuming that the memory card is not inserted
+    RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
+    TDriveInfo driveInfo;
+    TInt driveNumber; 
+    TInt err;    
+    RFs& fileServer = iEikonEnv->FsSession();  
+    for ( driveNumber = EDriveD; driveNumber < EDriveZ; driveNumber++ )
+         {
+      err = fileServer.Drive(driveInfo,driveNumber);
+          if(driveNumber == EDriveF && err == KErrNone && driveInfo.iType == EMediaHardDisk &&  driveInfo.iDriveAtt & KDriveAttRemovable)     
+            {     
+            TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: err = %d, driveInfo.iType = %d, driveInfo.iDriveAtt %d, KDriveAttRemovable = %d "),err,driveInfo.iType,driveInfo.iDriveAtt,KDriveAttRemovable) );     
+            RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
+                break;  // Memory card drive found...     
+            }
+         }
+           
     TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApFeatureManager::NewL()") ) );
     iSysApFeatureManager = CSysApFeatureManager::NewL();
-
+    
     // Setup USB charging detector
-    iSysApUsbChargerDetector.EnableUsbCharging(
-        iSysApFeatureManager->Supported( KSysApFeatureIdChargerReminderNotes ) &&
-        iSysApFeatureManager->Supported( KSysApFeatureIdUsbChargingWithoutReminderNotes ) );
-
-    // Construct notifiers that are used frequently or in OOM situations.
-    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CAknBatteryNotify::NewL()") ) );
-    iBatteryNotify = CAknBatteryNotify::NewL();
-    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CAknSignalNotify::NewL()") ) );
-    iSignalNotify = CAknSignalNotify::NewL();
-    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying new ( ELeave ) CSysApMsgSimMemLowQuery") ) );
-    iSysApMsgSimMemLowQuery = new( ELeave ) CSysApMsgSimMemLowQuery( iSysApFeatureManager->CoverDisplaySupported() );
-
+     iSysApUsbChargerDetector.EnableUsbCharging(
+         iSysApFeatureManager->Supported( KSysApFeatureIdChargerReminderNotes ) &&
+         iSysApFeatureManager->Supported( KSysApFeatureIdUsbChargingWithoutReminderNotes ) );
+    
     TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApPubSubObserver::NewL()") ) );
     iSysApPubSubObserver = CSysApPubSubObserver::NewL( *this );
+
     RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsPoCIndicator, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
     RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsPoCIndicator, ECoreAppUIsPocIndicatorUninitialized );
     RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsPoCMissedIndicator, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
@@ -324,43 +180,6 @@
     RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsVideoSharingIndicator, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
     RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsVideoSharingIndicator, ECoreAppUIsVideoSharingIndicatorUninitialized );
 
-    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApAccessoryObserver::NewL()") ) );
-    iSysApAccessoryObserver = CSysApAccessoryObserver::NewL( *this );
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApCenRepController::NewL()") ) );
-    iSysApCenRepController = CSysApCenRepController::NewL();
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApCenRepLightSettingsObserver::NewL") ) );
-    iSysApCenRepLightSettingsObserver = CSysApCenRepLightSettingsObserver::NewL( *this );
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApCenRepBtObserver::NewL") ) );
-    iSysApCenRepBtObserver = CSysApCenRepBtObserver::NewL( *this );
-
-/*    if ( iSysApFeatureManager->FmTxSupported() )
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApCenRepFmTxObserver::NewL") ) );        
-        iSysApCenRepFmTxObserver = CSysApCenRepFmTxObserver::NewL( *this );    
-        }
-*/
-    // Define P&S keys "owned" by SysAp
-    RProperty::Define( KPSUidUikon, KUikMMCInserted, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
-    //initially assuming that the memory card is not inserted
-    RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
-    TDriveInfo driveInfo;
-    TInt driveNumber; 
-    TInt err;    
-    RFs& fileServer = iEikonEnv->FsSession();  
-    for ( driveNumber = EDriveD; driveNumber < EDriveZ; driveNumber++ )
-         {
-	  err = fileServer.Drive(driveInfo,driveNumber);
-          if(driveNumber == EDriveF && err == KErrNone && driveInfo.iType == EMediaHardDisk &&  driveInfo.iDriveAtt & KDriveAttRemovable)     
-        	{     
-        	TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: err = %d, driveInfo.iType = %d, driveInfo.iDriveAtt %d, KDriveAttRemovable = %d "),err,driveInfo.iType,driveInfo.iDriveAtt,KDriveAttRemovable) );     
-        	RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
-                break;  // Memory card drive found...     
-      		}
-         } 
-
     RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsHideAlarm, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
     RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsDisableKeyguard, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
     RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsSoftReject, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
@@ -381,717 +200,763 @@
 
     // Initialize P&S keys "owned" by SysAp
     RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsHideAlarm, ECoreAppUIsHideAlarmUninitialized );
-
+    
+    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApAccessoryObserver::NewL()") ) );
+    iSysApAccessoryObserver = CSysApAccessoryObserver::NewL( *this );
+    
+    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApCenRepController::NewL()") ) );
+    iSysApCenRepController = CSysApCenRepController::NewL();
+    
+    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApCenRepLightSettingsObserver::NewL") ) );
+    iSysApCenRepLightSettingsObserver = CSysApCenRepLightSettingsObserver::NewL( *this );
+    
+    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApCenRepBtObserver::NewL") ) );
+    iSysApCenRepBtObserver = CSysApCenRepBtObserver::NewL( *this );
+    
     TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApStartupController::NewL()") ) );
     iSysApStartupController = CSysApStartupController::NewL( *this, iSysApFeatureManager->OfflineModeSupported() );
 
+    iActiveProfileBeforeOfflineMode = iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileBeforeOfflineMode );    
+           
+    iSysApFeatureManager->FeatureVariationCheckDone();        
+    // iHbIndicatorSymbian = CHbIndicatorSymbian::NewL();
+    
     TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApLightsController::NewL()") ) );
     iSysApLightsController = CSysApLightsController::NewL( *this,
                                                            iSysApCenRepLightSettingsObserver->GetLightsTimeout(),
                                                            iSysApFeatureManager->CoverDisplaySupported() );
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApEtelConnector::NewL()") ) );
-    iSysApEtelConnector = CSysApEtelConnector::NewL( *this );
-
-    //SysAp needs to capture PowerKey events because it handles all functionality related to that
-    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CEikApplication::RootWin()") ) );
-    RWindowGroup groupWin = iCoeEnv->RootWin();
-    User::LeaveIfError ( iCapturedEKeyPowerOff = groupWin.CaptureKey( EKeyPowerOff, KModifierMask, KModifierMask ) );
-    User::LeaveIfError ( iCapturedEKeyPowerOffUpAndDowns = groupWin.CaptureKeyUpAndDowns( EStdKeyDevice2, KModifierMask, KModifierMask ) );
-
-    TRACES ( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApDefaultKeyHandler::NewL()") ) );
-    iSysApDefaultKeyHandler = CSysApDefaultKeyHandler::NewL( *this );
-
-
-    if ( iSysApFeatureManager->GripNotSupported() )
-        {
-        RProperty::Set( KPSUidHWRM, KHWRMGripStatus, EPSHWRMGripOpen );
-        }
-
-#ifndef RD_MULTIPLE_DRIVE
-    if ( iSysApFeatureManager->MmcSupported() )
-        {
-        iSysApMMCObserver = CSysApMMCObserver::NewL( this, &iEikonEnv->FsSession(), iSysApFeatureManager->MmcHotSwapSupported() );
-        }
-#else // RD_MULTIPLE_DRIVE
-    iSysApDriveList = CSysApDriveList::NewL( iEikonEnv->FsSession() );
-    if ( iSysApFeatureManager->MmcSupported() )
-        {
-        iSysApMMCObserver = CSysApMMCObserver::NewL(
-            iEikonEnv->FsSession(), *iSysApDriveList, *this, iSysApFeatureManager->MmcHotSwapSupported() );
-        iSysApDriveUnlockHandler = CSysApDriveUnlockHandler::NewL(
-            *iSysApDriveList, *this, iSysApFeatureManager->MemoryCardLockSupported() );
-        iSysApDriveEjectHandler = CSysApDriveEjectHandler::NewL(
-            *iSysApDriveList, *this, iEikonEnv->FsSession() );
-        }
-#endif // RD_MULTIPLE_DRIVE
-
+            
+    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL : trying CreateSysApOfflineModeControllerL()") ) );
+    iSysApOfflineModeController = CreateSysApOfflineModeControllerL( *this );
+    
+    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL : trying DoInitialSwStateCheckL()") ) );
+    iSysApStartupController->DoInitialSwStateCheckL();
+    
+    TRACES( RDebug::Print( _L("CCSysApAppUi::ConstructL  trying CSysApCenRepHacSettingObserver::NewL") ) );
+    iSysApCenRepHacSettingObserver = CSysApCenRepHacSettingObserver::NewL( *this ); 
+    
     //Instantiate the KEF plugin manager
-	//Trap constuction, since Sysap may live without iSysApKeyManagement
+    //Trap constuction, since Sysap may live without iSysApKeyManagement
     TRAPD(keyManagementErr, iSysApKeyManagement=CSysApKeyManagement::NewL(CCoeEnv::Static()->RootWin(), *this));
 
     if (keyManagementErr)
-    	{
-    	TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL : CSysApKeyManagement::NewL returns error=%d"), keyManagementErr ) );
-    	}
-
-    iSysApFeatureManager->FeatureVariationCheckDone();
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApProfileObserver::NewL()") ) );
-    iSysApProfileObserver = CSysApProfileObserver::NewL( *this );
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL : trying MProfileEngine* CreateProfileEngineL()") ) );
-    iProfileEngine = CreateProfileEngineL( &( iEikonEnv->FsSession() ) );
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL : trying CreateSysApOfflineModeControllerL()") ) );
-    iSysApOfflineModeController = CreateSysApOfflineModeControllerL( *this );
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL : trying DoInitialSwStateCheckL()") ) );
-    iSysApStartupController->DoInitialSwStateCheckL();
-
-    iActiveProfileBeforeOfflineMode = iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileBeforeOfflineMode );
-
+        {
+        TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL : CSysApKeyManagement::NewL returns error=%d"), keyManagementErr ) );
+        }
+    
     // Initialize animdll for handling side volume keys
     // (needed before normal mode in case emergency number is dialed from PIN query)
     iSysApKeySndHandler = CSysApKeySndHandler::NewL(iEikonEnv->WsSession());
-
-    // Initialize shutdown image (needed by nspshandler)
+    iKeyguardController = CKeyguardAccessApi::NewL();
     TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApShutdownImage::NewL()") ) );
-    iSysApShutdownImage = CSysApShutdownImage::NewL();
-
+    iSysApShutdownImage = CSysApShutdownImage::NewL();//NULL; //
+    
     // Initialize nsps handler. Needed for proper lights control during PIN query.
     TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApNspsHandler::NewL") ) );
     iSysApNspsHandler = CSysApNspsHandler::NewL( iEikonEnv->WsSession(), iSysApShutdownImage->ShutdownCoeControlWindow() );
 
-#ifdef RD_LIGHT_CONTROL_CHANGE
-    // NSPS Plugin has been loaded, inform lights controller that in can activate key event forwarding
-    iSysApLightsController->KeyEventForwardingReady();
-#endif // RD_LIGHT_CONTROL_CHANGE    
+    RProperty::Define( KPSUidCoreApplicationUIs,KCoreAppUIsPowerMenuCustomDialogStatus, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
+    RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsPowerMenuCustomDialogStatus, ECoreAppUIsPowerMenuCustomDialogUninitialized );
+    
+
+                    
+    // TBool result = HbTextResolverSymbian::Init(KPsmlocalisationfile, KtsfilePath);
+    
+    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: END") ) );    
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::FreeResources()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::FreeResources()
+    {
+    TRACES( RDebug::Print( _L("CSysApAppUi::FreeResources") ) );
+    delete iSysApBatteryInfoController;
+    delete iSysApPsmController;
+    //delete iVariantAccState; 
+
+    delete iSysApAudioRoutingObserver;
+
+    if ( iSapTimer )
+        {
+        iSapTimer->Cancel();
+        delete iSapTimer;
+        }
+    //Powermenu
+    if (iPowerMenuDialog!=NULL)
+        {
+        //PowerMenu already exist
+        delete iPowerMenuDialog;
+        iPowerMenuDialog = NULL;
+        }
+    
+    RWindowGroup groupWin = iCoeEnv->RootWin();
+    groupWin.CancelCaptureKey( iCapturedEKeyPowerOff );
+    groupWin.CancelCaptureKeyUpAndDowns( iCapturedEKeyPowerOffUpAndDowns );
+    
+    delete iSysApDefaultKeyHandler;
+    delete iSysApCenRepLightSettingsObserver;
+    delete iSysApCenRepBtObserver;
+    delete iSysApCenRepHacSettingObserver;
+    delete iSysApCenRepController;
 
-    // Create HAC setting observer now because telephony state may change before entering to normal state
-    TRACES( RDebug::Print( _L("CCSysApAppUi::ConstructL  trying CSysApCenRepHacSettingObserver::NewL") ) );
-    iSysApCenRepHacSettingObserver = CSysApCenRepHacSettingObserver::NewL( *this );
+    delete iSysApPubSubObserver;
+    
+    delete iSysApLightsController;
+    delete iSysApFeatureManager;
+    
+    delete iSysApCenRepLogsObserver;
+    delete iSysApOfflineModeController;
+    
+    delete iSysApUsbIndicatorController;
+    delete iKeyguardController;
+    // delete iHbIndicatorSymbian; 
+    delete iSysApKeyManagement;
+    iSysApKeyManagement = NULL;
+    
+    REComSession::FinalClose();
+    iResourcesFreed = ETrue;
+    TRACES( RDebug::Print( _L("CSysApAppUi::FreeResources:END") ) );
+    }
+
+// ---------------------------------------------------------------------------
+// CStartupAppUi::PrepareToExit()
+// ---------------------------------------------------------------------------
+void CSysApAppUi::PrepareToExit()
+    {
+    TRACES("CSysApAppUi::PrepareToExit()");
+    CEikAppUi::PrepareToExit();
+    }
+
 
-    TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: END") ) );
+// ----------------------------------------------------------------------------
+// CSysApAppUi::StateOfProperty()
+// ----------------------------------------------------------------------------
+TInt CSysApAppUi::StateOfProperty( const TUid& aCategory, const TUint aKey ) const
+    {
+    TInt err( KErrNone );
+    TInt value( 0 );
+    err = RProperty::Get( aCategory, aKey, value );
+    if ( err )
+        {
+        TRACES( RDebug::Print( _L("CSysApAppUi::StateOfProperty. RProperty::Get: err=%d"), err ) );
+        return err;
+        }
+    return value;
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::OfflineModeActive()
+// ----------------------------------------------------------------------------
+TBool CSysApAppUi::OfflineModeActive()
+    {
+    if(iSysApOfflineModeController)
+        {
+        return iSysApOfflineModeController->OfflineModeActive();
+        }
+    else
+        {
+        return EFalse;
+        }
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::GoOnlineL()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::GoOnlineL( TBool /* aDoProfileChange */ )
+    {
+    if ( iSysApFeatureManager->OfflineModeSupported() )
+        {
+//        TRACES( RDebug::Print( _L("CSysApAppUi::GoOnlineL: going from off-line into on-line: aDoProfileChange=%d" ), aDoProfileChange ) );
+        iActivateBt = iSysApOfflineModeController->MustBtBeActivated();
+        iSysApOfflineModeController->SwitchFromOfflineToOnlineModeL();
+        TRACES( RDebug::Print( _L("CSysApAppUi::GoOnlineL: iActivateBt = %d" ), iActivateBt ) );
+        }
     }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::~CSysApAppUi()
+// CSysApAppUi::GoOfflineL()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::GoOfflineL()
+    {
+    if ( iSysApFeatureManager->OfflineModeSupported() )
+        {
+        TRACES( RDebug::Print( _L("CSysApAppUi::GoOfflineL" ) ) );
+        iDeactivateBt = ETrue;
+        iSysApOfflineModeController->SwitchFromOnlineToOfflineModeL();
+        }
+    }
+
+#ifndef SYSAP_USE_STARTUP_UI_PHASE
+// need to configure the above macro.
+#else // SYSAP_USE_STARTUP_UI_PHASE
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleUiReadyAfterBootL()
+// Called when startup UI activities has been finished
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::HandleUiReadyAfterBootL()
+    {
+    TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL" ) ) );    
+    TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
+
+    UpdateBatteryBarsL( state );   
+    DoSwStateNormalConstructionL();
+    HandleAccessoryProfileInStartupL();       
+   
+    if ( !iSysApPsmController ) // created here if first state change has not occurred yet
+       {
+       iSysApPsmController = CSysApPsmController::NewL( *this );        
+       }
+
+    if ( iSysApPsmController )
+       {
+        if ( iCharging ) // if charger is connected on boot PSM queries may need to be shown
+        {
+         HandleChargingStatusL( StateOfProperty( KPSUidHWRMPowerState, KHWRMChargingStatus ) );
+        }
+       }
+    
+    TInt batteryStatus = StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryStatus );
+    TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL: batteryStatus %d" ), batteryStatus ) );
+    if(  batteryStatus == EBatteryStatusLow || batteryStatus == EBatteryStatusEmpty )
+        {
+        // low and empty battery states are informed to the user in device startup
+        HandleBatteryStatusL( batteryStatus );
+        }
+    else if ( iSysApPsmController && !iCharging )
+        {
+            TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL: batteryStatus %d, iCharging %d -> disable partial psm" ), batteryStatus, iCharging ) );
+
+            iSysApPsmController->BatteryLow( EFalse );
+            iSysApPsmController->DoEnablePartialPsm( EFalse );
+        }
+    
+    if ( ! iSysApUsbIndicatorController )
+        {
+        TRAPD ( usbErr, iSysApUsbIndicatorController = CreateSysApUsbIndicatorL( *this ) );
+        if ( usbErr )
+            {
+            TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL: error in constructing USB ind. controller %d" ), usbErr ) );
+            }
+        }
+   }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::DoStateChangedL(const RStarterSession::TGlobalState aSwState)
+// This method is not called after boot has finished.
 // ----------------------------------------------------------------------------
 
+void CSysApAppUi::DoStateChangedL(const RStarterSession::TGlobalState aSwState)
+    {
+    TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL: %d" ), aSwState ) );
+
+    TRAPD( simChangedErr, DoSimChangedFromPreviousBootL() );
+    TRACES( RDebug::Print( _L("CSysApAppUi::DoStateChangedL: simChangedErr = %d" ), simChangedErr ) );
+    simChangedErr = simChangedErr; // suppress 'variable not used' warning
+    LogsObserverL().HandleSimChangedCheckDoneL();
+
+    if ( iSysApFeatureManager->PowerSaveSupported() )
+        {
+        // create controller before checking battery state, so that power saving can be enabled during boot if needed
+        if ( !iSysApPsmController ) // created only in first state change
+            {
+            iSysApPsmController = CSysApPsmController::NewL( *this );        
+            }
+
+        // in charger boot explicitly disable  power save mode
+        if ( aSwState == RStarterSession::ECharging )
+            {
+            iSysApPsmController->ChargerConnected();
+            iSysApPsmController->DoEnablePartialPsm( EFalse ); // disable  power save now
+            }
+        }
+
+    if ( aSwState == RStarterSession::ECharging || aSwState == RStarterSession::EAlarm )
+        {
+        TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
+        //Also Charging status will be updated with the following function.
+        UpdateBatteryBarsL( state );    
+        }
+        
+    if( IsStateNormal() )
+        {
+        TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL to normal state.") ) );
+
+        iSysApBtController = CreateSysApBtControllerL( *this );
+        iSysApBtSapController = CreateSysApBtSapControllerL( *this );
+
+        if ( iActivateBt )
+            {
+            TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL Activating BT" ) ) );
+            SetBtPowerState( ETrue );
+            }
+
+        if ( iDeactivateBt )
+            {
+            TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL Deactivating BT" ) ) );
+            SetBtPowerState( EFalse );
+            }
+
+        if ( !StarterSession().Handle() )
+            {
+            User::Leave( KErrBadHandle );
+            }
+
+/*        if ( !KeyLock().Handle() )
+            {
+            User::Leave( KErrBadHandle );
+            }
+*/
+#ifdef __SYSAP_MODULE_TEST
+        ModuleTestShowUiNoteL( _L("SysAp: SW state normal!") );
+#endif
+        }
+
+    // Allow lights
+    iSysApLightsController->AllowLightsOn();
+    }
+
+#endif // SYSAP_USE_STARTUP_UI_PHASE
+
 CSysApAppUi::~CSysApAppUi()
     {
     TRACES( RDebug::Print( _L("~CSysApAppUi() started") ) );
     if( !iResourcesFreed )
-        {
+      {
         FreeResources();
-
-        iStarterSession.Close();
-
-        }
-
-    delete iSysApShutdownImage;
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-    if (iSysApShutdownAnimation)
-        {
-        RemoveFromStack( iSysApShutdownAnimation );
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-        delete iSysApShutdownAnimation;
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-        }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-    delete iProfileNote;
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-    if( iAnimTimer )
-        {
-        iAnimTimer->Cancel();
-        }
-    delete iAnimTimer;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-    delete iSysApPowerKeyMenuObserver;
-
+      }
     delete iSysApStartupController;
-
-#ifdef RD_MULTIPLE_DRIVE
-    iInsertedMemoryCards.Close();
-    delete  iSysApDriveEjectHandler;
-    delete iSysApDriveUnlockHandler;
-    delete iSysApDriveList;
-#endif // RD_MULTIPLE_DRIVE
-
-    TRACES( RDebug::Print( _L("~CSysApAppUi() completed") ) );
+    }
+        
+TBool CSysApAppUi::ResourcesFreed() const
+    {
+    return iResourcesFreed;
     }
 
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleLocationPrivacyIndicatorL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleLocationPrivacyIndicatorL( const TInt aState )
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleLocationPrivacyIndicatorL() state=%d"), aState ) );
-    if ( iSysApFeatureManager->LocationPrivacySupported() )
-        {
-        // Phase 1. Set all Location Privacy indicators off
-        if ( iSysApLocationPrivacyIndicator->iIndicatorIdAcceptAll != KSysApNoIndicator )
-            {
-            SetIndicatorStateL( iSysApLocationPrivacyIndicator->iIndicatorIdRejectAll, EAknIndicatorStateOff );
-            }
-        if ( iSysApLocationPrivacyIndicator->iIndicatorIdRejectAll != KSysApNoIndicator )
-            {
-            SetIndicatorStateL( iSysApLocationPrivacyIndicator->iIndicatorIdRejectAll, EAknIndicatorStateOff );
-            }
-        if ( iSysApLocationPrivacyIndicator->iIndicatorIdAlwaysAsk != KSysApNoIndicator )
-            {
-            SetIndicatorStateL( iSysApLocationPrivacyIndicator->iIndicatorIdAlwaysAsk, EAknIndicatorStateOff );
-            }
-        if ( iSysApLocationPrivacyIndicator->iIndicatorIdIndividualPrivacy != KSysApNoIndicator )
-            {
-            SetIndicatorStateL( iSysApLocationPrivacyIndicator->iIndicatorIdIndividualPrivacy, EAknIndicatorStateOff );
-            }
-        // Phase 2. Set the required Location Privacy indicator on
-        switch ( aState )
-            {
-            case EPSLocPrivAcceptAll:
-                if ( iSysApLocationPrivacyIndicator->iIndicatorIdAcceptAll != KSysApNoIndicator )
-                    {
-                    SetIndicatorStateL( iSysApLocationPrivacyIndicator->iIndicatorIdAcceptAll, EAknIndicatorStateOn );
-                    }
-                break;
-            case EPSLocPrivRejectAll:
-                if ( iSysApLocationPrivacyIndicator->iIndicatorIdRejectAll != KSysApNoIndicator )
-                    {
-                    SetIndicatorStateL( iSysApLocationPrivacyIndicator->iIndicatorIdRejectAll, EAknIndicatorStateOn );
-                    }
-                break;
-            case EPSLocPrivAlwaysAsk:
-                if ( iSysApLocationPrivacyIndicator->iIndicatorIdAlwaysAsk != KSysApNoIndicator )
-                    {
-                    SetIndicatorStateL( iSysApLocationPrivacyIndicator->iIndicatorIdAlwaysAsk, EAknIndicatorStateOn );
-                    }
-                break;
-            case EPSLocPrivIndividualPrivacy:
-                if ( iSysApLocationPrivacyIndicator->iIndicatorIdIndividualPrivacy != KSysApNoIndicator )
-                    {
-                    SetIndicatorStateL( iSysApLocationPrivacyIndicator->iIndicatorIdIndividualPrivacy, EAknIndicatorStateOn );
-                    }
-                break;
-            default:
-                break;
-            }
-        }
+void CSysApAppUi::ShowExampleUiNoteL( const TDesC& noteText )const
+    {          
+    //   QString msg  = QString::fromUtf16(aStringPointer.Ptr(),aStringPointer.Length());
+ 	TRACES( RDebug::Print( _L("CSysApAppUi::ShowExampleUiNoteL:: constructing CHbDeviceMessageBoxSymbian:BeGIN") ) );    
+    CHbDeviceMessageBoxSymbian *note = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EInformation);
+ 	CleanupStack::PushL(note);
+    TRACES( RDebug::Print( _L("CSysApAppUi::ShowExampleUiNoteL:: construction of CHbDeviceMessageBoxSymbian:END") ) ); 
+	//	HbMessageBox *note = new HbMessageBox (HbMessageBox ::MessageTypeInformation);
+    note->SetTextL(noteText);
+    //  note->SetTimeout(HbPopup::NoTimeout);
+	note->SetTimeout(5);
+ 	TRACES( RDebug::Print( _L("CSysApAppUi:: Display of  CHbDeviceMessageBoxSymbian::Begin") ) );    
+    note->ShowL();
+	TRACES( RDebug::Print( _L("CSysApAppUi:: Display of  CHbDeviceMessageBoxSymbian::End") ) );
+	CleanupStack::PopAndDestroy(note);
     }
 
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType )
-// ----------------------------------------------------------------------------
-
-TKeyResponse CSysApAppUi::HandleKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType )
+void CSysApAppUi::ExecQueryL( TSysapQuery aQuery, TDes8& aReturn )
     {
-    if ( ! iShutdownStarted )
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL: aKeyEvent.iCode:%d, aKeyEvent.iScanCode:%d, aType:%d, iIgnoreNextPowerKeyUpEvent:%d, iPowerKeyPopupMenuActive:%d, iLastPowerKeyWasShort:%d, iPowerKeyPopupMenuDismissed:%d"),
-                               aKeyEvent.iCode, aKeyEvent.iScanCode, aType, iIgnoreNextPowerKeyUpEvent, iPowerKeyPopupMenuActive, iLastPowerKeyWasShort, iPowerKeyPopupMenuDismissed ) );
-
-#ifdef _DEBUG
-        // camery latency measurement environment instrumentation, don't remove
-        if ( aType == EEventKey && aKeyEvent.iCode == EKeyCamera )
-            {
-            TRACES( RDebug::Print( _L("e_KEY_EVENT_SENDING 0") ) );
-            }
-#endif // _DEBUG
-
-        TKeyResponse response( EKeyWasNotConsumed );
-        if (iSysApKeyManagement && aKeyEvent.iCode != EKeyPowerOff && aKeyEvent.iCode != 'E')
-            {
-            response = iSysApKeyManagement->HandleKeyEventL(aKeyEvent, aType );
-            }
-        
-        if( aType == EEventKey )
-            {
-            switch ( aKeyEvent.iCode )
-                {
-#ifdef _DEBUG
-                case 'E': //For testing
-                    Exit();
-                    break;
-#endif
-                case EKeyPowerOff:
-                    //Short power key press
-                    iKeyBoardRepeatCount++;
-                    if( aKeyEvent.iRepeats == 0 )
-                        {
-                        TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, Short powerkey") ) );
-                        iLastPowerKeyWasShort = ETrue;
-                        HandleShortPowerKeyPressedL();
-                        iIgnoreNextPowerKeyRepeats = EFalse;
-                        }
-                    //Long power key press
-                    else if( aKeyEvent.iRepeats > 0 && iKeyBoardRepeatCount >= iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApPowerkeyRepeatcount ))
-                        {
-                        iKeyBoardRepeatCount = -1;
-                        TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, Long powerkey") ) );
-                        iLastPowerKeyWasShort = EFalse;
-                        HandleLongPowerKeyPressedL();
-                        }
-                    break;
-
-                default:
-                	{
-                	TKeyResponse response = EKeyWasNotConsumed;
-                	if (iSysApKeyManagement)
-                		{
-                		response = iSysApKeyManagement->HandleKeyEventL(aKeyEvent, aType );
-                		}
-
-                    if ( response == EKeyWasNotConsumed ) // none of the plugins consumed the key, offer it to default handling
-                        {
-                        iSysApDefaultKeyHandler->HandleKeyEventL( aKeyEvent, aType );
-                        }
-                	}
-                    break;
-                }
-            }
-        else if( aType == EEventKeyUp )
-            {
-            if( aKeyEvent.iScanCode == EStdKeyDevice2 )
-                {
-                if ( iIgnoreNextPowerKeyUpEvent )
-                    {
-                    if ( !iPowerKeyPopupMenuDismissed ) // If the popup menu has been dismissed, do nothing
-                        {
-                        iPowerKeyPopupMenuActive = ETrue;
-                        iIgnoreNextPowerKeyUpEvent = EFalse;
-                        }
-                    }
-                else if( iLastPowerKeyWasShort )
-                    {
-                    if ( iPowerKeyPopupMenuActive )
-                        {
-                        if ( iGlobalListQuery )
-                            {
-                            if ( iSysApFeatureManager->NoPowerKeySupported() )
-                                {
-                            	CancelGlobalListQuery();
-                                }
-                            else
-                                {
-                                iGlobalListQuery->MoveSelectionDown();	
-                                }                            
-                            }
-                        }
-                    }
-
-                }
-            }
-
-        TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL:ended, aKeyEvent.iCode:%d, aKeyEvent.iScanCode:%d, aType:%d, iIgnoreNextPowerKeyUpEvent:%d, iPowerKeyPopupMenuActive:%d, iLastPowerKeyWasShort:%d, iPowerKeyPopupMenuDismissed:%d"),
-                               aKeyEvent.iCode, aKeyEvent.iScanCode, aType, iIgnoreNextPowerKeyUpEvent, iPowerKeyPopupMenuActive, iLastPowerKeyWasShort, iPowerKeyPopupMenuDismissed ) );
-        }
-    else // shutdown started
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL: aKeyEvent.iCode:%d, aKeyEvent.iScanCode:%d, aType:%d"),
-                               aKeyEvent.iCode, aKeyEvent.iScanCode, aType ) );
-
-        // When shutdown has been started, only device mode key events are passed to plug-in framework
-        // This for enabling plug-in activities during shutdown animation
-        if ( IsDeviceModeKey( aKeyEvent ) ) // Other key events are not passed, because they must cancel the shutdown animation as stated in UI spefication
-            {
-            if ( aType == EEventKey && iSysApKeyManagement )
-                {
-                iSysApKeyManagement->HandleKeyEventL( aKeyEvent, aType );
-                }
-            }
-    #ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
-        else if ( aType == EEventKey && iSysApShutdownAnimation && !iShutdownContinued )
-            {
-            if ( aKeyEvent.iCode != EKeyPowerOff || iLastPowerKeyWasShort )
-                {
-                iSysApShutdownAnimation->Cancel();
-                NotifyShutdownAnimationSkip();
-                }
-            }
-
-    #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-        TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL: ended") ) );
-        }
-    return EKeyWasConsumed;
+    ExecQueryL( aQuery, aReturn, KNullDesC8 );
     }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::HandleCommandL( TInt aCommand)
+// CSysApAppUi::ExecQueryL
 // ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleCommandL( TInt aCommand )
+//
+void CSysApAppUi::ExecQueryL( TSysapQuery aQuery, TDes8& aReturn, const TDesC8& /*aParam*/ )
     {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleCommandL aCommend: %d"), aCommand ) );
-    switch ( aCommand )
+    TRACES( RDebug::Print(_L("CSysApAppUi::ExecQueryL: aQuery=%d"), aQuery ) );
+
+    switch ( aQuery )
         {
-        case EEikCmdExit:   // EAknCmdExit
-            Exit();
+        case EGetHwrmLight: // get handle to HWRM client session. Returns CHWRMLight*.
+            {
+            THwrmLightBuf retBuf( iSysApLightsController->GetHwrmLight() );
+            aReturn.Copy( retBuf );
+            }
             break;
+
+        case EGetKeylock: // get handle to keylock client session. Returns RAknKeylock2*.
+            {
+            // do nothing
+            }
+            break;
+
+
         default:
+            __ASSERT_DEBUG( EFalse, User::Panic( _L("CSysApAppUi::ExecQueryL: Invalid query"), KErrArgument ) );
+            User::Leave( KErrArgument );
             break;
         }
     }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::HandleApplicationSpecificEventL(TInt aType,const TWsEvent& aEvent)
+// CSysApAppUi::ExecCommandL
 // ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleApplicationSpecificEventL(TInt aType,const TWsEvent& aEvent)
+//
+void CSysApAppUi::ExecCommandL( TSysapCommand aCommand )
     {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleApplicationSpecificEventL: aType:%d"), aType ) );
+    ExecCommandL( aCommand, KNullDesC8 );
+    }
 
-    CAknAppUi::HandleApplicationSpecificEventL(aType, aEvent);
-    
-    if ( ResourcesFreed() )
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::HandleApplicationSpecificEventL: discarded, shutting down") ) );
-        return;
-        }
-    
-    switch( aType )
+// ----------------------------------------------------------------------------
+// CSysApAppUi::ExecCommandL
+// ----------------------------------------------------------------------------
+//
+void CSysApAppUi::ExecCommandL( TSysapCommand aCommand, const TDesC8&  /* aParam */ )
+    {
+    TRACES( RDebug::Print(_L("CSysApAppUi::ExecCommandL: aCommand=%d"), aCommand ) );
+
+    switch ( aCommand )
         {
-        case EEikKeyLockEnabled:
-            iKeyLockEnabled = ETrue;
-            iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive, 1 );
-            SetIndicatorStateL( EAknIndicatorKeyguard, EAknIndicatorStateOn );
-            iSysApLightsController->KeylockStateChangedL( ETrue );
-            break;
-        case EEikKeyLockDisabled:
-            iKeyLockEnabled = EFalse;
-            iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive, 0 );
-            SetIndicatorStateL( EAknIndicatorKeyguard, EAknIndicatorStateOff );
-            if (! iDeviceLockEnabled )
-                {
-                iSysApLightsController->KeylockStateChangedL( EFalse );
-                if ( iSysApFeatureManager->MmcHotSwapSupported() )
-                    {
-                    if ( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) !=  EPSCTsyCallStateRinging && StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) !=  EPSCTsyCallStateAlerting )
-                        {
-                        RunUnlockNotifierL();
-                        }
-                    }
-                }
-            break;
-        case EEikKeyLockPowerKeyPressed: //sent when power key is captured by keylockserver
-            HandleShortPowerKeyPressedL();
-            break;
-
-        case EEikKeyLockLightsOnRequest:
-            iSysApLightsController->SetLightsOnUnlockNoteL();
-            break;
-
-        case EEikEcsQueryLights: // emergency note is shown
-            iSysApLightsController->SetLightsOnEcsQueryL();
-            break;
-
-        case EEikSecurityQueryLights: // for device lock security query
-            iSysApLightsController->SetLightsOnSecurityQueryL();
+        case EResetKeyguardState: // reset the internal keyguard flags of the SysAp, except for iKeyLockOnBeforeCradle
+            iKeyLockOnBeforeCall = EFalse;
+            iKeyLockOnBeforeAlarm = EFalse;
             break;
 
         default:
+            // do nothing in release builds since no harm is done
+            __ASSERT_DEBUG( EFalse, User::Panic( _L("CSysApAppUi::ExecCommandL: Invalid command"), KErrArgument ) );
             break;
+        }
+    }
+    
+// ----------------------------------------------------------------------------
+// CSysApAppUi::TimerExpiredL()
+// ----------------------------------------------------------------------------
+void CSysApAppUi::TimerExpiredL()
+    {
+/*
+ * Not suppported , will take care in wk25
+ * #ifndef RD_MULTIPLE_DRIVE 
+ * CloseUIAppsInHotSwapL();
+ * #endif // RD_MULTIPLE_DRIVE
+*/   
+   }
+
+
+  // ----------------------------------------------------------------------------
+// CSysApAppUi::KeyLockState() const
+// ----------------------------------------------------------------------------
+
+TBool CSysApAppUi::KeyLockState() const
+    {
+    return iKeyLockEnabled;
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::DeviceLockState() const
+// ----------------------------------------------------------------------------
+
+TBool CSysApAppUi::DeviceLockState() const
+    {
+    return iDeviceLockEnabled;
+    }
+    
+// ----------------------------------------------------------------------------
+// CSysApAppUi::SysApFeatureManager
+// ----------------------------------------------------------------------------
+
+CSysApFeatureManager& CSysApAppUi::SysApFeatureManager()
+    {
+    __ASSERT_DEBUG( iSysApFeatureManager, User::Panic( _L("iSysApFeatureManager == NULL"), KErrBadHandle ) );
+
+    return *iSysApFeatureManager;
+    }
+    
+// ----------------------------------------------------------------------------
+// CSysApAppUi::ActivateKeyeventForwardingForLights()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::ActivateKeyeventForwardingForLights(TBool aActivate)
+    {
+    if( iSysApNspsHandler )
+        {
+        if ( aActivate )
+            {
+            iSysApNspsHandler->ActivateKeyeventForwardingForLights();
             }
+        else
+            {
+            iSysApNspsHandler->DeActivateKeyeventForwardingForLights();
+            }
+        }
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::StarterSession()
+// ----------------------------------------------------------------------------
+
+RStarterSession& CSysApAppUi::StarterSession()
+    {
+    if ( !iStarterSession.Handle() )
+        {
+        // All server connections are tried to be made KTriesToConnectServer times because occasional
+        // fails on connections are possible at least on some servers
+        TRACES( RDebug::Print( _L("CSysApAppUi::StarterSession: trying RStarterSession::Connect()") ) );
+        TInt thisTry = 0;
+        TInt err;
+        while ( ( err = iStarterSession.Connect() ) != KErrNone && ( thisTry++ ) <= KTriesToConnectServer )
+            {
+            User::After( KTimeBeforeRetryingServerConnection );
+            }
+
+        if ( err != KErrNone )
+            {
+            // What do in error case?
+            TRACES( RDebug::Print( _L("CSysApAppUi::StarterSession: RStarterSession::Connect() failed with %d"), err ) );
+            }
+        }
+
+    return iStarterSession;
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::SetBtPowerState()
+// ----------------------------------------------------------------------------
+TInt CSysApAppUi::SetBtPowerState( TBool aBtState )
+    {
+    if ( iSysApBtController )
+        {
+        return iSysApBtController->SetPowerState( aBtState );
+        }
+    else
+        {
+        return KErrNotReady;
+        }
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::SetStarterState()
+// ----------------------------------------------------------------------------
+
+TInt CSysApAppUi::SetStarterState( const RStarterSession::TGlobalState aState )
+    {
+    if ( iSysApStartupController->GlobalStateChangeAllowed( aState ) )
+        {
+        TRACES( RDebug::Print( _L("CSysApAppUi::SetStarterState: aState=%d" ), aState ) );
+        return StarterSession().SetState( aState );
+        }
+    else
+        {
+        TRACES( RDebug::Print( _L("CSysApAppUi::SetStarterState: aState=%d - not allowed" ), aState ) );
+        return KErrNone;
+        }
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::SetNetworkConnectionAllowed()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::SetNetworkConnectionAllowed( TCoreAppUIsNetworkConnectionAllowed aNetworkConnectionAllowed )
+    {
+    TRACES( RDebug::Print( _L("CSysApAppUi::SetNetworkConnectionAllowed: status: %d" ), aNetworkConnectionAllowed ) );
+
+    iSysApCenRepController->SetInt( KCRUidCoreApplicationUIs, KCoreAppUIsNetworkConnectionAllowed, (TInt) aNetworkConnectionAllowed );
+
+    // Also set the Symbian PS key used for the same purpose:
+    RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, aNetworkConnectionAllowed ? ESAPhoneOn : ESAPhoneOff);
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::BluetoothPowerMode()
+// ----------------------------------------------------------------------------
+TInt CSysApAppUi::BluetoothPowerMode() const
+    {
+    return iSysApCenRepBtObserver->BluetoothPowerMode();
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::SimSupported()
+// ----------------------------------------------------------------------------
+TBool CSysApAppUi::SimSupported()
+    {
+    return iSysApFeatureManager->SimSupported();
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::BtSapEnabled()
+// ----------------------------------------------------------------------------
+
+TBool CSysApAppUi::BtSapEnabled()
+    {
+    if ( iSysApBtSapController )
+        {
+        return iSysApBtSapController->BtSapEnabled();    
+        }  
+    return EFalse;
     }
 
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::InitializeStatusPaneAreaL()
+// CSysApAppUi::OfflineModeChangedL()
+// ----------------------------------------------------------------------------
+void CSysApAppUi::OfflineModeChangedL()
+    {
+#ifdef SYSAP_USE_STARTUP_UI_PHASE    
+    // if UI is not ready, don't update indicators
+    if ( !UiReady() )
+        {
+        return;
+        }
+#endif // SYSAP_USE_STARTUP_UI_PHASE
+
+#if 0 // Not used as of now
+    SetHacIndicatorL();
+#endif //0	
+    }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::UiReady()
+// 
 // ----------------------------------------------------------------------------
 
-void CSysApAppUi::InitializeStatusPaneAreaL()
+TBool CSysApAppUi::UiReady() const
     {
-    TRACES( RDebug::Print( _L("CSysApAppUi::InitializeStatusPaneAreaL(): START") ) );
-    TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
-
-    //Also Charging status will be updated with the following function.
-    UpdateBatteryBarsL( state );
+#ifdef SYSAP_USE_STARTUP_UI_PHASE    
+    return iSysApStartupController->UiReady(); 
+#else // SYSAP_USE_STARTUP_UI_PHASE
+    // if startup UI phase information is not used, global system state normal is handled as UI idle state
+    return IsStateNormal();
+#endif // SYSAP_USE_STARTUP_UI_PHASE        
+    }
 
-#ifdef SYSAP_USE_STARTUP_UI_PHASE
-    if ( OfflineModeActive() )
-        {
-        UpdateSignalBarsL( KAknSignalOffLineMode );
-        }
-    else
-        {
-        UpdateSignalBarsL();    
-        }          
-#else
-    UpdateSignalBarsL();
-#endif // SYSAP_USE_STARTUP_UI_PHASE
-    
-    SetSignalIndicatorL();
-    SetIhfIndicatorL();
-    SetHacIndicatorL();
-    LogsObserverL().HandleUiReadyL();
-
-    if ( iSysApEtelConnector )
-        {
-        iSysApEtelConnector->ReadSimSmsStoreStatusInStartup();
-        }
 
-    SetEnvelopeIndicatorL();
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::InitializeStatusPaneAreaL(): accessories") ) );
-
-    TAccMode accessoryState(EAccModeHandPortable);
-    if ( iSysApAccessoryObserver )
-        {
-        accessoryState = iSysApAccessoryObserver->GetAccessoryMode();
-        }
+// ----------------------------------------------------------------------------
+// CSysApAppUi::CompleteShutdown()
+// ----------------------------------------------------------------------------
 
-    if( accessoryState == EAccModeWiredHeadset ||
-        accessoryState == EAccModeWirelessHeadset ||
-        accessoryState == EAccModeHeadphones )
-        {
-        SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTTY,     EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOn );
-        SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
-        SetIndicatorStateL(  EAknIndicatorHDMI, EAknIndicatorStateOff );
-        }
-    else if( accessoryState == EAccModeLoopset )
-        {
-        SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTTY,     EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOn );
-        SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
-        SetIndicatorStateL(  EAknIndicatorHDMI, EAknIndicatorStateOff );
-        }
-    else if( accessoryState == EAccModeTextDevice )
+void CSysApAppUi::CompleteShutdown( const TBool aReset, const TInt aResetReason )
+    {
+    TRACES( RDebug::Print(_L("CSysApAppUi::CompleteShutdown(): START" ) ) );
+    
+    iCheckLongPowerKeyEvent = ETrue;
+
+    PrepareForShutdownImage();//SysAp's internal preparation for ShutDown with image
+
+    FreeResources();
+
+    if ( aReset )
         {
-        SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTTY,     EAknIndicatorStateOn );
-        SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
-        SetIndicatorStateL(  EAknIndicatorHDMI, EAknIndicatorStateOff );
-        }
-    else if( accessoryState == EAccModeWiredCarKit || accessoryState == EAccModeWirelessCarKit )
-        {
-        SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTTY,     EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOn );
-        SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
-        SetIndicatorStateL(  EAknIndicatorHDMI, EAknIndicatorStateOff );
-        }
-    else if( accessoryState == EAccModeTVOut )
-        {
-        SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTTY,     EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOn );
-        SetIndicatorStateL(  EAknIndicatorHDMI, EAknIndicatorStateOff );
-        }
-    else if (accessoryState == EAccModeHDMI )
-        {
-        SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
-                SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
-                SetIndicatorStateL( EAknIndicatorTTY,     EAknIndicatorStateOff );
-                SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
-                SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
-                SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff);
-                SetIndicatorStateL(  EAknIndicatorHDMI, EAknIndicatorStateOn );
-        }
-    else // all indicators off
-        {
-        SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTTY,     EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
-        SetIndicatorStateL(  EAknIndicatorHDMI, EAknIndicatorStateOff );
-        }
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::InitializeStatusPaneAreaL(): msg") ) );
-    state = StateOfProperty( KUidSystemCategory, KUidOutboxStatusValue );
-    if( state == ESADocumentsInOutbox )
-        {
-        SetIndicatorStateL( EAknIndicatorOutbox, EAknIndicatorStateOn );
-        }
-    else
-        {
-        SetIndicatorStateL( EAknIndicatorOutbox, EAknIndicatorStateOff );
-        }
-
-    state = StateOfProperty( KAlarmServerPubSubCategory, KWakeupAlarmPubSubKey );
-    
-    if( state == EActiveWakeupAlarmSet )
-        {
-        TRACES( RDebug::Print(_L("CSysApAppUi::InitializeStatusPaneAreaL called the SetIndicatorStateL with EActiveWakeupAlarmSet ")));
-        SetIndicatorStateL( EAknIndicatorAlarmClock, EAknIndicatorStateOn );
+        __ASSERT_DEBUG( aResetReason >= RStarterSession::ELanguageSwitchReset &&
+                        aResetReason <= RStarterSession::EDataRestoreReset,
+                        User::Invariant() );
+        StarterSession().Reset( static_cast<RStarterSession::TResetReason>( aResetReason ) );
         }
     else
         {
-        TRACES( RDebug::Print(_L("CSysApAppUi::InitializeStatusPaneAreaL called the SetIndicatorStateL with EActiveNoWakeupAlarmsSet ")));
-        SetIndicatorStateL( EAknIndicatorAlarmClock, EAknIndicatorStateOff );
+        StarterSession().Shutdown();
         }
 
-    state = StateOfProperty( KIrdaPropertyCategory, KIrdaStatus );
-    if( state == TIrdaStatusCodes::EIrLoaded || state == TIrdaStatusCodes::EIrDisconnected || state == TIrdaStatusCodes::EIrBlocked )
+    StarterSession().Close();
+
+    TRACES( RDebug::Print(_L("CSysApAppUi::CompleteShutdown(): END" ) ) );
+    }
+
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::DoShutdownL( const TBool aReset, const TSWStartupReason aSWStartupReason )
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::DoShutdownL( const TBool aReset, const TInt aResetReason )
+    {
+    TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL: aResetReason:%d, aReset:%d" ),
+        aResetReason, aReset ) );
+#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
+    TBool animationenabled( EFalse );
+#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
+    if( OkToInitiateShutdown() )
         {
-        SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateAnimate );
-        }
-    else if( state == TIrdaStatusCodes::EIrConnected  )
-        {
-        SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateOn );
+        TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL: Was OkToToInitiateShutdown" ) ) );
+
+
+        if ( !aReset && iSysApFeatureManager->Supported(KSysApFeatureIdGoodbyeNote) )
+            {
+            // show shutdown note
+            }
+
+        if( !aReset )
+            {
+    #ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+//            TRAPD( err, ShowAnimationL() );
+//            if ( err )
+                {
+     //           TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL ShowAnimationL() leaved: %d" ), err ) );
+                CompleteShutdown(aReset, aResetReason);
+                }
+            }
+        else // aReset
+           {
+            CompleteShutdown(aReset, aResetReason);
+            }
+    #else // RD_STARTUP_ANIMATION_CUSTOMIZATION
+            TRAPD( err, animationenabled = ShowAnimationL() );
+            if ( err )
+                {
+                TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL ShowAnimationL() leaved: %d" ), err ) );
+                }
+            }
+
+        if ( !animationenabled )
+            {
+            CompleteShutdown(aReset, aResetReason);
+            }
+    #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
         }
     else
         {
-        SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateOff );
-        }
-
-    iSysApCenRepCallForwardingObserver->UpdateCallForwardingIndicatorsL();
-
-    iSysApCenRepMsgWaitingObserver->UpdateMessageWaitingIndicatorsL();
-
-    state = StateOfProperty( KPSUidNetworkInfo, KNWHomeZoneStatus );
-    if( state == ENWNone || state == ENWCityZone )
-        {
-        SetIndicatorStateL( EAknIndicatorHomeZone, EAknIndicatorStateOff );
-        }
-    else if( state == ENWHomeZone )
-        {
-        SetIndicatorStateL( EAknIndicatorHomeZone, EAknIndicatorStateOn );
+        TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL: Was not OkToToInitiateShutdown" ) ) );
         }
-
-    // Initialize WLan state
-    state = StateOfProperty( KPSUidWlan, KPSWlanIndicator );
-    HandleWlanIndicatorL(state);
-
-    // Initialize Tarm state
-    state = StateOfProperty( KPSUidCoreApplicationUIs, KCoreAppUIsTarmIndicator );
-    HandleTarmIndicatorL(state);
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::InitializeStatusPaneAreaL(): END") ) );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleWlanIndicator()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::HandleWlanIndicatorL( TInt aValue )
-    {
-    if ( aValue == EPSWlanIndicatorAvailable )
-        {
-        SetIndicatorStateL( EAknIndicatorWlanActive,       EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorWlanActiveSecure, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorWlanAvailable,    EAknIndicatorStateOn  );
-        }
-    else if ( aValue == EPSWlanIndicatorActive )
-        {
-        SetIndicatorStateL( EAknIndicatorWlanAvailable,    EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorWlanActiveSecure, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorWlanActive,       EAknIndicatorStateOn  );
-        }
-    else if ( aValue == EPSWlanIndicatorActiveSecure )
-        {
-        SetIndicatorStateL( EAknIndicatorWlanAvailable,    EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorWlanActive,       EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorWlanActiveSecure, EAknIndicatorStateOn  );
-        }
-    else // No indication required
-        {
-        SetIndicatorStateL( EAknIndicatorWlanAvailable,    EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorWlanActive,       EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorWlanActiveSecure, EAknIndicatorStateOff );
-        }
+    TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL: END" ) ) );
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleTarmIndicatorL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleTarmIndicatorL( TInt aValue )
-    {
-    if ( aValue == ECoreAppUIsTarmTerminalSecurityOnIndicatorOn )
-        {
-        SetIndicatorStateL( EAknIndicatorTARM, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTARMModuleOn, EAknIndicatorStateOn );
-        }
-    else if ( aValue == ECoreAppUIsTarmMngActiveIndicatorOn )
-        {
-        SetIndicatorStateL( EAknIndicatorTARMModuleOn, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTARM, EAknIndicatorStateOn );
-        }
-    else
-        {
-        SetIndicatorStateL( EAknIndicatorTARM, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTARMModuleOn, EAknIndicatorStateOff );
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleShortPowerKeyPressedL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleShortPowerKeyPressedL()
-    {
-    TInt callState( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) );
-
-    TRACES (
-        RDebug::Print(
-        _L("CSysApAppUi::HandleShortPowerKeyPressedL() callState:%d, iDeviceLockEnabled:%d" ),
-        callState,
-        iDeviceLockEnabled );
-    );
-    iSysApLightsController->PowerKeyPressedL();
-
-    RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsHideAlarm, ECoreAppUIsHideAlarm );
 
 
-    if( UiReady() && !iDeviceLockEnabled )
-        {
-        if ( iPowerKeyPopupMenuActive )
-            {
-            //Do nothing here. EEventKeyUp moves selection in the list!
-            }
-        else if ( !iKeyLockEnabled
-            && callState != EPSCTsyCallStateAlerting
-            && callState != EPSCTsyCallStateRinging
-            && callState != EPSCTsyCallStateDialling )
-            //Show power key menu
-            {
-            ShowPowerKeyPopUpMenuL();
-            }
-        }
-    else 
-        {
-        TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) );
-        
-        if( swState == ESwStateAlarm )
-            //From Alarm state even a short press causes shutdown but charger state need to be checked
-            {
-            TInt chargerState( StateOfProperty( KPSUidHWRMPowerState, KHWRMChargingStatus ) );
-            if( chargerState == EChargingStatusNotConnected )
-                //shutdown
+/* 
+----------------------------------------------------------------------------
+CSysApAppUi::IsEncryptionOperationOngoingL()
+Introduced the code as a part of Sub : 405-3362 - Power Management SUB for ES 
+recapture functionalities in platform which support multidrive as well. 
+-------------------------------------------------------------------------------
+*/
+TBool CSysApAppUi::IsEncryptionOperationOngoingL() const
+    {
+        TBool deFeatureSupported(EFalse);
+        FeatureManager::InitializeLibL();
+        deFeatureSupported = FeatureManager::FeatureSupported( KFeatureIdFfDeviceEncryptionFeature);
+        FeatureManager::UnInitializeLib();
+
+        if(deFeatureSupported)
+            {         
+            /**
+             * Store the last memory status changed
+             * 0: Idle. It can be Encrypted or Decrypted
+             * 1: Encrypting
+             * 2: Decrypting
+             **/
+             
+            RProperty deProperty;
+            User::LeaveIfError(deProperty.Attach(KDevEncProtectedUid, KDevEncOperationKey,EOwnerThread));
+            TInt deValue = 0;
+            if((deProperty.Get(deValue)== KErrNone)&&( deValue == EOpEncrypting || deValue == EOpDecrypting))
                 {
-                StartShutDownTimerOnAlarmAndChargingStates();
+                deProperty.Close();
+                return ETrue;
                 }
             else
-                //to charging state
                 {
-                SetStarterState( RStarterSession::ECharging );
+                deProperty.Close();
+                return EFalse;
                 }
             }
-        }
+        else
+            {
+            return EFalse;
+            }
     }
 
 // ----------------------------------------------------------------------------
@@ -1104,8 +969,8 @@
 
     TInt swState;
     RProperty::Get( KPSUidStartup, KPSGlobalSystemState, swState );
-
-    iSysApLightsController->PowerKeyPressedL();
+    
+    iSysApLightsController->PowerKeyPressedL();  //need to handle later.
 
     if( swState == ESwStateStartingCriticalApps ||
         swState == ESwStateSelfTestOK ||
@@ -1121,10 +986,7 @@
             {
             if( iPowerKeyPopupMenuActive )
                 {
-                if ( iGlobalListQuery )
-                    {
-                    iGlobalListQuery->SelectItem();
-                    }
+                // do nothing
                 }
             else if( !iIgnoreNextPowerKeyRepeats )
                 {
@@ -1154,1101 +1016,356 @@
     }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::FreeResources()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::FreeResources()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::FreeResources") ) );
-
-    delete iSysApBatteryInfoController;
-    delete iSysApPsmController;
-
-    delete iSysApAudioRoutingObserver;
-
-    delete iProfileNamesArray;
-    iProfileNamesArray = NULL;
-
-    if ( iTimer )
-        {
-        iTimer->Cancel();
-        delete iTimer;
-        }
-
-    if ( iSapTimer )
-        {
-        iSapTimer->Cancel();
-        delete iSapTimer;
-        }
-
-    if ( iSysApTimer )
-        {
-        iSysApTimer->Cancel();
-        delete iSysApTimer;
-        }
-
-    delete iGlobalListQuery;
-
-    RWindowGroup groupWin = iCoeEnv->RootWin();
-    groupWin.CancelCaptureKey( iCapturedEKeyPowerOff );
-    groupWin.CancelCaptureKeyUpAndDowns( iCapturedEKeyPowerOffUpAndDowns );
-
-    delete iSysApDefaultKeyHandler;
-
-    if ( iProfileEngine )
-        {
-        iProfileEngine->Release();
-        }
-
-    delete iSysApSsSettingsObserver;
-    delete iSysApEtelConnector;
-
-    delete iSysApProfileObserver;
-    delete iSysApNspsHandler;
-    delete iSysApKeySndHandler;
-    delete iSysApCenRepMsgWaitingObserver;
-    delete iSysApCenRepCallForwardingObserver;
-    delete iSysApConnectionMonitorObserver;
-    delete iSysApCenRepLightSettingsObserver;
-    delete iSysApCenRepLogsObserver;
-    delete iSysApCenRepBtObserver;
-//    delete iSysApCenRepFmTxObserver;
-    delete iSysApCenRepHacSettingObserver;
-    delete iSysApCenRepController;
-
-    delete iSysApPubSubObserver;
-
-    delete iSysApMMCObserver;
-    delete iSysApMsgSimMemLowQuery;
-    delete iSysApWaitNote;
-    delete iSysApConfirmationQuery;
-    delete iSysApConfirmationQueryForRestart;
-    delete iSysApOfflineModeController;
-    delete iSysApUsbIndicatorController;
-    delete iSysApBtController;
-    delete iSysApBtSapController;
-    delete iSignalNotify;
-    delete iBatteryNotify;
-    delete iSysApSystemLock;
-    delete iSysApLocationPrivacyIndicator;
-    delete iSysApAccessoryObserver;
-    delete iSysApMediatorObserver;
-
-    delete iSysApKeyManagement;
-    iSysApKeyManagement = NULL;
-    delete iSysApLightsController;
-    iKeyLock.Close();
-    delete iSysApFeatureManager;
-
-    // Cleanup ECom, used by key management and light control
-    REComSession::FinalClose();
-
-    iResourcesFreed = ETrue;
-    TRACES( RDebug::Print( _L("CSysApAppUi::FreeResources:END") ) );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowUiNoteL( const TSysApNoteIds aNote ) const
+// CSysApAppUi::IsDeviceModeKey
 // ----------------------------------------------------------------------------
 
-void CSysApAppUi::ShowUiNoteL( const TSysApNoteIds aNote ) const
+TBool CSysApAppUi::IsDeviceModeKey( const TKeyEvent& aKeyEvent ) const
     {
-    TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL aNote: %d"), aNote ) );
+    return CSysApDefaultKeyHandler::IsDeviceModeKey( aKeyEvent );
+    }
+
 
-    TInt tone( EAvkonSIDNoSound );
-    TAknGlobalNoteType noteType( EAknGlobalBatteryLowNote );
-    CAknGlobalNote* note = CAknGlobalNote::NewLC();
-    TInt secondaryDisplayId(SecondaryDisplay::ECmdNoNote);
+// ----------------------------------------------------------------------------
+// CSysApAppUi::ShowShutdownImage
+// ----------------------------------------------------------------------------
+//
+TInt CSysApAppUi::ShowShutdownImage( TInt aBitmapId )
+    {
+    TRACES( RDebug::Print(_L("CSysApAppUi::ShowShutdownImage") ) );
 
-    switch ( aNote )
+    TRAPD( err, ShowShutdownImageL( aBitmapId ) );
+
+    if ( err != KErrNone )
         {
-        case EBatteryLowNote:
-            noteType = EAknGlobalBatteryLowNote;
-            tone = EAvkonSIDBatteryLowTone;
-            break;
-        case EBatteryFullNote:
-            noteType = EAknGlobalBatteryFullNote;
-            tone = EAvkonSIDInformationTone;
-            break;
-        case ERechargeBatteryNote:
-            iSysApLightsController->BatteryEmptyL( ETrue );
-            noteType = EAknGlobalRechargeBatteryNote;
-            tone = EAvkonSIDRechargeBatteryTone;
-            break;
-        case ENotChargingNote:
-            noteType = EAknGlobalNotChargingNote;
-            tone = EAvkonSIDWrongCharger;
-            break;
-        case EInsertSimNote:
-            noteType = EAknGlobalInformationNote;
-            tone = EAvkonSIDInformationTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowInsertSimNote;
-            break;
-        case EMemoryCardRemovedWithoutEjectNote:
-            noteType = EAknGlobalInformationNote;
-            tone = EAvkonSIDInformationTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowMemoryCardRemovedWithoutEjectNote;
-            break;
-        case EGprsSuspendedNote:
-            noteType = EAknGlobalInformationNote;
-            tone = EAvkonSIDInformationTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowGprsSuspendedNote;
-            break;
-        case EGprsResumedNote:
-            noteType = EAknGlobalInformationNote;
-            tone = EAvkonSIDInformationTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowGprsResumedNote;
-            break;
-        case EShutdownNote:
-            noteType = EAknGlobalInformationNote;
-            tone = EAvkonSIDInformationTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowShutdownNote;
-            break;
-        case ECannotActivateOfflineModeNote:
-            noteType = EAknGlobalErrorNote;
-            tone = EAvkonSIDErrorTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowCannotActivateOfflineModeNote;
-            break;
-        case ECannotDeactivateOfflineModeNote:
-            noteType = EAknGlobalErrorNote;
-            tone = EAvkonSIDErrorTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowCannotDeactivateOfflineModeNote;
-            break;
-        case EKeypadActiveNote:
-            noteType = EAknGlobalInformationNote;
-            tone = EAvkonSIDInformationTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowKeypadActiveNote;
-            break;
-/*        case EFmTxAccessoryStandbyNote:
-            noteType = EAknGlobalInformationNote; 
-            tone = EAvkonSIDInformationTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowFmTxStandbyInAccessoryConnectionNote;
-            break;
-        case EFmTxAccessoryForbidsNote:
-            noteType = EAknGlobalInformationNote; 
-            tone = EAvkonSIDInformationTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowFmTxCannotEnableWhileAccessoryConnectedNote;
-            break;
-        case EFmTxVolumeDisabledNote:
-            noteType = EAknGlobalInformationNote; 
-            tone = EAvkonSIDInformationTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowFmTxVolumeDisabledNote;
-            break;
-        case EFmTxOnNote:
-            noteType = EAknGlobalInformationNote; 
-            tone = EAvkonSIDInformationTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowFmTxTuneRadioToFrequencyNote;
-            break;
-        case EFmTxOffNote:
-            noteType = EAknGlobalInformationNote; 
-            tone = EAvkonSIDInformationTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowFmTxDisabledNote;
-            break;
-*/        case EBatteryFullUnplugChargerNote:
-            noteType = EAknGlobalBatteryFullUnplugNote;
-            tone = EAvkonSIDInformationTone;
-            break;
-        case EUnplugChargerNote:
-            noteType = EAknGlobalUnplugChargerNote;
-            tone = EAvkonSIDInformationTone;
-            break;
-        case EPowerSaveModeActivated:
-            noteType = EAknGlobalConfirmationNote;
-            tone = EAvkonSIDConfirmationTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowPowerSavingActivatedNote;
-            break;
-        case EPowerSaveModeDeactivated:
-            noteType = EAknGlobalConfirmationNote;
-            tone = EAvkonSIDConfirmationTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowPowerSavingDeactivatedNote;
-            break;
-        case ECannotActivatePowerSaveMode:
-            noteType = EAknGlobalWarningNote;
-            tone = EAvkonSIDWarningTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowCannotActivatePowerSavingNote;
-            break;
-        case ECannotDeactivatePowerSaveMode:
-            noteType = EAknGlobalWarningNote;
-            tone = EAvkonSIDWarningTone;
-            secondaryDisplayId = SecondaryDisplay::ECmdShowCannotDeactivatePowerSavingNote;
-            break;
-        default:
-            break;
-
+        TRACES( RDebug::Print(_L("CSysApAppUi::ShowShutdownImageL failed, err=%d"), err ) );
         }
 
-    TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) );
-
-    if( UiReady() || swState == ESwStateSecurityCheck)
-        {
-        HBufC* noteStringBuf = NULL;
-
-        switch ( aNote )
-            {
-            case EInsertSimNote:
-                noteStringBuf = StringLoader::LoadLC( R_QTN_SU_NOTE_INSERT_SIM, iEikonEnv );
-                break;
-            case EMemoryCardRemovedWithoutEjectNote:
-                noteStringBuf = StringLoader::LoadLC( R_QTN_MEMS_EJECT_ERROR, iEikonEnv );
-                note->SetSoftkeys( R_AVKON_SOFTKEYS_OK_EMPTY );
-                break;
-            case EGprsSuspendedNote:
-                noteStringBuf = StringLoader::LoadLC( R_QTN_GPRS_CONF_GPRS_SUSPENDED, iEikonEnv );
-                break;
-            case EGprsResumedNote:
-                noteStringBuf = StringLoader::LoadLC( R_QTN_GPRS_CONF_GPRS_RESUMED, iEikonEnv );
-                break;
-            case EShutdownNote:
-                noteStringBuf = StringLoader::LoadLC( R_QTN_PWRC_INFO_GOODBYE, iEikonEnv);
-                break;
-            case ECannotActivateOfflineModeNote:
-                noteStringBuf = StringLoader::LoadLC( R_QTN_ERR_OFFLINE_UNABLE, iEikonEnv );
-                break;
-            case ECannotDeactivateOfflineModeNote:
-                noteStringBuf = StringLoader::LoadLC( R_QTN_ERR_OFFLINE_UNABLE_PROFILE, iEikonEnv );
-                break;
-            case EKeypadActiveNote:
-                if ( iSysApFeatureManager->PenEnabled() )
-                    {
-                    noteStringBuf = StringLoader::LoadLC( R_QTN_KEYG_CONF_DISPLAY_KEYS_ACTIVE,
-                                                          iEikonEnv );
-                    }
-                else
-                    {
-                    noteStringBuf = StringLoader::LoadLC( R_QTN_KEYG_CONF_KEYPAD_ACTIVE,
-                                                          iEikonEnv );
-                    }
-                note->SetAnimation( R_QGN_NOTE_KEYGUARD_OPEN_ANIM );
-                break;
-/*            case EFmTxOnNote:
-                {
-                const TInt KFrequencyMaxLength(7);
-                // read frequency
-                TInt frequencykHz = iSysApCenRepFmTxObserver->Frequency();
-                TReal frequencyMHz = static_cast<TReal>( frequencykHz ) / KCoefficientKhzToMhz; // kHz to Mhz
-                TBuf<KFrequencyMaxLength> frequencyAsString;
-                frequencyAsString.AppendNum( frequencyMHz, TRealFormat( KFrequencyMaxLength, KDecimalsInMhzFrequency ) );
-                AknTextUtils::LanguageSpecificNumberConversion( frequencyAsString );
-                noteStringBuf 
-                      = StringLoader::LoadLC( R_QTN_FMTX_SYSAP_INFO_NOTE_CHANGE_FREQ, 
-                                              frequencyAsString,
-                                              iEikonEnv );
-                break;
-                }
-            case EFmTxAccessoryForbidsNote:
-                {
-                noteStringBuf = StringLoader::LoadLC( R_QTN_FMTX_SYSAP_INFO_NOTE_ACCESSORY_FORBIDS, 
-                                                       iEikonEnv );
-                break;
-                }
-            case EFmTxAccessoryStandbyNote:
-                {                                     
-                noteStringBuf = StringLoader::LoadLC( R_QTN_FMTX_SYSAP_INFO_NOTE_ACCESSORY_STANDBY, 
-                                                       iEikonEnv );
-                break;
-                }
-            case EFmTxVolumeDisabledNote:
-                {
-                noteStringBuf = StringLoader::LoadLC( R_QTN_FMTX_SYSAP_INFO_NOTE_VOLUME_DISABLED, 
-                                                       iEikonEnv );
-                break;
-                }
-            case EFmTxOffNote:
-                {
-                noteStringBuf = StringLoader::LoadLC( R_QTN_FMTX_SYSAP_INFO_NOTE_DISABLED, 
-                                                       iEikonEnv );
-                break;
-                }
-*/            case EPowerSaveModeActivated:
-                noteStringBuf = StringLoader::LoadLC( R_QTN_POWER_SAVING_ACTIVATED_CONF_NOTE, iEikonEnv );
-                break;
-            case EPowerSaveModeDeactivated:
-                noteStringBuf = StringLoader::LoadLC( R_QTN_POWER_SAVING_DEACTIVATED_CONF_NOTE, iEikonEnv );
-                break;
-            case ECannotActivatePowerSaveMode:
-                noteStringBuf = StringLoader::LoadLC( R_QTN_POWER_SAVING_FAILED_WARNING_NOTE, iEikonEnv );
-                break;
-            case ECannotDeactivatePowerSaveMode:
-                noteStringBuf = StringLoader::LoadLC( R_QTN_POWER_SAVING_DEACTIVATION_FAILED_WARNING_NOTE, iEikonEnv ); 
-                break;
-            default:
-                break;
-            }
-
-        note->SetTone( tone );
-
-        // Set secondary display data if necessary
-/*        if ( iSysApFeatureManager->CoverDisplaySupported() && secondaryDisplayId != SecondaryDisplay::ECmdNoNote)
-            {
-            TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL - Notifying secondary display") ) );
-            CAknSDData* sd;
-            
-            if ( aNote == EFmTxOnNote ) // frequency information is passed to secondary display
-                {
-                SecondaryDisplay::TFmTxFrequencyInKhzPckg pckg( iSysApCenRepFmTxObserver->Frequency() );
-                sd = CAknSDData::NewL( SecondaryDisplay::KCatSysAp, secondaryDisplayId, pckg );
-                }
-            else
-                {
-                sd = CAknSDData::NewL(SecondaryDisplay::KCatSysAp, secondaryDisplayId, KNullDesC8);
-                }
-             
-            note->SetSecondaryDisplayData(sd); // ownership to notifier client
-            }
-*/
-        if ( noteStringBuf )
-            {
-            TPtr textBuffer = noteStringBuf->Des();
-            TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL Next:note->ShowNoteL" ) ) );
-            note->ShowNoteL( noteType, textBuffer );
-            CleanupStack::PopAndDestroy( ); // noteStringbuf
-            }
-        else
-            {
-            TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL Next:note->ShowNoteL" ) ) );
-            note->ShowNoteL( noteType, KNullDesC );
-            }
-        }
-    else if( swState == ESwStateAlarm || swState == ESwStateCharging )
-        {
-        if ( aNote != EUnplugChargerNote ) // don't play tone when charger is disconnected in charging state
-            {
-            static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->PlaySound( tone );    
-            }
-        }
-
-    CleanupStack::PopAndDestroy(); // note
+    return err;
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowChargingNoteL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ShowChargingNoteL()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL") ) );
-    TBool showNote( ETrue );
-
-    TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) );
-    TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL: swState: %d"), swState ) );
-
-    if( UiReady() || swState == ESwStateSecurityCheck )
-        {
-        if ( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) ==  EPSCTsyCallStateRinging )
-            {
-            showNote = EFalse;
-            }
-        TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL KCTsyCallState=%d"), StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) ) );
-        if ( showNote ) // Power Mgmt UI spec defines that no Charging note is shown while the phone is ringing/alerting
-            {
-            CAknGlobalNote* chargingNote = CAknGlobalNote::NewLC();
-            chargingNote->SetTone( EAvkonSIDChargingBatteryTone );
-            chargingNote->ShowNoteL( EAknGlobalChargingNote, KNullDesC );
-            CleanupStack::PopAndDestroy( chargingNote );
-            }
-        }
-    else if( swState == ESwStateAlarm || swState == ESwStateCharging )
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL - Just play tone") ) );
-        static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->PlaySound( EAvkonSIDChargingBatteryTone );
-        }
-    else
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL - No note shown") ) );
-        }
-    }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::HandleChargerNotesL()
+// CSysApAppUi::ShowShutdownImageL
 // ----------------------------------------------------------------------------
-void CSysApAppUi::HandleChargerNotesL( const TInt aValue )
+//
+void CSysApAppUi::ShowShutdownImageL( TInt aBitmapId )
     {
-    TBool showNote(StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) !=  EPSCTsyCallStateRinging);
-    if ( aValue == EChargingStatusCharging )
-        {
-        iSysApLightsController->BatteryEmptyL( EFalse );
-        TRACES( RDebug::Print( _L("SysAp: charger connected") ) );
-        iSysApLightsController->ChargerConnectedL( ETrue );
-        ShowChargingNoteL();
-        }
-    //Display Not Charging note
-    else if ( aValue == EChargingStatusError )
+    TRACES( RDebug::Print(_L("CSysApAppUi::ShowShutdownImageL") ) );
+    // do nothing
+    if ( !iSysApShutdownImage ) // Shutdown image may be shown without entering normal state (e.g. charging), so construct here
         {
-        if(showNote)
-            {
-            ShowUiNoteL( ENotChargingNote );
-            }
+        TRACES( RDebug::Print( _L("CSysApAppUi::ShowShutdownImageL: trying CSysApShutdownImage::NewL()") ) );
+        iSysApShutdownImage = CSysApShutdownImage::NewL();
         }
-    else if ( aValue == EChargingStatusChargingComplete )
+    TRACES( RDebug::Print( _L("CSysApAppUi::ShowShutdownImageL: trying CSysApShutdownImage::ShowShutdownImageL()") ) );
+    iSysApShutdownImage->ShowShutdownImageL( aBitmapId );
+   }
+   
+// ----------------------------------------------------------------------------
+// CSysApAppUi::PrepareForShutdownImage()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::PrepareForShutdownImage()
+    {
+    TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownImage() START" ) ) );
+ 
+    // If RD_STARTUP_ANIMATION_CUSTOMIZATION is enabled, the following actions are always taken in PrepareForShutdownAnimation
+#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
+    if ( !iAnimationShowingTime ) // actions already taken in PrepareForShutdownAnimation
         {
-        iSysApLightsController->ChargingCompleteL();
+        static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->PlaySound( EAvkonSIDPowerOffTone );
+        CancelGlobalListQuery();
         
-        TSysApNoteIds note( EBatteryFullNote );
-        
-        if ( !iSysApUsbChargerDetector.HostOnlyUsbChargingUsed() &&
-             iSysApFeatureManager->Supported( KSysApFeatureIdChargerReminderNotes ) )
-            {
-            note = EBatteryFullUnplugChargerNote;
-            }
-        iSysApUsbChargerDetector.Reset();
-        if(showNote)
+        if ( iSysApPowerKeyMenuObserver )
             {
-            ShowUiNoteL( note );
-            }
-        }
-    else if ( aValue == EChargingStatusNotConnected )
-        {
-        TRACES( RDebug::Print( _L("SysAp: charger removed") ) );
-        iSysApLightsController->ChargerConnectedL( EFalse );
-        
-        if ( !iSysApUsbChargerDetector.HostOnlyUsbChargingUsed() &&
-             iSysApFeatureManager->Supported( KSysApFeatureIdChargerReminderNotes ) )
-            {
-		if(showNote)
-                {
-                ShowUiNoteL( EUnplugChargerNote );
-                }
+            iSysApPowerKeyMenuObserver->Cancel();
             }
-        iSysApUsbChargerDetector.Reset();
-        }
-    else if ( aValue == EChargingStatusNotCharging )
-        {
-        TRACES( RDebug::Print( _L("SysAp: Not charging") ) );
+        
+        // deactivate notifiers before showing the shutdown image
+        AknNotifierController::CancelAllNotifications();
+        AknNotifierController::HideAllNotifications(ETrue);
+        RWindowGroup groupWin = iCoeEnv->RootWin();
+        iCapturedAppskey = groupWin.CaptureKey( EKeyApplication, KModifierMask, KModifierMask );
+        iCapturedAppskeyUpAndDowns = groupWin.CaptureKeyUpAndDowns( EStdKeyApplication0, KModifierMask, KModifierMask );
         }
-    else if ( aValue == EChargingStatusAlmostComplete )
-        {
-        TRACES( RDebug::Print( _L("SysAp: Charging almost complete") ) );
-        }
-    else if ( aValue == EChargingStatusChargingContinued )
-        {
-        //in this case we simply want to scroll the battery bars and not turn light on or show ui note
-        // set lights controller iBatteryEmpty to EFalse
-        iSysApLightsController->BatteryEmptyL( EFalse );
-        TRACES( RDebug::Print( _L("SysAp: charging continues") ) );
-        }
+#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
+#ifndef __SYSAP_MODULE_TEST //to make errors during shutdown sequence being seen more easily
+    iEikonEnv->RootWin().SetOrdinalPosition(0, ECoeWinPriorityAlwaysAtFront );
+    TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownImage() Show Shutdown image" ) ) );
+    ShowShutdownImage( 1  );//EMbmSysapQgn_startup_screen
+#endif
+    TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownImage() END" ) ) );
     }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::ShowProfileNoteL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ShowProfileNoteL()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::ShowProfileNoteL") ) );
-
-    if ( UiReady() )
-        {
-        if ( iProfileNote )
-            {
-            // when a call is coming in, there might be a pending "Selected profile"
-            // we don't want to show anymore
-            iProfileNote->CancelNoteL( iProfileNoteId );
-            }
-
-        TBufC<KMaxProfileNameLength> profileName;
-        HBufC* noteStringBuf = NULL;
-        ActiveProfileNameL( profileName.Des() );
-        noteStringBuf = StringLoader::LoadLC( R_TEXT_MODE_SELECTED, profileName, iEikonEnv );
-        TPtr textBuffer = noteStringBuf->Des();
-        AknTextUtils::DisplayTextLanguageSpecificNumberConversion( textBuffer );
-
-        // profile note is constructed when it is needed for the first time
-        if ( !iProfileNote )
-            {
-            iProfileNote = CAknGlobalNote::NewL();
-            iProfileNote->SetTone( EAvkonSIDConfirmationTone );
-            }
-
-        // Set secondary display data if necessary
-        if ( iSysApFeatureManager->CoverDisplaySupported() )
-            {
-            TRACES( RDebug::Print( _L("CSysApAppUi::ShowProfileNoteL - Notifying secondary display") ) );
-            SecondaryDisplay::TProfileName sdProfileName;
-            sdProfileName.Append(profileName.Left(SecondaryDisplay::KProfileNameMaxLen));
-            SecondaryDisplay::TProfileNotePckg pckg(sdProfileName);
-            CAknSDData* sd = CAknSDData::NewL(SecondaryDisplay::KCatSysAp, SecondaryDisplay::ECmdShowProfileNote, pckg);
-            iProfileNote->SetSecondaryDisplayData(sd); // ownership to notifier client
-            }
-
-        iProfileNoteId = iProfileNote->ShowNoteL( EAknGlobalConfirmationNote, textBuffer );
-
-        CleanupStack::PopAndDestroy( ); // noteStringbuf
-
-        iSysApLightsController->ProfileChangedL(); // All notes should always turn lights on.
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowQueryL()
+// CSysApAppUi::OkToInitiateShutdown()
 // ----------------------------------------------------------------------------
 
-void CSysApAppUi::ShowQueryL( const TSysApConfirmationQueryIds aQueryId, const TDesC& aValue )
+TBool CSysApAppUi::OkToInitiateShutdown()
     {
-    CancelGlobalListQuery();
+    TInt swState;
+    RProperty::Get( KPSUidStartup, KPSGlobalSystemState, swState );
 
-    if ( aQueryId == ESysApRestartPhoneQuery )
-        {
-        iDisablePowerkeyMenu = ETrue;
-        // Cancel any other query that might be outstanding (i.e. ESysApRemoveMmcNote),
-        // to avoid multiple overlapping queries causing problems
-        if ( iSysApConfirmationQuery )
-            {
-            iSysApConfirmationQuery->Cancel();
-            }
-
-        if ( !iSysApConfirmationQueryForRestart )
-            {
-            TRACES( RDebug::Print( _L("CSysApAppUi::ShowQueryL: trying CSysApConfirmationQuery::NewL() for restart") ) );
-            iSysApConfirmationQueryForRestart = CSysApConfirmationQuery::NewL( *this );
-            }
-
-        iSysApConfirmationQueryForRestart->ShowQueryL( aQueryId, iEikonEnv );
-        }
-    else
+    if( !iShutdownStarted &&
+        swState == ESwStateStartingCriticalApps ||
+        swState == ESwStateSelfTestOK ||
+        swState == ESwStateSecurityCheck ||
+        swState == ESwStateCriticalPhaseOK ||
+        swState == ESwStateEmergencyCallsOnly ||
+        swState == ESwStateCharging ||
+        swState == ESwStateAlarm ||
+        swState == ESwStateNormalRfOn ||
+        swState == ESwStateNormalRfOff ||
+        swState == ESwStateNormalBTSap ||
+        swState == ESwStateFatalStartupError )
         {
-        if ( !iSysApConfirmationQuery )
-            {
-            TRACES( RDebug::Print( _L("CSysApAppUi::ShowQueryL: trying CSysApConfirmationQuery::NewL()") ) );
-            iSysApConfirmationQuery = CSysApConfirmationQuery::NewL( *this );
-            }
-
-        iSysApConfirmationQuery->ShowQueryL( aQueryId, aValue, iEikonEnv );
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::UpdateBatteryBarsL( const TInt aState )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::UpdateBatteryBarsL( const TInt aState )
-    {
-    TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMChargingStatus ) );
-    TRACES( RDebug::Print( _L("CSysApAppUi::UpdateBatteryBarsL aState: %d, chargerState:%d"), aState, state ) );
-    HandleUsbCharger( state );
-    if( state == EChargingStatusCharging ||
-        state == EChargingStatusChargingContinued ||
-        state == EChargingStatusAlmostComplete )
-        {
-        if ( !iCharging )
-            {
-            TRACES( RDebug::Print( _L("CSysApAppUi::UpdateBatteryBarsL: Starting Charging") ) );
-            iBatteryNotify->StartChargingL();
-            iCharging = ETrue;
-            }
-
-        // When Avkon supports battery state sending while charging,
-        // add setting battery level here also.
+        iShutdownStarted = ETrue;
+        return ETrue;
         }
     else
         {
-        if ( iCharging )
-            {
-            TRACES( RDebug::Print( _L("CSysApAppUi::UpdateBatteryBarsL: Stopping Charging") ) );
-            iBatteryNotify->StopChargingL();
-            iCharging = EFalse;
-            }
-
-        if( state == KErrUnknown || aState == KErrUnknown )
-            {
-            TRACES( RDebug::Print( _L("CSysApAppUi::UpdateBatteryBarsL: CAknBatteryNotify::SetBatteryLevelL(0)") ) );
-            iBatteryNotify->SetBatteryLevelL( 0 );
-            }
-        else
-            {
-            TRACES( RDebug::Print( _L("CSysApAppUi::UpdateBatteryBarsL: CAknBatteryNotify::SetBatteryLevelL(%d)"), aState - EBatteryLevelLevel0 ) );
-            iBatteryNotify->SetBatteryLevelL( aState - EBatteryLevelLevel0 );
-            }
-        }
-    
-    if ( !iSysApPsmController ) // created here if first state change has not occurred yet
-        {
-        iSysApPsmController = CSysApPsmController::NewL( *this );        
-        }
-
-    if ( iSysApPsmController )
-        {
-        if ( iSysApPsmController->FullPsmEnabled() )
-            {
-            iBatteryNotify->SetBatteryStateL( EAknBatteryIndicatorPowerSave );
-            }
-        else
-            {
-            iBatteryNotify->SetBatteryStateL( EAknBatteryIndicatorNormal );
-            }            
-        }
-        
-    if ( iSysApBatteryInfoController )        
-        {
-        iSysApBatteryInfoController->BatteryLevelUpdatedL();
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::UpdateSignalBarsL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::UpdateSignalBarsL()
-    {
-    UpdateSignalBarsL(iSysApEtelConnector->GetSignalBars());
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::UpdateSignalBarsL( const TInt aState )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::UpdateSignalBarsL( const TInt aState )
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::UpdateSignalBarsL aState: %d"), aState ) );
-
-    if( aState == KAknSignalOffLineMode || (iSysApOfflineModeController->OfflineModeActive() && !iEmergencyCallActive) )
-        {
-        iSignalNotify->SetSignalLevelL( KAknSignalOffLineMode );
-        }
-    else if( aState <= 0 )
-        {
-        // Do not update indicator show zero bars if we should be showing X over bars
-        // This is required for indicator to work correctly in BT SAP mode.
-        // Cannot use check for BT SAP enabled status, as zero bars notify comes before enabled status changes.
-        if ( !iIgnoreZeroNetworkBarNotifications )
-            {
-            iSignalNotify->SetSignalLevelL( 0 );
-            }
-        }
-    else
-        {
-        iSignalNotify->SetSignalLevelL( aState );
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetSignalIndicatorL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::SetSignalIndicatorL()
-    {
-    TSysApNetworkMode networkMode( ESysApGSM );
-
-    TInt networkModeFromNetworkInfo( StateOfProperty( KPSUidNetworkInfo, KNWTelephonyNetworkMode ) );
-    if ( networkModeFromNetworkInfo == ENWNetworkModeWcdma )
-        {
-        networkMode = ESysApWCDMA;
-        }
-    else
-        {
-        networkMode = ESysApGSM;
-        }
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::SetSignalIndicatorL: networkMode = %d" ), networkMode ) );
-
-    if( iSysApOfflineModeController->OfflineModeActive() && !iEmergencyCallActive )
-        {
-        // The device is in Offline Mode
-        if ( iSysApFeatureManager->Supported( KSysApFeatureIdGprs_G_Icon ) )
-            {
-            iSignalNotify->SetGprsStateL( EAknSignalGprsIndicatorOff );
-            }
-        else
-            {
-            iSignalNotify->SetCommonPacketDataStateL( EAknSignalCommonPacketDataIndicatorOff );
-            }
-        iSignalNotify->SetWcdmaStateL( EAknSignalWcdmaIndicatorOff );
-        iSignalNotify->SetHsdpaStateL( EAknSignalHsdpaIndicatorOff);
-        }
-    else
-        {
-        // The device is in Online Mode
-        switch ( networkMode )
-            {
-            case ESysApGSM:
-                SetSignalIndicatorGsmL();
-                break;
-
-            case ESysApWCDMA:
-                SetSignalIndicatorWcdmaL();
-                break;
-
-            default:
-                break;
-            }
+        return EFalse;
         }
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetSignalIndicatorGsmL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::SetSignalIndicatorGsmL()
+
+void CSysApAppUi::PopupNote()
     {
-    TInt signalGprsIndicatorState( 0 );
-    TInt signalIndicatorState( 0 );
-	TInt bearerValue = EBearerUnknown;
-
-	if(iSysApConnectionMonitorObserver)
-		{
-		bearerValue = iSysApConnectionMonitorObserver->GetBearerValue();
-		}
-
-	if(bearerValue == EBearerEdgeGPRS)
-		{
-		TInt egprsStatus = StateOfProperty( KUidSystemCategory, KPSUidGprsStatusValue );
-	    TRACES( RDebug::Print( _L("CSysApAppUi::SetSignalIndicatorGsmL gprsStatus: %d" ), egprsStatus ) );
-	    iSignalNotify->SetWcdmaStateL( EAknSignalWcdmaIndicatorOff );
-	    iSignalNotify->SetHsdpaStateL( EAknSignalHsdpaIndicatorOff );
-	    switch ( egprsStatus )
-	        {
-	        case EPSGprsContextActive:
-	            signalGprsIndicatorState = EAknSignalEdgeIndicatorContext;
-	            signalIndicatorState = EAknSignalCommonPacketDataIndicatorContext;
-	            iGprsActivated = ETrue;
-	            iGprsSuspended = EFalse;
-	            HandleGprsNotesL();
-	            break;
-
-	        case EPSGprsContextActivating:
-	            signalGprsIndicatorState = EAknSignalEdgeIndicatorEstablishingContext;
-	            signalIndicatorState = EAknSignalCommonPacketDataIndicatorEstablishingContext;
-	            iGprsActivated = EFalse;
-	            iGprsSuspended = EFalse;
-	            break;
-
-	        case EPSGprsSuspend:
-	            signalGprsIndicatorState = EAknSignalEdgeIndicatorSuspended;
-	            signalIndicatorState = EAknSignalCommonPacketDataIndicatorSuspended;
-	            iGprsSuspended = ETrue;
-	            HandleGprsNotesL();
-	            break;
-
-	        case EPSGprsAttach:
-	            signalGprsIndicatorState = EAknSignalEdgeIndicatorAttached;
-	            signalIndicatorState = EAknSignalCommonPacketDataIndicatorAttached;
-	            iGprsActivated = EFalse;
-	            iGprsSuspended = EFalse;
-	            break;
-
-	        case EPSGprsMultibleContextActive:
-	            signalGprsIndicatorState = EAknSignalEdgeIndicatorMultipdp;
-	            signalIndicatorState = EAknSignalCommonPacketDataIndicatorMultipdp;
-	            iGprsActivated = ETrue;
-	            iGprsSuspended = EFalse;
-	            HandleGprsNotesL();
-	            break;
-
-	        case EPSGprsUnattached:
-	        default:
-	            signalGprsIndicatorState = EAknSignalEdgeIndicatorOff;
-	            signalIndicatorState = EAknSignalCommonPacketDataIndicatorOff;
-	            iGprsSuspendedNoteShown = EFalse;
-	            iGprsActivated = EFalse;
-	            iGprsSuspended = EFalse;
-	            iCallActivated = EFalse;
-	            break;
-	        }
-        }
-	else
-		{
-
-		TInt gprsStatus = StateOfProperty( KUidSystemCategory, KPSUidGprsStatusValue );
-    	TRACES( RDebug::Print( _L("CSysApAppUi::SetSignalIndicatorGsmL gprsStatus: %d" ), gprsStatus ) );
-    	iSignalNotify->SetWcdmaStateL( EAknSignalWcdmaIndicatorOff );
-    	iSignalNotify->SetHsdpaStateL( EAknSignalHsdpaIndicatorOff );
-    	switch ( gprsStatus )
-            {
-            case EPSGprsContextActive:
-                signalGprsIndicatorState = EAknSignalGprsIndicatorContext;
-                signalIndicatorState = EAknSignalCommonPacketDataIndicatorContext;
-                iGprsActivated = ETrue;
-                iGprsSuspended = EFalse;
-                HandleGprsNotesL();
-                break;
-
-            case EPSGprsContextActivating:
-                signalGprsIndicatorState = EAknSignalGprsIndicatorEstablishingContext;
-                signalIndicatorState = EAknSignalCommonPacketDataIndicatorEstablishingContext;
-                iGprsActivated = EFalse;
-                iGprsSuspended = EFalse;
-                break;
-
-            case EPSGprsSuspend:
-                signalGprsIndicatorState = EAknSignalGprsIndicatorSuspended;
-                signalIndicatorState = EAknSignalCommonPacketDataIndicatorSuspended;
-                iGprsSuspended = ETrue;
-                HandleGprsNotesL();
-                break;
-
-            case EPSGprsAttach:
-                signalGprsIndicatorState = EAknSignalGprsIndicatorAttached;
-                signalIndicatorState = EAknSignalCommonPacketDataIndicatorAttached;
-                iGprsActivated = EFalse;
-                iGprsSuspended = EFalse;
-                break;
-
-            case EPSGprsMultibleContextActive:
-                signalGprsIndicatorState = EAknSignalGprsIndicatorMultipdp;
-                signalIndicatorState = EAknSignalCommonPacketDataIndicatorMultipdp;
-                iGprsActivated = ETrue;
-                iGprsSuspended = EFalse;
-                HandleGprsNotesL();
-                break;
-
-            case EPSGprsUnattached:
-            default:
-                signalGprsIndicatorState = EAknSignalGprsIndicatorOff;
-                signalIndicatorState = EAknSignalCommonPacketDataIndicatorOff;
-                iGprsSuspendedNoteShown = EFalse;
-                iGprsActivated = EFalse;
-                iGprsSuspended = EFalse;
-                iCallActivated = EFalse;
-                break;
-            }
-		}
-
-	if(bearerValue == EBearerEdgeGPRS) //EdgeGPRS connection
-		{
-		if( iSysApFeatureManager->Supported( KSysApFeatureIdUseEdgeGPRSIcon ) )
-	    	{
-	    	iSignalNotify->SetEdgeStateL( signalGprsIndicatorState );
-	    	}
-	    else
-        	{
-        	iSignalNotify->SetCommonPacketDataStateL( signalIndicatorState );
-        	}
-		}
-	else
-		{
-
-	    if ( iSysApFeatureManager->Supported( KSysApFeatureIdGprs_G_Icon ) )
-    	    {
-        	iSignalNotify->SetGprsStateL( signalGprsIndicatorState );
-        	}
-    	else
-        	{
-        	TRACES( RDebug::Print( _L("CSysApAppUi::SetSignalIndicatorGsmL SetCommonPacketDataStateL( %d )" ), signalIndicatorState ) );
-        	iSignalNotify->SetCommonPacketDataStateL( signalIndicatorState );
-        	}
-		}
+    iIgnoreNextPowerKeyUpEvent = ETrue;
+    // TRACES( RDebug::Print( _L("CSysApAppUi::Key was consumed") ) );
+    _LIT(KPowerPressKey,"Short power key");
+    HBufC* aString = HBufC16::NewLC(50);
+    TPtrC aStringPointer = aString->Des();
+    aStringPointer.Set(KPowerPressKey);
+    TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
+    ShowExampleUiNoteL( aStringPointer );  
+    CleanupStack::PopAndDestroy(); // aString
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetSignalIndicatorWcdmaL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::SetSignalIndicatorWcdmaL()
-    {
-    TInt wcdmaStatus;
-    wcdmaStatus = StateOfProperty( KUidSystemCategory, KPSUidWcdmaStatusValue );
-    TRACES( RDebug::Print( _L("CSysApAppUi::SetSignalIndicatorWcdmaL: wcdmaStatus: %d" ), wcdmaStatus ) );
 
-    if ( iSysApFeatureManager->Supported( KSysApFeatureIdGprs_G_Icon ) )
-        {
-        iSignalNotify->SetGprsStateL( EAknSignalGprsIndicatorOff );
-        }
-    else
-        {
-        iSignalNotify->SetCommonPacketDataStateL( EAknSignalCommonPacketDataIndicatorOff );
-        }
+// ----------------------------------------------------------------------------
+// CSysApAppUi::SetUsbAttachStatus
+// ----------------------------------------------------------------------------
+#ifndef RD_MULTIPLE_DRIVE
+void CSysApAppUi::SetUsbAttachStatus( const TBool aUsbAttached )
+    {
+    // Prevent double beep when USB file transfer gets activated but
+    // allow MMC inserted beep when:
+    // a) USB file transfer is active
+    // b) MMC is not inserted when USB cable is attached
+    iHideNextBeep = ( iMMCInserted && aUsbAttached );
+    }
+#else // RD_MULTIPLE_DRIVE
+void CSysApAppUi::SetUsbAttachStatus( const TBool aUsbAttached )
+    {
+    TRACES( RDebug::Print(
+        _L( "CSysApAppUi::SetUsbAttachStatus: aUsbAttached: %d" ),
+        aUsbAttached ) );
 
-    TInt signalWcdmaIndicatorState;
-    TInt signalHsdpaIndicatorState;
-
-    switch ( wcdmaStatus )
+    if ( aUsbAttached )
         {
-        case EPSWcdmaContextActive:
-            signalWcdmaIndicatorState = EAknSignalWcdmaIndicatorContext;
-            signalHsdpaIndicatorState = EAknSignalHsdpaIndicatorContext;
-            break;
-        case EPSWcdmaContextActivating:
-            signalWcdmaIndicatorState = EAknSignalWcdmaIndicatorEstablishingContext;
-            signalHsdpaIndicatorState = EAknSignalHsdpaIndicatorEstablishingContext;
-            break;
-        case EPSWcdmaSuspend:
-            signalWcdmaIndicatorState = EAknSignalWcdmaIndicatorSuspended;
-            signalHsdpaIndicatorState = EAknSignalHsdpaIndicatorSuspended;
-            break;
-        case EPSWcdmaAttach:
-            signalWcdmaIndicatorState = EAknSignalWcdmaIndicatorAttached;
-            signalHsdpaIndicatorState = EAknSignalHsdpaIndicatorAttached;
-            break;
-        case EPSWcdmaMultipleContextActive:
-            signalWcdmaIndicatorState = EAknSignalWcdmaIndicatorMultipdp;
-            signalHsdpaIndicatorState = EAknSignalHsdpaIndicatorMultipdp;
-            break;
-        case EPSWcdmaUnattached:
-        default:
-            signalWcdmaIndicatorState = EAknSignalWcdmaIndicatorAvailable;
-            signalHsdpaIndicatorState = EAknSignalHsdpaIndicatorAvailable;
-            break;
+          // For ignoring extra beeps caused by USB file transfer
+/*        iSysApDriveList->ResetDrivesInsertBeepIgnored();
+        iSysApDriveList->MarkDrivesInsertBeepIgnored( iInsertedMemoryCards );
+        // Will take care in next sub
+*/        }
+    }
+#endif // RD_MULTIPLE_DRIVE
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::UsbChargerDetector
+// ----------------------------------------------------------------------------
+//
+TSysApUsbChargerDetector& CSysApAppUi::UsbChargerDetector()
+    {
+    return iSysApUsbChargerDetector;
+    }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleAccessoryDisconnectedL()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::HandleAccessoryDisconnectedL()
+    {
+    TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryDisconnectedL()" ) ) );
+
+
+    TAccMode accessoryState(EAccModeHandPortable);
+    if ( iSysApAccessoryObserver )
+        {
+        accessoryState = iSysApAccessoryObserver->GetAccessoryMode();
         }
 
-    TBool showHsdpaAvailable = EFalse;
-
-    if ( iSysApFeatureManager->Supported( KSysApFeatureIdUseHsdpaAvailableIcon ) )
+    if ( accessoryState == EAccModeHandPortable )
         {
-        // HSDPA Resource Availability information is a configurable feature.
-        showHsdpaAvailable = iSysApEtelConnector->HsdpaAvailable();
+        iSysApLightsController->AccessoryConnectedL( EFalse );
+        iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected, 0 );
         }
-    
-    TBool isHsdpaBearer = iSysApEtelConnector->IsBearerHsdpa();
-    
-    TRACES( RDebug::Print( _L("CSysApAppUi::SetSignalIndicatorWcdmaL: isHdpaBearer=%d, showHsdpaAvailable=%d" ),
-            isHsdpaBearer, showHsdpaAvailable ) );
-    
-    if ( isHsdpaBearer || showHsdpaAvailable )
-        {
-        iSignalNotify->SetWcdmaStateL( EAknSignalWcdmaIndicatorOff );
-    	iSignalNotify->SetHsdpaStateL( signalHsdpaIndicatorState );
-        }
-    else
-        {
-        iSignalNotify->SetHsdpaStateL( EAknSignalHsdpaIndicatorOff );
-        iSignalNotify->SetWcdmaStateL( signalWcdmaIndicatorState );
-        }
-    }
+
+    SetIhfIndicatorL();
+    SetHacIndicatorL();
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleGprsNotesL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleGprsNotesL()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleGprsNotesL" ) ) );
-    if ( iSysApFeatureManager->Supported( KSysApFeatureIdGPRSNotes ) )
+    // If lock disabled because of accessory, reactivate it, unless phone call or alarm is ongoing
+    if ( iKeyLockOnBeforeCradle )
         {
-        // In WCDMA system, receiving or making calls has no effect to the possibly
-        // existing PDP contexts i.e. GPRS notes are not needed.
-        TInt networkMode = StateOfProperty( KPSUidNetworkInfo, KNWTelephonyNetworkMode );
-        TRACES( RDebug::Print( _L("CSysApAppUi::HandleGprsNotesL: networkMode %d" ), networkMode ) );
-        if ( networkMode != ENWNetworkModeWcdma )
+        iKeyLockOnBeforeCradle = EFalse;
+        if ( !iKeyLockOnBeforeCall && !iKeyLockOnBeforeAlarm )
             {
-            if ( iGprsActivated && iGprsSuspended && iCallActivated && !iGprsSuspendedNoteShown )
+            if ( !iDeviceLockEnabled )
                 {
-                StartGprsSuspendedTimer();
+                iKeyguardController->EnableKeyguard(ETrue);
                 }
-            else if ( iGprsSuspendedNoteShown && !iGprsSuspended )
+            else
                 {
-                ShowUiNoteL( EGprsResumedNote );
-                iGprsSuspendedNoteShown = EFalse;
-                iGprsSuspended = EFalse;
-                iCallActivated = EFalse;
+                iKeyguardController->EnableKeyguard(EFalse);
                 }
             }
         }
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetIndicatorStateL( TInt aIndicator, TInt aState )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::SetIndicatorStateL( const TInt aIndicator, const TInt aState ) const
-    {
-    CAknSmallIndicator* theIndicator = CAknSmallIndicator::NewLC( TUid::Uid( aIndicator ) );
-    theIndicator->SetIndicatorStateL( aState );
-    CleanupStack::PopAndDestroy(); //theIndicator
-    }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::GoOnlineL()
+// CSysApAppUi::HandleAccessoryConnectedL()
 // ----------------------------------------------------------------------------
 
-void CSysApAppUi::GoOnlineL( TBool aDoProfileChange )
+void CSysApAppUi::HandleAccessoryConnectedL( TAccMode aAccessoryState )
     {
-    if ( iSysApFeatureManager->OfflineModeSupported() )
+    TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryConnectedL( aAccessoryState: %d ) "), aAccessoryState ) );
+
+    if ( aAccessoryState == EAccModeWirelessHeadset ||
+         aAccessoryState == EAccModeWiredHeadset ||
+         aAccessoryState == EAccModeHeadphones )
+        {
+        }
+    else if ( aAccessoryState == EAccModeLoopset )
+        {
+        }
+    else if ( aAccessoryState == EAccModeTextDevice )
         {
-        TRACES( RDebug::Print( _L("CSysApAppUi::GoOnlineL: going from off-line into on-line: aDoProfileChange=%d" ), aDoProfileChange ) );
-        // in case profile change is not needed, event handling for subsequent profile changes are must be allowed
-        iHandleNextProfileEvent = !aDoProfileChange;
-        iActivateBt = iSysApOfflineModeController->MustBtBeActivated();
+        }
+    else if ( aAccessoryState == EAccModeWirelessCarKit || aAccessoryState == EAccModeWiredCarKit )
+        {
+        }
+    else if ( aAccessoryState == EAccModeTVOut )
+        {
+        }
+    else if (aAccessoryState == EAccModeHDMI )
+            {
+            }
+
+    TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) );
+    TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryConnectedL: swState: %d"), swState ) );
+
+    if( UiReady() || swState == ESwStateSecurityCheck )
+        {
+        iSysApLightsController->AccessoryConnectedL( ETrue );
+        }
 
-        if ( aDoProfileChange )
+    if ( ( ! iSysApOfflineModeController->OfflineModeActive() ))
+        {
+        if ( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected ) < 1 )
+            // accessory not connected already
+             {
+            iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected, 1 );
+           }
+        }
+    
+    // Carkit and music stand have also light on permanently option that needs to be checked
+    if( aAccessoryState == EAccModeWiredCarKit || aAccessoryState == EAccModeMusicStand )
+        {
+        // When device is placed on a handsfree cradle, keyguard must be disabled (unless device is locked)
+        // Note: It is assumed that if carkit/music stand is connected, the phone is in the cradle.
+        if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCall || iKeyLockOnBeforeAlarm )
             {
-            TRAPD( err, ActivateProfileL( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileBeforeOfflineMode ) ) );
-            if ( err == KErrNotFound )
+            iKeyLockOnBeforeCradle = ETrue;
+
+            if ( iKeyLockEnabled && !iDeviceLockEnabled )
                 {
-                // Activate general profile instead, if previously used profile was not found
-                TRACES( RDebug::Print( _L("CSysApAppUi::GoOnlineL: Previously used profile was not found, restoring to general profile" ) ) );
-                ActivateProfileL(KGeneralProfileId);
+                iKeyguardController->DisableKeyguard(EFalse);
+                }
+            }
+        }
+    SetIhfIndicatorL();
+    SetHacIndicatorL();
+    }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::SetHacIndicatorL()
+// ----------------------------------------------------------------------------
+void CSysApAppUi::SetHacIndicatorL()
+    {
+
+    if ( !iSysApCenRepHacSettingObserver )
+        {
+        // Do nothing if HAC setting observer has not been created yet
+        // This occurs in case some party is trying to set HAC indicator during
+        // ConstructL(), e.g. when switching from offline to online during startup
+        TRACES( RDebug::Print( _L("CSysApAppUi::SetHacIndicatorL: do nothing, HAC observer does not exist yet") ) );
+        return;
+        }
+
+    if ( iSysApCenRepHacSettingObserver->HacMode() )
+        {
+        TBool accessoryConnected ( EFalse );
+
+        TAccMode accMode(EAccModeHandPortable);
+
+        if ( iSysApAccessoryObserver )
+            {
+            accMode = iSysApAccessoryObserver->GetAccessoryMode();
+
+            if ( accMode != EAccModeHandPortable )
+                {
+                accessoryConnected = ETrue;
                 }
             }
 
-        iSysApOfflineModeController->SwitchFromOfflineToOnlineModeL();
-        TRACES( RDebug::Print( _L("CSysApAppUi::GoOnlineL: iActivateBt = %d" ), iActivateBt ) );
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::GoOfflineL()
-// ----------------------------------------------------------------------------
+//        TInt indicatorState = EAknIndicatorStateOn;
 
-void CSysApAppUi::GoOfflineL()
-    {
-    if ( iSysApFeatureManager->OfflineModeSupported() )
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::GoOfflineL" ) ) );
-        iHandleNextProfileEvent = EFalse;
-        iDeactivateBt = ETrue;
-        ActivateProfileL( KOfflineModeProfileId );
-        iSysApOfflineModeController->SwitchFromOnlineToOfflineModeL();
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SwitchFromOnlineToOfflineModeL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::SwitchFromOnlineToOfflineModeL()
-    {
-/*    if ( iSysApFeatureManager->FmTxSupported() )
-        {
-        TFmTxState state = static_cast<TFmTxState>(StateOfProperty( KPSUidHWRMFmTx, KHWRMFmTxStatus ));
-        switch ( state )
+        if ( !accessoryConnected ) // When accessory is not connected, check offline and call state
             {
-            case EFmTxStateActive:
-            case EFmTxStateInactive:
-            case EFmTxStateScanning:
-                ShowQueryL( ESysApUseFmTxInOfflineQuery ); // show "use fm tx in offline?" if FM TX is on
-                break;
-            
-            default:
-                // do nothing
-                break;                
-            }
-        }
-*/    iSysApOfflineModeController->SwitchFromOnlineToOfflineModeL();
-    }
+            if ( OfflineModeActive() ) // HAC indicator is not shown in offline mode
+                {
+ //               indicatorState = EAknIndicatorStateOff;
+                }
+            else
+                {
+                // during active call with IHF activated HAC indicator is not shown
+                TInt callState( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) );
+                if ( callState < KErrNone )
+                    {
+                    callState = EPSCTsyCallStateNone;
+                    }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::OfflineModeChangedL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::OfflineModeChangedL()
-    {
-#ifdef SYSAP_USE_STARTUP_UI_PHASE    
-    // if UI is not ready, don't update indicators
-    if ( !UiReady() )
-        {
-        return;
-        }
-#endif // SYSAP_USE_STARTUP_UI_PHASE
-    
-    // Update network bar indicator
-    if ( OfflineModeActive() )
-        {
-        UpdateSignalBarsL( KAknSignalOffLineMode );
+                if ( callState != EPSCTsyCallStateNone && IhfEnabledL() )
+                    {
+ //                   indicatorState = EAknIndicatorStateOff;
+                    }
+                }
+
+            }
+        else
+            {
+            // If an accessory is connected, HAC indicator should not be shown
+//            indicatorState = EAknIndicatorStateOff;
+            }
+
+ //       SetIndicatorStateL( EAknIndicatorHAC, indicatorState );
+
         }
     else
         {
-        UpdateSignalBarsL();    
-        }        
-    
-    // Update network mode indicator
-    SetSignalIndicatorL();
-    
-    // Update HAC indicator
-    SetHacIndicatorL();
+        // If HAC is not active, always disable indicator regardless of accessory state
+ //       SetIndicatorStateL( EAknIndicatorHAC, EAknIndicatorStateOff );
+        }
+
+
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::OfflineModeActive()
-// ----------------------------------------------------------------------------
-TBool CSysApAppUi::OfflineModeActive()
-    {
-    return iSysApOfflineModeController->OfflineModeActive();
-    }
 
 // ----------------------------------------------------------------------------
 // CSysApAppUi::DoNotActivateBt()
@@ -2258,57 +1375,23 @@
     iSysApOfflineModeController->DoNotActivateBt();
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetBtPowerState()
-// ----------------------------------------------------------------------------
-TInt CSysApAppUi::SetBtPowerState( TBool aBtState )
-    {
-    if ( iSysApBtController )
-        {
-        return iSysApBtController->SetPowerState( aBtState );
-        }
-    else
-        {
-        return KErrNotReady;
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::KeyLockState() const
-// ----------------------------------------------------------------------------
-
-TBool CSysApAppUi::KeyLockState() const
-    {
-    return iKeyLockEnabled;
-    }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::DeviceLockState() const
+// CSysApAppUi::IhfEnabledL
 // ----------------------------------------------------------------------------
 
-TBool CSysApAppUi::DeviceLockState() const
-    {
-    return iDeviceLockEnabled;
-    }
-/*
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ChangeFmTxStateL()
-// ----------------------------------------------------------------------------     
-void CSysApAppUi::ChangeFmTxStateL( TBool aEnable )
+TBool CSysApAppUi::IhfEnabledL()
     {
-    // disable fm transmission
-    CHWRMFmTx* fmtx = CHWRMFmTx::NewLC();
-    if ( aEnable )
-       {
-       fmtx->EnableL();
-       }
-    else 
-       {
-       fmtx->DisableL();
-       }
-    CleanupStack::PopAndDestroy( fmtx );
-    } 
-*/
+    TRACES( RDebug::Print( _L("CSysApAppUi::IhfEnabledL(): iSysApAudioRoutingObserver=0x%x"), iSysApAudioRoutingObserver ) );
+
+    if ( !iSysApAudioRoutingObserver ) // create observer if needed
+        {
+        iSysApAudioRoutingObserver = CSysApAudioRoutingObserver::NewL( *this );
+        }
+
+    return iSysApAudioRoutingObserver->IhfEnabled();
+    }
+
 
 // ----------------------------------------------------------------------------
 // CSysApAppUi::SetIhfIndicatorL()
@@ -2334,786 +1417,100 @@
     if( (callState != EPSCTsyCallStateNone && IhfEnabledL() && !accessoryConnected)
         || accMode == EAccModeMusicStand )  // Music stand always shows IHF indicator
         {
-        SetIndicatorStateL( EAknIndicatorIHFActive, EAknIndicatorStateOn );
-
         if ( accMode == EAccModeMusicStand )
             {
-            // hide other accessory indicators to prevent displaying of duplicate icons in some cases
-            // e.g. when wireless hf is connected
-            SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
-            SetIndicatorStateL( EAknIndicatorTTY,     EAknIndicatorStateOff );
-            SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
-            SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
-            SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
-            SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
-            SetIndicatorStateL(  EAknIndicatorHDMI, EAknIndicatorStateOff );
+            // do nothing
             }
         }
     else
         {
-        SetIndicatorStateL( EAknIndicatorIHFActive, EAknIndicatorStateOff );
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleSmsStorageNotificationL( TBool aSimStoreFull )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleSmsStorageNotificationL( TBool aSimStoreFull )
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleSmsStorageNotificationL: aSimStoreFull: %d "), aSimStoreFull ) );
-
-    if ( aSimStoreFull )
-        {
-        HBufC* noteStringBuf;
-        noteStringBuf = StringLoader::LoadLC( R_QTN_MEMLO_MEMORY_LOW_SIM_MES, iEikonEnv );
-        TPtr textBuffer = noteStringBuf->Des();
-        iSysApMsgSimMemLowQuery->StartL( textBuffer );
-        CleanupStack::PopAndDestroy();
-        }
-
-    SetEnvelopeIndicatorL();
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleNspsRawKeyEventL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleNspsRawKeyEventL()
-    {
-#ifdef __SYSAP_MODULE_TEST
-    ModuleTestShowUiNoteL( _L("Network wakeup from NSPS") );
-#endif
-
-    if ( iSysApEtelConnector )
-        {
-        iSysApEtelConnector->CommandNetCsWakeupOnNsps();
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleNetworkNspsNotification( RMmCustomAPI::TNspsStatus aNspsStatus )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleNetworkNspsNotification( RMmCustomAPI::TNspsStatus aNspsStatus )
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleNetworkNspsNotification aNspsStatus:%d, iNsps:%d )" ), aNspsStatus, iNsps ) );
-    if( iSysApNspsHandler )
-        {
-        if( aNspsStatus == RMmCustomAPI::ENspsOn )
-            {
-            if( !iNsps )
-                {
-#ifdef __SYSAP_MODULE_TEST
-                TRAPD( err, ModuleTestShowUiNoteL( _L("Setting NSPS on") ) );
-#endif
-                iSysApNspsHandler->SetNspsOn();
-                iNsps = ETrue;
-                }
-            }
-        else if( aNspsStatus == RMmCustomAPI::ENspsOff )
-            {
-            if( iNsps )
-                {
-#ifdef __SYSAP_MODULE_TEST
-                TRAPD( err, ModuleTestShowUiNoteL( _L("Setting NSPS off") ) );
-#endif
-                iSysApNspsHandler->SetNspsOff();
-                iNsps = EFalse;
-                }
-            }
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleMessageTonePlayingQuitability( TInt aTonePlayingStatus )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleMessageTonePlayingQuitability( TInt aTonePlayingStatus )
-    {
-    if( iSysApNspsHandler )
-        {
-        if( aTonePlayingStatus == ECoreAppUIsStopTonePlaying )
-            {
-            iSysApNspsHandler->SetMessageToneNotPlaying();
-            }
-        else if( aTonePlayingStatus == ECoreAppUIsTonePlaying )
-            {
-            iSysApNspsHandler->SetMessageTonePlaying();
-            }
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ActivateKeyeventForwardingForLights()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ActivateKeyeventForwardingForLights(TBool aActivate)
-    {
-    if( iSysApNspsHandler )
-        {
-        if ( aActivate )
-            {
-            iSysApNspsHandler->ActivateKeyeventForwardingForLights();
-            }
-        else
-            {
-            iSysApNspsHandler->DeActivateKeyeventForwardingForLights();
-            }
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::StartShutDownTimerOnAlarmAndChargingStates()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::StartShutDownTimerOnAlarmAndChargingStates()
-    {
-    if( !iAlarmOrChargingStateShutdownStarted )
-        {
-        if ( !iTimer )
-            {
-            TRAPD( err, iTimer = CPeriodic::NewL( EPriorityNormal ) );
-
-            if ( err != KErrNone )
-                {
-                TRACES( RDebug::Print( _L("CSysApAppUi::StartShutDownTimerOnAlarmAndChargingStates: CPeriodic::NewL failed: %d"), err ) );
-                return;
-                }
-            }
-        iTimer->Cancel();
-        iTimer->Start( KDelayBeforeShuttingDownInAlarmAndChargingStates,
-                       KDelayBeforeShuttingDownInAlarmAndChargingStates,
-                       TCallBack( DoShutdownOnAlarmStateAfterCallBack, this ) );
-        iAlarmOrChargingStateShutdownStarted = ETrue;
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DoShutdownOnAlarmStateAfterCallBack( TAny* aObject )
-// ----------------------------------------------------------------------------
-
-TInt CSysApAppUi::DoShutdownOnAlarmStateAfterCallBack( TAny* aObject )
-    {
-    CSysApAppUi* appUi = STATIC_CAST( CSysApAppUi*, aObject );
-
-    if ( appUi->iTimer )
-        {
-        appUi->iTimer->Cancel();
-        }
-
-    TRAP_IGNORE( appUi->DoShutdownL( EFalse, KDummyReason ) );
-
-    return KErrNone;
-    }
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-// ----------------------------------------------------------------------------
-// CSysApAppUi::StartAnimTiming()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::StartAnimTiming()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::StartAnimTiming() Start animation timer, time %d ms" ), iAnimationShowingTime  ) );
-
-    if ( !iAnimTimer )
-        {
-        TRAPD( err, iAnimTimer = CPeriodic::NewL( EPriorityNormal ) );
-
-        if ( err != KErrNone )
-            {
-            TRACES( RDebug::Print( _L("CSysApAppUi::StartAnimTiming() CPeriodic::NewL failed %d " ), err ) );
-            return;
-            }
-        }
-
-    iAnimTimer->Start(
-        iAnimationShowingTime*KCoefficientToMakeMicroToMilliSeconds,
-        iAnimationShowingTime*KCoefficientToMakeMicroToMilliSeconds,
-        TCallBack( DoStopAnimTiming, this ) );
-    }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DoStopAnimTiming( TAny* aObject )
-// ----------------------------------------------------------------------------
-
-TInt CSysApAppUi::DoStopAnimTiming( TAny* aObject )
-    {
-    TInt err(KErrNone);
-    CSysApAppUi* appUi = STATIC_CAST( CSysApAppUi*, aObject );
-
-    // This method could theoretically be called by two timers (iAnimTimer and one in CSysApShutdownAnimation),
-    // so a check is needed to prevent multiple executions.
-    if ( !(appUi->iShutdownContinued) )
-        {
-        appUi->iShutdownContinued = ETrue;
-
-        TRACES( RDebug::Print( _L("CSysApAppUi::DoStopAnimTiming() Animation timer completed or animation skipped" ) ) );
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-        if ( appUi->iAnimTimer )
-            {
-            appUi->iAnimTimer->Cancel();
-            }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-        if ( appUi->iTimer )
-            {
-            appUi->iTimer->Cancel();
-            }
-
-        TRACES( RDebug::Print( _L("CSysApAppUi::DoStopAnimTiming() Call ContinueShutdown(...)" ) ) );
-        appUi->ContinueShutdown();
-        TRACES( RDebug::Print( _L("CSysApAppUi::DoStopAnimTiming() end") ) );
-        }
-
-    return err;
-    }
-
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::StartGprsSuspendedTimer()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::StartGprsSuspendedTimer()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::StartGprsSuspendedTimer()") ) );
-    if( !iAlarmOrChargingStateShutdownStarted ) // not relevant if shutting down
-        {
-        if ( !iTimer )
-            {
-            TRAPD( err, iTimer = CPeriodic::NewL( EPriorityNormal ) );
-
-            if ( err != KErrNone )
-                {
-                TRACES( RDebug::Print( _L("CSysApAppUi::StartGprsSuspendedTimer: CPeriodic::NewL failed: %d"), err ) );
-                return;
-                }
-            }
-
-        iTimer->Cancel();
-        iTimer->Start( KDelayBeforeShowingGprsSuspendedNote,
-                       KDelayBeforeShowingGprsSuspendedNote,
-                       TCallBack( ShowGprsSuspendedNoteAfterCallBack, this ) );
+        // do nothing
         }
     }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::ShowGprsSuspendedNoteAfterCallBack( TAny* aObject )
+// CSysApAppUi::DoLightsTimeoutChangedL
 // ----------------------------------------------------------------------------
-
-TInt CSysApAppUi::ShowGprsSuspendedNoteAfterCallBack( TAny* aObject )
+void CSysApAppUi::DoLightsTimeoutChangedL( const TInt aTimeout )
     {
-    TRACES( RDebug::Print( _L("CSysApAppUi::ShowGprsSuspendedNoteAfterCallBack") ) );
-
-    CSysApAppUi* appUi = STATIC_CAST( CSysApAppUi*, aObject );
-
-    if ( appUi->iTimer )
-        {
-        appUi->iTimer->Cancel();
-        }
-
-    // Note is needed if call is still active and used network is not WCDMA
-    TInt callType = appUi->StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallType );
-    TInt networkMode = appUi->StateOfProperty( KPSUidNetworkInfo, KNWTelephonyNetworkMode );
-    TRACES( RDebug::Print(
-        _L("CSysApAppUi::ShowGprsSuspendedNoteAfterCallBack: callType %d networkMode %d"),
-        callType, networkMode ) );
-    if ( EPSCTsyCallTypeCSVoice == callType && ENWNetworkModeWcdma != networkMode )
-        {
-        appUi->iGprsSuspendedNoteShown = ETrue;
-        TRAP_IGNORE( appUi->ShowUiNoteL( EGprsSuspendedNote ) );
-        }
-    return KErrNone;
+    iSysApLightsController->DoLightsTimeoutChangedL( aTimeout );
     }
 
+
 // ----------------------------------------------------------------------------
-// CSysApAppUi::HandleAccessoryConnectedL()
+// CSysApAppUi::DoSwStateNormalConstructionL()
 // ----------------------------------------------------------------------------
 
-void CSysApAppUi::HandleAccessoryConnectedL( TAccMode aAccessoryState )
+void CSysApAppUi::DoSwStateNormalConstructionL()
     {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryConnectedL( aAccessoryState: %d ) "), aAccessoryState ) );
+    // Let's ensure that the lights will remain on for 15 secs after sw state normal
+    User::ResetInactivityTime();
 
-    if ( aAccessoryState == EAccModeWirelessHeadset ||
-         aAccessoryState == EAccModeWiredHeadset ||
-         aAccessoryState == EAccModeHeadphones )
-        {
-        SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTTY,     EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOn );
-        SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
-        SetIndicatorStateL(  EAknIndicatorHDMI, EAknIndicatorStateOff );
-        }
-    else if ( aAccessoryState == EAccModeLoopset )
-        {
-        SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTTY,     EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOn );
-        SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
-        SetIndicatorStateL(  EAknIndicatorHDMI, EAknIndicatorStateOff );
-        }
-    else if ( aAccessoryState == EAccModeTextDevice )
+    TRACES( RDebug::Print( _L("CSysApAppUi::DoSwStateNormalConstructionL : START" ) ) );
+
+    // In case of unexpected reset (e.g. hidden boot) the keylock must be enabled silently. Locking is done
+    // prior to time-consuming initializations, because otherwise UI is in unlocked state for a few seconds.
+    if ( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive ) == 1  )
         {
-        SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTTY,     EAknIndicatorStateOn );
-        SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
-        SetIndicatorStateL(  EAknIndicatorHDMI, EAknIndicatorStateOff );
-        }
-    else if ( aAccessoryState == EAccModeWirelessCarKit || aAccessoryState == EAccModeWiredCarKit )
-        {
-        SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTTY,     EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOn );
-        SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
-        SetIndicatorStateL(  EAknIndicatorHDMI, EAknIndicatorStateOff );
-        }
-    else if ( aAccessoryState == EAccModeTVOut )
-        {
-        SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTTY,     EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOn );
-        SetIndicatorStateL(  EAknIndicatorHDMI, EAknIndicatorStateOff );
-        }
-    else if (aAccessoryState == EAccModeHDMI )
-            {
-            SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
-                    SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
-                    SetIndicatorStateL( EAknIndicatorTTY,     EAknIndicatorStateOff );
-                    SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
-                    SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
-                    SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff);
-                    SetIndicatorStateL(  EAknIndicatorHDMI, EAknIndicatorStateOn );
-            }
-
-    TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) );
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryConnectedL: swState: %d"), swState ) );
-
-    if( UiReady() || swState == ESwStateSecurityCheck )
-        {
-        iSysApLightsController->AccessoryConnectedL( ETrue );
+        TRACES( RDebug::Print( _L("CSysApAppUi::DoSwStateNormalConstructionL: enabling keylock") ) );
+        iKeyguardController->EnableKeyguard(ETrue);
         }
 
-    if ( ( ! iIgnoreAccessorySpecificProfileChanges ) && ( ! iSysApOfflineModeController->OfflineModeActive() ) )
-        {
-        TInt profileId( 0 );
-        TInt currentProfile( 0 );
-        currentProfile = ActiveProfileId();
+    // Initiate bearer change observation
+//    iSysApConnectionMonitorObserver = CSysApConnectionMonitorObserver::NewL( *this );
 
-        if ( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected ) < 1 )
-            // accessory not connected already
-             {
-            iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected, 1 );
-            iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApActiveProfileBeforeAccessoryConnected, currentProfile );
-            }
+    TRACES( RDebug::Print( _L("SysAp: trying CSystemLock::NewL" ) ) );
+    iSysApSystemLock = CSystemLock::NewL();
 
-        if ( aAccessoryState == EAccModeWirelessCarKit )
-            {
-            profileId = iSysApCenRepController->ProfileIdForSelectedAccessory( ESysApWirelessCarkit );
-            }
-        else if( aAccessoryState == EAccModeWiredHeadset ||
-                 aAccessoryState == EAccModeWirelessHeadset )
-            {
-            profileId = iSysApCenRepController->ProfileIdForSelectedAccessory( ESysApHeadset );
-            }
-        else if( aAccessoryState == EAccModeLoopset  )
-            {
-            profileId = iSysApCenRepController->ProfileIdForSelectedAccessory( ESysApLoopset );
-            }
-        else if( aAccessoryState == EAccModeTextDevice )
-            {
-            profileId = iSysApCenRepController->ProfileIdForSelectedAccessory( ESysApTty );
-            }
-        else if( aAccessoryState == EAccModeTVOut || aAccessoryState == EAccModeHDMI )
-            {
-            profileId = iSysApCenRepController->ProfileIdForSelectedAccessory( ESysApTvOut );
-            }
-        else if( aAccessoryState == EAccModeHeadphones )
-            {
-            profileId = iSysApCenRepController->ProfileIdForSelectedAccessory( ESysApHeadphones );
-            }
-        else if ( aAccessoryState == EAccModeWiredCarKit )
-            {
-            profileId = iSysApCenRepController->ProfileIdForSelectedAccessory( ESysApCarkit );
-            }
-        else if ( aAccessoryState == EAccModeMusicStand )
-            {
-            profileId = iSysApCenRepController->ProfileIdForSelectedAccessory( ESysApMusicStand );
-            }
-
-        // Carkit and music stand have also light on permanently option that needs to be checked
-        if( aAccessoryState == EAccModeWiredCarKit || aAccessoryState == EAccModeMusicStand )
-            {
-            // When device is placed on a handsfree cradle, keyguard must be disabled (unless device is locked)
-            // Note: It is assumed that if carkit/music stand is connected, the phone is in the cradle.
-            if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCall || iKeyLockOnBeforeAlarm )
-                {
-                iKeyLockOnBeforeCradle = ETrue;
-
-                if ( iKeyLockEnabled && !iDeviceLockEnabled )
-                    {
-                    KeyLock().DisableWithoutNote();
-                    }
-                }
-            }
-
-        if( profileId != KActiveProfile )
-            {
-            /*-1 because the first item in Accessory default profiles shared data values
-            is KActiveProfile and that must be subtracted from the index of profile to be activated*/
-
-            profileId -= 1;
-
-            TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryConnectedL: current profile: %d, accessory profile: %d" ),
-                               currentProfile, profileId ) );
-
-            if ( profileId != currentProfile )
-                {
-                iAccessoryJustConnected = ETrue;
-                iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileUpdateRequired, 1 );
-                ActivateProfileL( profileId );
-                }
-            }
+    
+    if ( iSysApFeatureManager->Supported( KSysApFeatureIdBatteryInfoPopup ) )
+        {
+        iSysApBatteryInfoController = CSysApBatteryInfoController::NewL( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsConf, 
+                                                                                                     KCoreAppUIsBatteryInformationLowThreshold ) );    
         }
-    SetIhfIndicatorL();
-    SetHacIndicatorL();
+    TRACES( RDebug::Print( _L("CSysApAppUi::DoSwStateNormalConstructionL : END" ) ) );
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleAccessoryDisconnectedL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleAccessoryDisconnectedL()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryDisconnectedL()" ) ) );
 
 
-    TAccMode accessoryState(EAccModeHandPortable);
-    if ( iSysApAccessoryObserver )
-        {
-        accessoryState = iSysApAccessoryObserver->GetAccessoryMode();
-        }
+// ----------------------------------------------------------------------------
+// CSysApAppUi::DoSimChangedFromPreviousBootL()
+// ----------------------------------------------------------------------------
 
-    if ( accessoryState == EAccModeHandPortable )
-        {
-        SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorTTY,     EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
-        SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
-        SetIndicatorStateL(  EAknIndicatorHDMI, EAknIndicatorStateOff );
-
-        iSysApLightsController->AccessoryConnectedL( EFalse );
-
-        if ( ! iIgnoreAccessorySpecificProfileChanges )
-            {
-            TInt activeProfile ( ActiveProfileId() );
+void CSysApAppUi::DoSimChangedFromPreviousBootL()
+    {
+    TRACES( RDebug::Print( _L("CSysApAppUi::DoSimChangedFromPreviousBootL: iSimChangedDone=%d" ), iSimChangedDone ) );
 
-            TInt activeProfileBeforeConnectingAccessory(
-                 iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApActiveProfileBeforeAccessoryConnected )
-                                                        );
-            if ( activeProfileBeforeConnectingAccessory < 0 ) // error
-                {
-                activeProfileBeforeConnectingAccessory = 0; // General Profile
-                }
-            TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryDisconnectedL: active profile now: %d, active profile before: %d," ),
-                                   activeProfile, activeProfileBeforeConnectingAccessory ) );
-
-            if ( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileUpdateRequired ) == 1 )
-                {
-                iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileUpdateRequired, 0 );
-                if ( activeProfile != activeProfileBeforeConnectingAccessory && ! iSysApOfflineModeController->OfflineModeActive() )
-                    {
-                    ActivateProfileL( activeProfileBeforeConnectingAccessory );
-                    }
-                }
-            iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected, 0 );
-            }
-        }
-
-    SetIhfIndicatorL();
-    SetHacIndicatorL();
-
-    // If lock disabled because of accessory, reactivate it, unless phone call or alarm is ongoing
-    if ( iKeyLockOnBeforeCradle )
+    if ( !iSimChangedDone  )
         {
-        iKeyLockOnBeforeCradle = EFalse;
-        if ( !iKeyLockOnBeforeCall && !iKeyLockOnBeforeAlarm )
-            {
-            if ( !iDeviceLockEnabled )
-                {
-                KeyLock().EnableKeyLock();
-                }
-            else
-                {
-                KeyLock().EnableAutoLockEmulation();
-                }
-            }
+        iSimChangedDone = ETrue;
+        CSysApSimChanged* simChanged = CSysApSimChanged::NewL( *this, iEikonEnv->FsSession() );
+        CleanupStack::PushL( simChanged );
+        simChanged->HandleSimChangedL();
+        CleanupStack::PopAndDestroy( simChanged );
         }
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleAccessoryProfileInStartupL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleAccessoryProfileInStartupL()
-    {
-    TRACES( RDebug::Print( _L( "CSysApAppUi::HandleAccessoryProfileInStartupL" ) ) );
-
-    if ( !iSysApOfflineModeController->OfflineModeActive() )
-        {
-        iIgnoreAccessorySpecificProfileChanges = EFalse;
-        TBool accessoryConnectedInShutdown( EFalse );
-        TInt accessoryTemp( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected ) );
-        if ( accessoryTemp == 1 )
-            {
-            accessoryConnectedInShutdown = ETrue;
-            }
-
-        TBool accessoryConnectedNow ( EFalse );
-
-        TAccMode accessoryState(EAccModeHandPortable);
-        if ( iSysApAccessoryObserver )
-            {
-            accessoryState = iSysApAccessoryObserver->GetAccessoryMode();
-            }
-
-        if ( accessoryState != EAccModeHandPortable )
-            {
-            accessoryConnectedNow = ETrue;
-            }
-        TRACES( RDebug::Print( _L( "CSysApAppUi::HandleAccessoryProfileInStartupL: accessoryConnectedInShutdown: %d, accessoryConnectedNow: %d" ),
-                              accessoryConnectedInShutdown, accessoryConnectedNow ) );
-
-        if ( accessoryConnectedInShutdown && !accessoryConnectedNow )
-            {
-            HandleAccessoryDisconnectedL();
-            }
-        else if ( !accessoryConnectedInShutdown && accessoryConnectedNow )
-            {
-            HandleAccessoryConnectedL( accessoryState );
-            }
-        else if ( !accessoryConnectedNow )
-            {
-            TInt activeProfile ( ActiveProfileId() );
-            iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApActiveProfileBeforeAccessoryConnected, activeProfile );
-            }
-        }
-    }
-
-#ifndef RD_MULTIPLE_DRIVE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ResolveUidFromThread()
-// ----------------------------------------------------------------------------
-TInt32 CSysApAppUi::ResolveUidFromThread( TUint aThreadId ) const
-    {
-    TInt resolvedUid = 0;
-
-    RThread appThread;
-    TInt err = appThread.Open( aThreadId );
-
-    if ( err == KErrNone )
-        {
-        resolvedUid = appThread.SecureId().iId;
-        }
-
-    appThread.Close();
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::ResolveUidFromThread: err=%d, aThreadId=%d, resolvedUid=0x%x"),
-                           err, aThreadId, resolvedUid ) );
-
-    return resolvedUid;
-    }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::CloseUIAppsInHotSwapL()
+// CSysApAppUi::IgnoreZeroNetworkBarNotifications
 // ----------------------------------------------------------------------------
-void CSysApAppUi::CloseUIAppsInHotSwapL()
+//
+void CSysApAppUi::IgnoreZeroNetworkBarNotifications(TBool aIgnore)
     {
-    TRACES( RDebug::Print( _L("CSysApAppUi::CloseUIAppsInHotSwapL") ) );
-
-    CArrayFixFlat<TInt>* wgIds=new(ELeave) CArrayFixFlat<TInt>(4);
-    CleanupStack::PushL(wgIds);
-    User::LeaveIfError(iCoeEnv->WsSession().WindowGroupList(0, wgIds));
-    TInt lastEntry=wgIds->Count()-1;
-    TRACES( RDebug::Print( _L( "CSysApAppUi::CloseUIAppsInHotSwapL: Found %d UI applications running." ), lastEntry + 1 ) );
-    TInt numberOfApplicationsToShutDown( 0 );
-    iApplicationScanningRoundNumber++;
-
-    for ( TInt i=lastEntry; i>=0; i--)
-        {
-        CApaWindowGroupName* doomedApp = CApaWindowGroupName::NewLC(iCoeEnv->WsSession(),wgIds->At(i));
-
-        TBool systemApp = doomedApp->IsSystem();
-        TBool hiddenApp = doomedApp->Hidden();
-
-        if ( systemApp || hiddenApp )
-            {
-            TRACES (
-                    TPtrC caption=doomedApp->Caption();
-                    RDebug::Print( _L("CSysApAppUi::CloseUIAppsInHotSwapL: Privileged app \"%S\" UID 0x%x will not be closed, system: %d, hidden: %d" ),
-                                   &caption,
-                                   doomedApp->AppUid().iUid,
-                                   systemApp,
-                                   hiddenApp);
-                    );
-            }
-        else if ( ( iFileManagerCloseDisabled && doomedApp->AppUid().iUid == KFileManagerAppUid ) ||
-                  doomedApp->AppUid().iUid == KAutolockAppUid )
-            {
-            // An additional failure protection: Autolock must not be closed in any circumstances
-            TRACES (
-                    TPtrC caption=doomedApp->Caption();
-                    RDebug::Print( _L("CSysApAppUi::CloseUIAppsInHotSwapL: Privileged app \"%S\" will not be closed, UID 0x%x"),
-                                   &caption,
-                                   doomedApp->AppUid().iUid );
-                    );
-            }
-        else if ( doomedApp->AppUid().iUid == 0 && !iTimeToKill )
-            {
-#ifdef _DEBUG
-            TApaTask task(iCoeEnv->WsSession());
-            task.SetWgId(wgIds->At(i));
-            TUint threadId = (TUint)(task.ThreadId());
-            TInt32 uid = ResolveUidFromThread( threadId );
-            // CApaWindowGroupName stores the application UID, and in early application startup state AppUid()-method returns 0
-            // In order not to accidentally close application that hasn't yet its window group properly set up, decicision whether
-            // to close the application is postponed, in maximum to the end of the waiting period.
-            TRACES ( RDebug::Print( _L("CSysApAppUi::CloseUIAppsInHotSwapL: Unknown app will not be closed yet, threadId=%d, UID 0x%x, size=%d"),
-                                    threadId, uid, sizeof(TApaTask) ) );
-#endif // _DEBUG
-            numberOfApplicationsToShutDown++; // wait note must be displayed
-            }
-        else
-            {
-            numberOfApplicationsToShutDown++;
-            TApaTask* task = new (ELeave) TApaTask(iCoeEnv->WsSession());
-            CleanupDeletePushL(task);
-            task->SetWgId(wgIds->At(i));
-
-            TRACES (
-                    const TDesC& caption = doomedApp->Caption();
-                    const TDesC& docname = doomedApp->DocName();
-                    const TDesC& wgname = doomedApp->WindowGroupName();
-                    TUid uid = doomedApp->AppUid();
-                    RDebug::Print( _L("CSysApAppUi::CloseUIAppsInHotSwapL: Closing app \"%S\" (ThreadId %d, WgId %d, UID 0x%X); Docname: %S, WGName : %S"),
-                                   &caption,
-                                   (TUint)(task->ThreadId()),
-                                   wgIds->At(i),
-                                   uid.iUid,
-                                   &docname,
-                                   &wgname);
-                    );
-
-            ResolveUidFromThread( (TUint)(task->ThreadId()) );
-
-            if ( iApplicationScanningRoundNumber == 1 )
-                {
-                task->EndTask(); // applications are kindly requested to close themselves on the first round
-                }
-            else if ( iTimeToKill )
-                {
-                TBool doKill = ETrue;
-
-                // final check, window group may still be uninitialized so use thread id for checking UID
-                if ( doomedApp->AppUid().iUid == 0 )
-                    {
-                    if ( ResolveUidFromThread( (TUint)(task->ThreadId()) ) == KAutolockAppUid )
-                        {
-                        doKill = EFalse;
-                        }
-                    }
-
-                if ( doKill )
-                    {
-                    TRACES( RDebug::Print( _L("CSysApAppUi::CloseUIAppsInHotSwapL: Killing app \"%S\""), &caption ) );
-                    task->KillTask(); // used after timeout on the last round
-                    }
-                }
-
-            CleanupStack::PopAndDestroy(); // task
-            }
-        CleanupStack::PopAndDestroy();  // doomedApp
-        }
-    CleanupStack::PopAndDestroy(); // wgIds
-
-    if ( numberOfApplicationsToShutDown > 0 && iApplicationScanningRoundNumber <= KMaxExitTimeInHotSwap )
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::CloseUIAppsInHotSwapL: Show wait note, unless already showing") ) );
-        if ( !iSysApWaitNote )
-            {
-            HBufC* noteStringBuf = StringLoader::LoadLC( R_QTN_MEMC_WAIT_EJECT, iEikonEnv );
-            iSysApWaitNote = CSysApWaitNote::NewL( iSysApFeatureManager->CoverDisplaySupported() );
-            iSysApWaitNote->ShowNoteL( EClosingApplicationsNote, noteStringBuf );
-            CleanupStack::PopAndDestroy();
-            }
-
-        if ( iApplicationScanningRoundNumber >= KMaxExitTimeInHotSwap )
-            {
-            iTimeToKill = ETrue;
-            }
-
-        if ( !iSysApTimer )
-            {
-            iSysApTimer = new ( ELeave ) CSysApTimer( *this );
-            }
-
-        iSysApTimer->ActivateTimerL( KApplicationScanningInterval );
-        }
-    else
-        {
-        iFileManagerCloseDisabled = EFalse;
-        CompleteAppsShuttingInHotSwapL();
-        }
+    iIgnoreZeroNetworkBarNotifications = aIgnore;
     }
 
-#endif // RD_MULTIPLE_DRIVE
+
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::TimerExpiredL()
+// CSysApAppUi::SwitchFromOnlineToOfflineModeL()
 // ----------------------------------------------------------------------------
-void CSysApAppUi::TimerExpiredL()
+void CSysApAppUi::SwitchFromOnlineToOfflineModeL()
     {
-#ifndef RD_MULTIPLE_DRIVE
-    CloseUIAppsInHotSwapL();
-#endif // RD_MULTIPLE_DRIVE
+   iSysApOfflineModeController->SwitchFromOnlineToOfflineModeL();
     }
 
-#ifndef RD_MULTIPLE_DRIVE
-// ----------------------------------------------------------------------------
-// CSysApAppUi::CompleteAppsShuttingInHotSwapL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::CompleteAppsShuttingInHotSwapL()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::CompleteAppsShuttingInHotSwapL iMMCEjectUsed=%d, iMMCInserted=%d"), iMMCEjectUsed, iMMCInserted ) );
-    CancelWaitNote();
-
-    if ( iMMCEjectUsed ) // From Powerkey Menu
-        {
-        DismountMMC();
-        TRACES( RDebug::Print( _L( "CSysApAppUi::CompleteAppsShuttingInHotSwapL: Show note: Remove MMC and press OK...." ) ) );
-        ShowQueryL( ESysApRemoveMmcNote );
-        }
-    else if ( !iMMCInserted ) // The MMC might have been already re-mounted, that's why !iMMCInserted
-        {
-        ShowMMCDismountedDialogL();
-        }
-    }
-#endif // RD_MULTIPLE_DRIVE
 
 // ----------------------------------------------------------------------------
 // CSysApAppUi::InitCloseSimApplicationsL()
@@ -3125,6 +1522,7 @@
     CloseSimApplicationsL();
     }
 
+
 // ----------------------------------------------------------------------------
 // CSysApAppUi::CloseSimApplicationsL()
 // ----------------------------------------------------------------------------
@@ -3186,6 +1584,7 @@
         }
     }
 
+
 // ----------------------------------------------------------------------------
 // CSysApAppUi::DoCloseSimApplicationsAfterCallBack
 // ----------------------------------------------------------------------------
@@ -3203,6 +1602,63 @@
     return KErrNone;
     }
 
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::NotifyPowerSaveModeL
+// ----------------------------------------------------------------------------
+//
+void CSysApAppUi::NotifyPowerSaveModeL( TSysApPsmStatus aStatus )
+    {
+    TRACES( RDebug::Print( _L("CSysApAppUi::NotifyPowerSaveModeL aStatus: %d"), aStatus ) );
+
+    // cancel any active power saving query because user has changed the state manually
+    // CancelQuery( ESysApBattChargingPowerSavingQuery );
+    // CancelQuery( ESysApBattLowPowerSavingQuery );
+    // will take care in next sub
+    
+    switch ( aStatus )
+        {
+        case MSysApPsmControllerNotifyCallback::EPsmActivationComplete:
+             UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
+             ShowUiNoteL( EPowerSaveModeActivated );
+             break;
+        
+        case MSysApPsmControllerNotifyCallback::EPsmDeactivationComplete:
+             UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
+             ShowUiNoteL( EPowerSaveModeDeactivated );
+             break;
+            
+        case MSysApPsmControllerNotifyCallback::EPsmActivationFailed:
+            ShowUiNoteL( ECannotActivatePowerSaveMode );
+            break;
+            
+        case MSysApPsmControllerNotifyCallback::EPsmDeactivationFailed:
+            ShowUiNoteL( ECannotDeactivatePowerSaveMode );
+            break;            
+        
+        default:
+            break;   
+        }
+    }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::ShowAlarmIndicatorL()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::ShowAlarmIndicatorL( TBool aShowIndicator )
+    {
+    if ( aShowIndicator)
+        {
+        // do nothing
+        }
+    else
+        {
+        // do nothing
+        }
+    }
+
+
 // ----------------------------------------------------------------------------
 // CSysApAppUi::AlertUiAlertingL( const TBool aAlerting )
 // ----------------------------------------------------------------------------
@@ -3224,6 +1680,45 @@
     iSysApLightsController->AlarmOccuredL( aAlerting );
     }
 
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleForcedLightsVTRequireL( const TInt aLightParameter )
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::HandleForcedLightsVTRequireL( const TInt aLightsParameter ) const
+    {
+    iSysApLightsController->HandleForcedLightsVTRequireL( aLightsParameter );
+    }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleForcedLightsSSRequireL( const TInt aLightParameter )
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::HandleForcedLightsSSRequireL( const TInt aLightsParameter ) const
+    {
+    iSysApLightsController->HandleForcedLightsSSRequireL( aLightsParameter );
+    }
+
+// ---------------------------------------------------------------------------- 
+// CSysApAppUi::HandleForcedLightsATCRequireL( const TInt aLightParameter ) 
+// ---------------------------------------------------------------------------- 
+void CSysApAppUi::HandleForcedLightsATCRequireL( const TInt aLightsParameter ) const 
+    { 
+    iSysApLightsController->HandleForcedLightsATCRequireL( aLightsParameter ); 
+    } 
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleLightsRequireL()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::HandleLightsRequireL() const
+    {
+    iSysApLightsController->HandleLightsRequireL();
+    }
+
+
 // ----------------------------------------------------------------------------
 // CSysApAppUi::AlertUiKeyLockOff( const TBool aKeyLockOff )
 // ----------------------------------------------------------------------------
@@ -3243,7 +1738,7 @@
                 iKeyLockOnBeforeAlarm = ETrue;
                 }
             }
-        KeyLock().DisableWithoutNote();
+        iKeyguardController->DisableKeyguard(EFalse);
         }
     else
         {
@@ -3254,61 +1749,33 @@
             TInt callState( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) );
             if ( callState == EPSCTsyCallStateNone || callState == EPSCTsyCallStateConnected )
                 {
-                KeyLock().EnableAutoLockEmulation();
+                iKeyguardController->EnableKeyguard(EFalse);
                 }
             }
         else if ( iKeyLockOnBeforeAlarm && !iKeyLockOnBeforeCradle && !iKeyLockOnBeforeCall )
             {
-            KeyLock().EnableKeyLock();
+            iKeyguardController->EnableKeyguard(ETrue);
             }
         iKeyLockOnBeforeAlarm = EFalse;
         }
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleLightsRequireL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleLightsRequireL() const
-    {
-    iSysApLightsController->HandleLightsRequireL();
-    }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::HandleRawKeyEventLightsRequireL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleRawKeyEventLightsRequireL() const
-    {
-    iSysApLightsController->HandleRawKeyEventLightsRequireL();
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleForcedLightsVTRequireL( const TInt aLightParameter )
+// CSysApAppUi::DoNotEnableKeylock()
 // ----------------------------------------------------------------------------
 
-void CSysApAppUi::HandleForcedLightsVTRequireL( const TInt aLightsParameter ) const
+void CSysApAppUi::DoNotEnableKeylock()
     {
-    iSysApLightsController->HandleForcedLightsVTRequireL( aLightsParameter );
+    if ( !iKeyLockOnBeforeCradle )
+        {
+        iShowkeypadActivatedNoteAfterSoftReject = iKeyLockOnBeforeCall;
+        }
+
+    iKeyLockOnBeforeCall = EFalse;
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleForcedLightsSSRequireL( const TInt aLightParameter )
-// ----------------------------------------------------------------------------
 
-void CSysApAppUi::HandleForcedLightsSSRequireL( const TInt aLightsParameter ) const
-    {
-    iSysApLightsController->HandleForcedLightsSSRequireL( aLightsParameter );
-    }
-
-// ---------------------------------------------------------------------------- 
-// CSysApAppUi::HandleForcedLightsATCRequireL( const TInt aLightParameter ) 
-// ---------------------------------------------------------------------------- 
-void CSysApAppUi::HandleForcedLightsATCRequireL( const TInt aLightsParameter ) const 
-    { 
-    iSysApLightsController->HandleForcedLightsATCRequireL( aLightsParameter ); 
-    } 
-      
 // ----------------------------------------------------------------------------
 // CSysApAppUi::SwitchLightsOnSoftRejectL()
 // ----------------------------------------------------------------------------
@@ -3317,605 +1784,6 @@
     iSysApLightsController->SwitchLightsOnSoftRejectL();
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::StateOfProperty()
-// ----------------------------------------------------------------------------
-TInt CSysApAppUi::StateOfProperty( const TUid& aCategory, const TUint aKey ) const
-    {
-    TInt err( KErrNone );
-    TInt value( 0 );
-    err = RProperty::Get( aCategory, aKey, value );
-    if ( err )
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::StateOfProperty. RProperty::Get: err=%d"), err ) );
-        return err;
-        }
-    return value;
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::BluetoothPowerMode()
-// ----------------------------------------------------------------------------
-TInt CSysApAppUi::BluetoothPowerMode() const
-    {
-    return iSysApCenRepBtObserver->BluetoothPowerMode();
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ActivateProfileL( const TInt aProfileId ) const
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ActivateProfileL( const TInt aProfileId ) const
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::ActivateProfile aProfileId: %d"), aProfileId ) );
-    //No use of returning the Profile error code since it only tells if the activation was succesfull or not.
-    iProfileEngine->SetActiveProfileL( aProfileId );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ActivateOnlineProfileL() const
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ActivateOnlineProfileL() const
-    {
-    ActivateProfileL( iProfileToBeActivated );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ActiveProfileNameL( TPtr aProfileName ) const
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ActiveProfileNameL( TPtr aProfileName )
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::ActiveProfileNameL START") ) );
-    MProfile* profile = iProfileEngine->ActiveProfileL();
-    const MProfileName& mProfileName = profile->ProfileName();
-    aProfileName = mProfileName.Name();
-    profile->Release();
-    TRACES( RDebug::Print( _L("CSysApAppUi::ActiveProfileNameL END") ) );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::CheckSilentModeL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::CheckSilentModeL()
-    {
-    TBool isSilent( EFalse );
-    MProfile* profile = iProfileEngine->ActiveProfileL();
-    isSilent = profile->IsSilent();
-    profile->Release();
-    if ( isSilent )
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::CheckSilentModeL: active profile is SILENT") ) );
-        iSysApLightsController->SetSilentModeOn( ETrue );
-        }
-    else
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::CheckSilentModeL: active profile is NOT SILENT") ) );
-        iSysApLightsController->SetSilentModeOn( EFalse );
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleProfileChangedL( const TInt aValue )
-// ----------------------------------------------------------------------------
-void CSysApAppUi::HandleProfileChangedL( const TInt aNewProfileId )
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleProfileChangedL: aNewProfileId=%d"), aNewProfileId ) );
-    CheckSilentModeL();
-    if ( iHandleNextProfileEvent )
-        {
-        if ( iAccessoryJustConnected )
-            {
-            iAccessoryJustConnected = EFalse;
-            }
-        else
-            {
-            // if the user delibarately changes profiles, the selected profile will
-            // remain active after disconnecting an accessory.
-            iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileUpdateRequired, 0 );
-            }
-
-		// Added as a part of REQ 415-6750 : Conditional UI-note for "Activated profile"
-        TInt   noNeedToShowTheNote = 0;      // if True, then note should not be shown
-        TInt    err = KErrNone;                            
-                                     
-      	err = RProperty::Get( KPSUidCoreApplicationUIs, KCoreAppUIsProfileActivatedNote, 
-                              noNeedToShowTheNote );   
-		/*
-  		If there occured an error, it is likely caused by the non-existing property. 
-  		So trying to set it only if no error occured for maintaining the default behavior. 
-		*/       
-        if( KErrNone == err )
-            { 
-            TInt error = RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsProfileActivatedNote, 
-                                     ECoreAppUIsProfileActivatedNoteNotShown );
-            }
-               
-        if(!noNeedToShowTheNote)  //    The value doesn't deny the showing, then...
-            {
-            ShowProfileNoteL();
-            }    
-        }
-
-    if ( aNewProfileId != KOfflineModeProfileId )
-        {
-        iActiveProfileBeforeOfflineMode = aNewProfileId;
-        iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileBeforeOfflineMode, aNewProfileId );
-        }
-
-    if ( aNewProfileId == KOfflineModeProfileId && ! iSysApOfflineModeController->OfflineModeActive() )
-        {
-        if ( BtSapEnabled() )
-            {
-            // Choosing "Offline Mode" will disconnect BT SAP
-            // SwitchFromOnlineToOfflineModeL() will be called from CSysApBtSapController
-            iSysApBtSapController->SwitchingToOffline();
-            iSysApBtSapController->Disconnect();
-            }
-        else
-            {
-            SwitchFromOnlineToOfflineModeL();
-            }
-        }
-    else if ( aNewProfileId != KOfflineModeProfileId && iSysApOfflineModeController->OfflineModeActive() )
-        {
-        if ( BtSapEnabled() )
-            {
-            iSysApOfflineModeController->DoNotActivateRF(); // Will be activated after BT SAP disconnection
-            }
-        iSysApOfflineModeController->SwitchFromOfflineToOnlineModeL();
-        }
-    iHandleNextProfileEvent = ETrue;
-    }
-
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::RestoreProfileL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::RestoreProfileL( const TBool aOffline )
-    {
-    iHandleNextProfileEvent = EFalse;
-    if ( aOffline )
-        {
-        ActivateProfileL( KOfflineModeProfileId );
-        }
-    else
-        {
-        ActivateProfileL( iActiveProfileBeforeOfflineMode );
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ActiveProfileId()
-// ----------------------------------------------------------------------------
-
-TInt CSysApAppUi::ActiveProfileId()
-    {
-    return iProfileEngine->ActiveProfileId();
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowPowerKeyPopUpMenuL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ShowPowerKeyPopUpMenuL()
-    {
-    TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL iPowerKeyPopupMenuActive: %d" ),
-                          iPowerKeyPopupMenuActive ) );
-
-    if ( !iPowerKeyPopupMenuActive && !iDisablePowerkeyMenu 
-         && iSysApPowerKeyMenuObserver ) // normal state construction has been executed
-        {
-        iPowerKeyPopupMenuDismissed = EFalse;
-        iPowerkeyMenuPowerOffShown = EFalse;
-        CancelGlobalListQuery();
-
-        iGlobalListQuery = CAknGlobalListQuery::NewL();
-
-        iSysApPowerKeyMenuObserver->Cancel();
-
-        CDesCArray* profileNameCDesCArray; // Array for Powerkey Menu items
-
-        RArray<TInt> itemIdArray; // needed for cover UI
-        CleanupClosePushL(itemIdArray);
-
-        // make sure old profile names array is clean
-        delete iProfileNamesArray;
-        iProfileNamesArray = NULL;
-
-        // Must pop iProfileNamesArray here as cannot leave trap harness with uneven push/pop count.
-        // This is because profileEngine doesn't provide non-LC version of ProfilesNamesArrayLC
-        TRAPD( err,
-              iProfileNamesArray = iProfileEngine->ProfilesNamesArrayLC();
-              CleanupStack::Pop();
-             );
-
-        if ( err != KErrNone )
-            {
-            // creating menu failed, return (i.e. just don't show the menu)
-            TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL iProfileEngine->ProfilesNamesArrayLC() ERROR: %d" ), err ) );
-            iNumberOfProfileNamesInPowerKeyMenu = 0;
-            }
-        else
-            {
-            iNumberOfProfileNamesInPowerKeyMenu = iProfileNamesArray->MdcaCount();
-            TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL iNumberOfProfileNamesInPowerKeyMenu: %d" ),
-                                  iNumberOfProfileNamesInPowerKeyMenu ) );
-            }
-
-        if ( BtSapEnabled() )
-            {
-            profileNameCDesCArray = new( ELeave ) CDesCArrayFlat( iNumberOfProfileNamesInPowerKeyMenu + 4 );
-            }
-        else
-            {
-            profileNameCDesCArray = new( ELeave ) CDesCArrayFlat( iNumberOfProfileNamesInPowerKeyMenu + 3 );
-            }
-
-        CleanupStack::PushL( profileNameCDesCArray );
-        profileNameCDesCArray->Reset();
-        HBufC* itemStringBuf;
-
-        TInt powerMenuItemIndex( 0 );
-
-        // "Switch off" menu item
-        if ( !IsEncryptionOperationOngoingL() )
-            {
-        itemStringBuf = StringLoader::LoadLC( R_QTN_PWRC_SWITCH_OFF, iEikonEnv );
-        profileNameCDesCArray->InsertL( 0, itemStringBuf->Des() );
-        CleanupStack::PopAndDestroy(); // itemStringBuf
-        if ( iSysApFeatureManager->CoverDisplaySupported() )
-            {
-            itemIdArray.AppendL(SecondaryDisplay::EPwrMenuItemSwitchOff);
-            }
-            iPowerkeyMenuPowerOffShown = ETrue;
-        powerMenuItemIndex++;
-            }
-
-        iPowerkeyMenuLockKeypadShown     = EFalse;
-        iPowerkeyMenuExitSapShown        = EFalse;
-        iPowerkeyMenuLockSystemShown     = EFalse;
-        iPowerkeyMenuEjectShown          = EFalse;
-
-        iPowerkeyMenuLockKeypadSelection = KErrAccessDenied;
-        iPowerkeyMenuExitSapSelection    = KErrAccessDenied;
-        iPowerkeyMenuLockSystemSelection = KErrAccessDenied;
-
-#ifndef RD_MULTIPLE_DRIVE
-        iPowerkeyMenuEjectSelection     = KErrAccessDenied;
-#else // RD_MULTIPLE_DRIVE
-        iPowerkeyMenuEjectSelectionBase = KErrAccessDenied;
-#endif // RD_MULTIPLE_DRIVE
-
-        // "Lock keypad" menu item
-		
-		TInt callState ( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) );
-		TInt callType ( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallType ) );
-		if ( !( callState == EPSCTsyCallStateConnected && callType == EPSCTsyCallTypeH324Multimedia ) )
-			{
-			if ( iSysApFeatureManager->GripNotSupported() ||
-				( (!iSysApFeatureManager->GripNotSupported() ) && ( StateOfProperty( KPSUidHWRM, KHWRMGripStatus ) ==  EPSHWRMGripClosed ) ) )
-				// "Lock keypad" command is shown always when there is no grip, and if there
-				// there is no grip, only when the grip is closed.
-				{
-				if ( CKeyLockPolicyApi::KeyguardAllowed() )
-					{
-					if ( iSysApFeatureManager->PenEnabled() )
-						{
-						itemStringBuf = StringLoader::LoadLC( R_QTN_PWRC_LOCK_DISPLAY, iEikonEnv );
-						}
-					else
-						{
-						itemStringBuf = StringLoader::LoadLC( R_QTN_PWRC_LOCK_KEYS, iEikonEnv );
-						}                
-					profileNameCDesCArray->AppendL( itemStringBuf->Des() );
-					CleanupStack::PopAndDestroy(); // itemStringBuf
-					if ( iSysApFeatureManager->CoverDisplaySupported() )
-						{
-						itemIdArray.AppendL(SecondaryDisplay::EPwrMenuItemLockKeypad);
-						}
-					iPowerkeyMenuLockKeypadShown = ETrue;
-					iPowerkeyMenuLockKeypadSelection = powerMenuItemIndex;
-					powerMenuItemIndex++;
-					}
-				}
-			}
-
-        // "Exit SIM access profile" menu item
-
-        if ( BtSapEnabled() )
-            {
-            TRACES( RDebug::Print(_L( "CSysApAppUi::ShowPowerKeyPopUpMenuL: show \"Exit SIM access profile\" item" ) ) );
-            itemStringBuf = StringLoader::LoadLC( R_QTN_PWRC_EXIT_SIM_ACCESS, iEikonEnv );
-            profileNameCDesCArray->AppendL( itemStringBuf->Des() );
-            CleanupStack::PopAndDestroy(); // itemStringBuf
-            if ( iSysApFeatureManager->CoverDisplaySupported() )
-                {
-                itemIdArray.AppendL(SecondaryDisplay::EPwrMenuItemExitBtSap);
-                }
-            iPowerkeyMenuExitSapShown = ETrue;
-            iPowerkeyMenuExitSapSelection = powerMenuItemIndex;
-            powerMenuItemIndex++;
-            }
-
-        // Profile menu items
-
-        TInt arrayIndex ( 0 );
-        TBufC<KMaxProfileNameLength> profileName;
-
-        for ( arrayIndex = 0; arrayIndex < iNumberOfProfileNamesInPowerKeyMenu; arrayIndex++ )
-            {
-            profileName = iProfileNamesArray->MdcaPoint( arrayIndex );
-            TPtr profileNamePtr = profileName.Des();
-            AknTextUtils::DisplayTextLanguageSpecificNumberConversion( profileNamePtr );
-            profileNameCDesCArray->AppendL( profileNamePtr );
-
-            if ( iSysApFeatureManager->CoverDisplaySupported() )
-                {
-                TInt profileId = ( iProfileNamesArray->ProfileName( arrayIndex ) )->Id();
-                itemIdArray.AppendL(SecondaryDisplay::EPwrMenuItemProfileItemBase+profileId);
-                }
-            powerMenuItemIndex++;
-            }
-
-        // "Lock device" menu item
-
-        callState = StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState );
-        
-        TInt devLockStatus( EAutolockStatusUninitialized );
-        devLockStatus = StateOfProperty( KPSUidCoreApplicationUIs, KCoreAppUIsAutolockStatus );  // check whether Autolock has been started
-        
-
-        if ( callState == EPSCTsyCallStateNone && devLockStatus != EAutolockStatusUninitialized )
-            {
-            TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL: adding \"Lock device\", devLockStatus=%d" ), devLockStatus ) );
-			iPowerkeyMenuLockSystemShown = ETrue;
-            itemStringBuf = StringLoader::LoadLC( R_QTN_SET_SEC_LOCK_SYSTEM, iEikonEnv );
-            profileNameCDesCArray->AppendL( itemStringBuf->Des() );
-            CleanupStack::PopAndDestroy(); // itemStringBuf
-            if ( iSysApFeatureManager->CoverDisplaySupported() )
-                {
-                itemIdArray.AppendL(SecondaryDisplay::EPwrMenuItemLockDevice);
-                }
-            iPowerkeyMenuLockSystemShown = ETrue;
-            iPowerkeyMenuLockSystemSelection = powerMenuItemIndex;
-            powerMenuItemIndex++;
-            }
-
-        // "Eject MMC" menu item
-
-        TInt propertyValue( StateOfProperty( KPSUidUsbWatcher, KUsbWatcherSelectedPersonality ) );
-
-#ifndef RD_MULTIPLE_DRIVE
-			if ( !IsEncryptionOperationOngoingL() )
-			{
-        if ( iSysApFeatureManager->MmcHotSwapSupported() &&
-             iMMCInserted &&
-             iSysApFeatureManager->EjectRequiredInPowerMenu() &&
-             propertyValue != KUsbPersonalityIdMS )
-            {
-            iPowerkeyMenuEjectShown = ETrue;
-            TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL: adding \"Eject\"" ) ) );
-            itemStringBuf = StringLoader::LoadLC( R_QTN_PWRC_EJECT_MMC, iEikonEnv );
-            profileNameCDesCArray->AppendL( itemStringBuf->Des() );
-            CleanupStack::PopAndDestroy(); // itemStringBuf
-            if ( iSysApFeatureManager->CoverDisplaySupported() )
-                {
-                itemIdArray.AppendL(SecondaryDisplay::EPwrMenuItemEjectMMC);
-                }
-            iPowerkeyMenuEjectShown = ETrue;
-            iPowerkeyMenuEjectSelection = powerMenuItemIndex;
-            powerMenuItemIndex++;
-            }
-        }
-
-#else // RD_MULTIPLE_DRIVE
-			if ( !IsEncryptionOperationOngoingL() )
-			{
-        if ( iSysApFeatureManager->MmcHotSwapSupported() &&
-             iSysApFeatureManager->EjectRequiredInPowerMenu() &&
-             propertyValue != KUsbPersonalityIdMS )
-            {
-            // Reset old eject status and dialog
-            iSysApDriveList->ResetDrivesToEject();
-            if ( iSysApConfirmationQuery )
-                {
-                if ( iSysApConfirmationQuery->CurrentQuery() == ESysApEjectMmcQuery )
-                    {
-                    iSysApConfirmationQuery->Cancel();
-                    }
-                }
-
-            // Append memory cards for eject selection
-            TInt count( iInsertedMemoryCards.Count() );
-            for ( TInt i( 0 ); i < count; ++i )
-                {
-                itemStringBuf = iSysApDriveList->GetFormattedDriveNameLC(
-                    iInsertedMemoryCards[ i ].iDrive,
-                    R_QTN_PWRC_EJECT_MEMORY_STORAGE );
-                profileNameCDesCArray->AppendL( *itemStringBuf );
-                CleanupStack::PopAndDestroy( itemStringBuf );
-
-                if ( iSysApFeatureManager->CoverDisplaySupported() )
-                    {
-                    itemIdArray.AppendL( SecondaryDisplay::EPwrMenuItemEjectItemBase + i );
-                    }
-                }
-            if ( count > 0 )
-                {
-                TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL: added \"Eject\"" ) ) );
-                iPowerkeyMenuEjectShown = ETrue;
-                iPowerkeyMenuEjectSelectionBase = powerMenuItemIndex;
-                powerMenuItemIndex += count;
-                }
-            }
-				}
-#endif // RD_MULTIPLE_DRIVE
-        
-        // Activate/deactive power save mode
-        if ( iSysApPsmController ) // variable feature, not create if power save is not used
-            {
-            TBool showActivate = !(iSysApPsmController->FullPsmEnabled());
-            
-            TInt textId = ( showActivate ? R_QTN_PWRC_ACTIVATE_POWER_SAVING : R_QTN_PWRC_DEACTIVATE_POWER_SAVING );
-            
-            itemStringBuf = StringLoader::LoadLC( textId, iEikonEnv );
-            iSysApPsmController->SetNextUiOperation( showActivate );
-            
-            if ( iSysApFeatureManager->CoverDisplaySupported() )
-                {
-                itemIdArray.AppendL( showActivate ? 
-                                     SecondaryDisplay::EPwrMenuItemActivatePowerSaving :
-                                     SecondaryDisplay::EPwrMenuItemDeactivatePowerSaving );
-                }
-                
-            profileNameCDesCArray->AppendL( itemStringBuf->Des() );
-            CleanupStack::PopAndDestroy( itemStringBuf );
-                
-            iSysApPsmController->SetUiItemId( powerMenuItemIndex );
-            powerMenuItemIndex++;    
-            }
-        
-        TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL NumberOfAllItemsInPowerKeyMenu: %d" ),
-                              profileNameCDesCArray->Count() ) );
-
-        iSysApPowerKeyMenuObserver->Start();
-
-        // Set secondary display data if necessary
-        if ( iSysApFeatureManager->CoverDisplaySupported() )
-            {
-            CAknSDData* sd = CAknSDData::NewL(SecondaryDisplay::KCatSysAp, SecondaryDisplay::ECmdShowPowerKeyListQuery, KNullDesC8);
-            sd->InsertGlobalListQueryItemIdsL(itemIdArray);
-            iGlobalListQuery->SetSecondaryDisplayData(sd); // ownership to notifier client
-            }
-
-        iGlobalListQuery->ShowListQueryL( (MDesCArray*) profileNameCDesCArray,
-                                          iSysApPowerKeyMenuObserver->iStatus,
-                                          KProfileListInitialIndex );
-
-        TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL: list query shown" ) ) );
-
-        CleanupStack::PopAndDestroy( profileNameCDesCArray ); // profileNameCDesCArray
-        TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL: profileNameCDesCArray popped" ) ) );
-
-        CleanupStack::Pop(&itemIdArray);
-        itemIdArray.Close();
-
-        // Without following variable set ETrue powerkey up event would change the hightlighted item to be
-        // the second one instead of the wanted first one.
-        iIgnoreNextPowerKeyUpEvent = ETrue;
-
-        if ( iSysApBatteryInfoController )        
-            {
-            iSysApBatteryInfoController->PowerMenuShownL();
-            }
-        
-        TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL:end" ) ) );
-    }
-}
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL( TInt aSelection )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL( TInt aSelection )
-    {
-    iPowerKeyPopupMenuDismissed = ETrue;
-    iPowerKeyPopupMenuActive = EFalse;
-    TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: START aSelection:%d" ), aSelection ) );
-    if ( aSelection == KPowerKeyMenuSelectionCancelled )
-        {
-        TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: Powerkey menu cancelled" ) ) );
-        }
-    else if( aSelection < KPowerKeyMenuSelectionCancelled )
-        {
-        iIgnoreNextPowerKeyUpEvent = EFalse;
-        }
-    else
-        {
-        TInt firstProfileItemIndex( 1 + Max( 0, iPowerkeyMenuLockKeypadSelection, iPowerkeyMenuExitSapSelection ) ); // index of "General" profile
-
-        if ( aSelection == KPowerKeyMenuSelectionSwitchOff )
-            {
-            TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: \"Switch off\" selected" ) ) );
-            DoShutdownL( EFalse, KDummyReason );
-            }
-
-        else if ( iPowerkeyMenuLockKeypadShown && aSelection == iPowerkeyMenuLockKeypadSelection )
-            {
-            TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: \"Lock keypad\" selected" ) ) );
-            KeyLock().EnableKeyLock();
-            }
-
-        else if ( iPowerkeyMenuExitSapShown && aSelection == iPowerkeyMenuExitSapSelection )
-            {
-            TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: \"Exit SAP\" selected" ) ) );
-            ShowQueryL( ESysApBtSapDisconnectQuery );
-            }
-
-        else if ( aSelection < firstProfileItemIndex + iNumberOfProfileNamesInPowerKeyMenu )
-            {
-            __ASSERT_DEBUG( iProfileNamesArray, User::Invariant() );
-
-            if ( iProfileNamesArray )
-                {
-                iProfileToBeActivated = ( iProfileNamesArray->ProfileName( aSelection - firstProfileItemIndex ) )->Id();
-
-                TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: profile id: %d selected" ), iProfileToBeActivated ) );
-                if ( ! iSysApOfflineModeController->OfflineModeActive() ||
-                    ( iProfileToBeActivated ) == KOfflineModeProfileId )
-                    {
-                    ActivateProfileL( iProfileToBeActivated );
-                    }
-                else
-                    {
-                    // iProfileToBeActivated profile will be activated from iSysApOfflineModeController if ok
-                    iSysApOfflineModeController->GoOnlineIfOkL();
-                    }
-                }
-            }
-
-        else if ( iPowerkeyMenuLockSystemShown && aSelection == iPowerkeyMenuLockSystemSelection )
-            {
-            TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: \"Lock system\" selected" ) ) );
-            iSysApSystemLock->SetLockedL();
-            }
-#ifndef RD_MULTIPLE_DRIVE
-        else if ( iPowerkeyMenuEjectShown && aSelection == iPowerkeyMenuEjectSelection )
-            {
-            TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: \"Eject\" selected" ) ) );
-            ShowQueryL( ESysApEjectMmcQuery );
-            }
-#else // RD_MULTIPLE_DRIVE
-        else if ( iPowerkeyMenuEjectShown &&
-                aSelection >= iPowerkeyMenuEjectSelectionBase &&
-                aSelection < iPowerkeyMenuEjectSelectionBase + iInsertedMemoryCards.Count() )
-            {
-            iDriveToEject =
-                iInsertedMemoryCards[ aSelection - iPowerkeyMenuEjectSelectionBase ].iDrive;
-            TRACES( RDebug::Print(
-                _L( "CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: \"Eject\" selected, drive=%d" ),
-                iDriveToEject ) );
-            iSysApDriveList->ResetDrivesToEject();
-            RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
-            EjectMMCL();
-            }
-#endif // RD_MULTIPLE_DRIVE
-        else if ( iSysApPsmController && aSelection == iSysApPsmController->UiItemId() )
-            {
-            TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: \"Activate|Deactivate power save\" selected" ) ) );
-            iSysApPsmController->DoEnableFullPsm( iSysApPsmController->NextUiOperation() );
-            }
-
-        }
-
-    delete iProfileNamesArray;
-    iProfileNamesArray = NULL;
-
-    TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: END" ) ) );
-    }
 
 // ----------------------------------------------------------------------------
 // CSysApAppUi::SetDeviceLockEnabledL( const TBool aLockEnabled )
@@ -3937,7 +1805,7 @@
         {
         if( iKeyLockEnabled )
             {
-            KeyLock().DisableWithoutNote();
+            iKeyguardController->DisableKeyguard(EFalse);
             }
         }
     else
@@ -3949,1788 +1817,159 @@
         // Memory card needs to be unlocked when device is unlocked
         if ( iSysApFeatureManager->MmcHotSwapSupported() )
             {
-            RunUnlockNotifierL();
-            }
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DoNotEnableKeylock()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::DoNotEnableKeylock()
-    {
-    if ( !iKeyLockOnBeforeCradle )
-        {
-        iShowkeypadActivatedNoteAfterSoftReject = iKeyLockOnBeforeCall;
-        }
-
-    iKeyLockOnBeforeCall = EFalse;
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DoShutdownL( const TBool aReset, const TSWStartupReason aSWStartupReason )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::DoShutdownL( const TBool aReset, const TInt aResetReason )
-    {
-    TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL: aResetReason:%d, aReset:%d" ),
-        aResetReason, aReset ) );
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-    TBool animationenabled( EFalse );
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-    if( OkToInitiateShutdown() )
-        {
-        TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL: Was OkToToInitiateShutdown" ) ) );
-
-
-        if ( !aReset && iSysApFeatureManager->Supported(KSysApFeatureIdGoodbyeNote) )
-            {
-            TRAPD( ignore, ShowShutdownNoteL() );
-            if ( ignore ) ignore = 0; // hide compiler warning about not using variable
-            }
-
-        if( !aReset )
-            {
-    #ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
-            TRAPD( err, ShowAnimationL() );
-            if ( err )
-                {
-                TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL ShowAnimationL() leaved: %d" ), err ) );
-                CompleteShutdown(aReset, aResetReason);
-                }
-            }
-        else // aReset
-            {
-            CompleteShutdown(aReset, aResetReason);
-            }
-    #else // RD_STARTUP_ANIMATION_CUSTOMIZATION
-            TRAPD( err, animationenabled = ShowAnimationL() );
-            if ( err )
-                {
-                TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL ShowAnimationL() leaved: %d" ), err ) );
-                }
-            }
-
-        if ( !animationenabled )
-            {
-            CompleteShutdown(aReset, aResetReason);
-            }
-    #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-        }
-    else
-        {
-        TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL: Was not OkToToInitiateShutdown" ) ) );
-        }
-    TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL: END" ) ) );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ContinueShutdown()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ContinueShutdown()
-    {
-    TRACES( RDebug::Print(_L("CSysApAppUi::ContinueShutdown() started" ) ) );
-    CompleteShutdown();
-    TRACES( RDebug::Print(_L("CSysApAppUi::ContinueShutdown() completed" ) ) );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowAnimationL()
-// ----------------------------------------------------------------------------
-
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
-void
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
-TBool
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-CSysApAppUi::ShowAnimationL()
-    {
-    TRACES( RDebug::Print(_L("CSysApAppUi::ShowAnimationL(): START" ) ) );
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::ShowAnimationL: Initialise shutdown animation") ) );
-
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-    PrepareForShutdownAnimation();
-
-    iSysApShutdownAnimation = CSysApShutdownAnimation::NewL( *iSysApShutdownImage );
-    iSysApShutdownAnimation->Play( TCallBack( DoStopAnimTiming, this ) );
-
-    TRACES( RDebug::Print(_L("CSysApAppUi::ShowAnimationL(): End" ) ) );
-
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
-    iSysApShutdownAnimation = CSysApShutdownAnimation::NewL( this );
-    AddToStackL( iSysApShutdownAnimation );
-    iAnimationShowingTime = iSysApShutdownAnimation->ShowingTime();
-    TRACES( RDebug::Print( _L("CSysApAppUi::ShowAnimationL: Shutdown animation initialised. Animation time = %d") ,iAnimationShowingTime) );
-
-    TBool ret_val( EFalse );
-
-    if ( iAnimationShowingTime )
-        {
-        if ( iSysApFeatureManager->CoverDisplaySupported() )
-            {
-            // Construct mediator observer
-            iSysApMediatorObserver = CSysApMediatorObserver::NewL( this );
-
-            // Sync animation
-            TInt err = iSysApMediatorObserver->SyncShutdownAnimation();
-
-            if ( err != KErrNone )
-                {
-                // Pretend coverUI synced instantly if error in issuing command.
-                ShutdownAnimationSyncOK();
-                }
-            }
-        else
-            {
-            // Pretend coverUI synced instantly when it is not supported.
-            ShutdownAnimationSyncOK();
-            }
-
-        ret_val = ETrue;
-        }
-
-    TRACES( RDebug::Print(_L("CSysApAppUi::ShowAnimationL(): returns: %d" ),ret_val ) );
-    return ret_val;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-    }
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShutdownAnimationSyncOK()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ShutdownAnimationSyncOK()
-    {
-    TRACES( RDebug::Print(_L("CSysApAppUi::ShutdownAnimationSyncOK(): Call PrepareForShutdownAnimation()" ) ) );
-    PrepareForShutdownAnimation();//SysAp's internal preparation for ShutDown with animation
-    TRACES( RDebug::Print(_L("CSysApAppUi::ShutdownAnimationSyncOK(): Called PrepareForShutdownAnimation()" ) ) );
-    }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SkipShutdownAnimation()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::SkipShutdownAnimation()
-    {
-    TRACES( RDebug::Print(_L("CSysApAppUi::SkipShutdownAnimation() " ) ) );
-
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
-    if ( iSysApShutdownAnimation )
-        {
-        iSysApShutdownAnimation->Cancel();
-        }
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
-    if ( iAnimationShowingTime )
-        {
-        iSysApShutdownAnimation->EndAnimation();
-        }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::NotifyShutdownAnimationSkip()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::NotifyShutdownAnimationSkip()
-    {
-    TRACES( RDebug::Print(_L("CSysApAppUi::NotifyShutdownAnimationSkip() " ) ) );
-
-    if ( iSysApMediatorObserver )
-        {
-        iSysApMediatorObserver->ShutdownAnimationSkipped();
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::CompleteShutdown()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::CompleteShutdown( const TBool aReset, const TInt aResetReason )
-    {
-    TRACES( RDebug::Print(_L("CSysApAppUi::CompleteShutdown(): START" ) ) );
-
-    PrepareForShutdownImage();//SysAp's internal preparation for ShutDown with image
-
-    FreeResources();
-
-    if ( aReset )
-        {
-        __ASSERT_DEBUG( aResetReason >= RStarterSession::ELanguageSwitchReset &&
-                        aResetReason <= RStarterSession::EDataRestoreReset,
-                        User::Invariant() );
-        StarterSession().Reset( static_cast<RStarterSession::TResetReason>( aResetReason ) );
-        }
-    else
-        {
-        StarterSession().Shutdown();
-        }
-
-    StarterSession().Close();
-
-    TRACES( RDebug::Print(_L("CSysApAppUi::CompleteShutdown(): END" ) ) );
-    }
-
-#ifndef SYSAP_USE_STARTUP_UI_PHASE
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DoStateChangedL(const RStarterSession::TGlobalState aSwState)
-// This method is not called after boot has finished.
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::DoStateChangedL(const RStarterSession::TGlobalState aSwState)
-    {
-    TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL: %d" ), aSwState ) );
-
-    switch ( aSwState )
-        {
-        case RStarterSession::ENormal:
-            SetStatusPaneLayoutL( ESysApNormal );
-            break;
-        case RStarterSession::ECharging:
-            SetStatusPaneLayoutL( ESysApCharging );
-            break;
-        case RStarterSession::EAlarm:
-            SetStatusPaneLayoutL( ESysApAlarm );
-            break;
-        default:
-            break;
-        };
-
-    TRAPD( simChangedErr, DoSimChangedFromPreviousBootL() );
-    TRACES( RDebug::Print( _L("CSysApAppUi::DoStateChangedL: simChangedErr = %d" ), simChangedErr ) );
-    simChangedErr = simChangedErr; // suppress 'variable not used' warning
-    LogsObserverL().HandleSimChangedCheckDoneL();
-
-    if ( iSysApFeatureManager->PowerSaveSupported() )
-        {
-        // create controller before checking battery state, so that power saving can be enabled during boot if needed
-        if ( !iSysApPsmController ) // created only in first state change
-            {
-            iSysApPsmController = CSysApPsmController::NewL( *this );        
-            }
-
-        // in charger boot explicitly disable partial power save mode
-        if ( aSwState == RStarterSession::ECharging && !iCharging )
-            {
-            iSysApPsmController->ChargerConnected();
-            iSysApPsmController->DoEnablePartialPsm( EFalse ); // disable partial power save now
+            // RunUnlockNotifierL();
+            // Need to handle feature for unlocking the MMC card
             }
         }
-
-    TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
-    //Also Charging status will be updated with the following function.
-    UpdateBatteryBarsL( state );
-
-    if( IsStateNormal() )
-        {
-        TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL to normal state.") ) );
-
-        DoSwStateNormalConstructionL();
-
-        InitializeStatusPaneAreaL();
-        CheckSilentModeL();
-        HandleAccessoryProfileInStartupL();
-
-        if ( iSysApFeatureManager->MmcSupported() )
-            {
-#ifndef RD_MULTIPLE_DRIVE
-            MountMMC();
-            MMCStatusChangedL();
-            iHideFirstBeep = EFalse;
-#else // RD_MULTIPLE_DRIVE
-            iSysApDriveList->MountDrive( iSysApDriveList->DefaultMemoryCard() );
-            UpdateInsertedMemoryCardsL();
-#endif // RD_MULTIPLE_DRIVE
-            }
-        if ( iSysApFeatureManager->MmcHotSwapSupported() )
-            {
-            iSysApMMCObserver->StartMountObserver();
-            }
-
-        
-        if ( iSysApPsmController )
-            {
-            if ( iCharging ) // if charger is connected on boot PSM queries may need to be shown
-                {
-                HandleChargingStatusL( StateOfProperty( KPSUidHWRMPowerState, KHWRMChargingStatus ) );
-                }
-            }
-        
-        TInt batteryStatus = StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryStatus );
-        TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL: batteryStatus %d" ), batteryStatus ) );
-        if(  batteryStatus == EBatteryStatusLow || batteryStatus == EBatteryStatusEmpty )
-            {
-            // low and empty battery states are informed to the user in device startup
-            HandleBatteryStatusL( batteryStatus );
-            }
-        else if ( iSysApPsmController && !iCharging )
-        	{
-				TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL: batteryStatus %d, iCharging %d -> disable partial psm" ), batteryStatus, iCharging ) );
-
-				iSysApPsmController->BatteryLow( EFalse );
-				iSysApPsmController->DoEnablePartialPsm( EFalse );
-			}
-
-        iSysApBtController = CreateSysApBtControllerL( *this );
-        iSysApBtSapController = CreateSysApBtSapControllerL( *this );
-
-        if ( iActivateBt )
-            {
-            TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL Activating BT" ) ) );
-            SetBtPowerState( ETrue );
-            }
-
-        if ( iDeactivateBt )
-            {
-            TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL Deactivating BT" ) ) );
-            SetBtPowerState( EFalse );
-            }
-        iSysApLocationPrivacyIndicator = CreateSysApLocationPrivacyIndicatorL( *this );
-        iSysApLocationPrivacyIndicator->InitL();
-
-        if ( ! iSysApUsbIndicatorController )
-            {
-            TRAPD ( usbErr, iSysApUsbIndicatorController = CreateSysApUsbIndicatorL( *this ) );
-            if ( usbErr )
-                {
-                TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL: error in constructing USB ind. controller %d" ), usbErr ) );
-                }
-            }
-
-        // Other late initializations.
-        // In order to prevent unexpected behaviour e.g. in OOM situations, these calls are made to ensure
-        // that the services are connected when they are needed for the first time.
-        if ( !StarterSession().Handle() )
-            {
-            User::Leave( KErrBadHandle );
-            }
-
-        if ( !KeyLock().Handle() )
-            {
-            User::Leave( KErrBadHandle );
-            }
-
-#ifdef __SYSAP_MODULE_TEST
-        ModuleTestShowUiNoteL( _L("SysAp: SW state normal!") );
-#endif
-        }
-
-    // Allow lights
-    iSysApLightsController->AllowLightsOn();
-    }
-
-#else // SYSAP_USE_STARTUP_UI_PHASE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleUiReadyAfterBootL()
-// Called when startup UI activities has been finished
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleUiReadyAfterBootL()
-    {
-    TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL" ) ) );
-    
-    SetStatusPaneLayoutL( ESysApNormal );
-    
-    TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
-    //Also Charging status will be updated with the following function.
-    UpdateBatteryBarsL( state );
-    
-    DoSwStateNormalConstructionL();
-
-    InitializeStatusPaneAreaL();
-    CheckSilentModeL();
-    HandleAccessoryProfileInStartupL();
-    
-    if ( iSysApFeatureManager->MmcSupported() )
-        {
-#ifndef RD_MULTIPLE_DRIVE
-        MountMMC();
-        MMCStatusChangedL();
-        iHideFirstBeep = EFalse;
-#else // RD_MULTIPLE_DRIVE
-        iSysApDriveList->MountDrive( iSysApDriveList->DefaultMemoryCard() );
-        UpdateInsertedMemoryCardsL();
-#endif // RD_MULTIPLE_DRIVE
-        }
-    
-    if ( iSysApFeatureManager->MmcHotSwapSupported() )
-        {
-        iSysApMMCObserver->StartMountObserver();
-        }
-
-    if ( iSysApPsmController )
-        {
-        if ( iCharging ) // if charger is connected on boot PSM queries may need to be shown
-            {
-            HandleChargingStatusL( StateOfProperty( KPSUidHWRMPowerState, KHWRMChargingStatus ) );
-            }
-        }
-    
-    TInt batteryStatus = StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryStatus );
-    TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL: batteryStatus %d" ), batteryStatus ) );
-    if(  batteryStatus == EBatteryStatusLow || batteryStatus == EBatteryStatusEmpty )
-        {
-        // low and empty battery states are informed to the user in device startup
-        HandleBatteryStatusL( batteryStatus );
-        }
-    else if ( iSysApPsmController && !iCharging )
-      	{
-		    TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL: batteryStatus %d, iCharging %d -> disable partial psm" ), batteryStatus, iCharging ) );
-
-			iSysApPsmController->BatteryLow( EFalse );
-			iSysApPsmController->DoEnablePartialPsm( EFalse );
-        }
-
-    iSysApLocationPrivacyIndicator = CreateSysApLocationPrivacyIndicatorL( *this );
-    iSysApLocationPrivacyIndicator->InitL();
-
-    if ( ! iSysApUsbIndicatorController )
-        {
-        TRAPD ( usbErr, iSysApUsbIndicatorController = CreateSysApUsbIndicatorL( *this ) );
-        if ( usbErr )
-            {
-            TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL: error in constructing USB ind. controller %d" ), usbErr ) );
-            }
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DoStateChangedL(const RStarterSession::TGlobalState aSwState)
-// This method is not called after boot has finished.
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::DoStateChangedL(const RStarterSession::TGlobalState aSwState)
-    {
-    TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL: %d" ), aSwState ) );
-
-    switch ( aSwState )
-        {
-        case RStarterSession::ENormal:
-            // status pane layout will updated when UI is ready
-            break;
-        case RStarterSession::ECharging:
-            SetStatusPaneLayoutL( ESysApCharging );
-            break;
-        case RStarterSession::EAlarm:
-            SetStatusPaneLayoutL( ESysApAlarm );
-            break;
-        default:
-            break;
-        };
-
-    TRAPD( simChangedErr, DoSimChangedFromPreviousBootL() );
-    TRACES( RDebug::Print( _L("CSysApAppUi::DoStateChangedL: simChangedErr = %d" ), simChangedErr ) );
-    simChangedErr = simChangedErr; // suppress 'variable not used' warning
-    LogsObserverL().HandleSimChangedCheckDoneL();
-
-    if ( iSysApFeatureManager->PowerSaveSupported() )
-        {
-        // create controller before checking battery state, so that power saving can be enabled during boot if needed
-        if ( !iSysApPsmController ) // created only in first state change
-            {
-            iSysApPsmController = CSysApPsmController::NewL( *this );        
-            }
-
-        // in charger boot explicitly disable partial power save mode
-        if ( aSwState == RStarterSession::ECharging )
-            {
-            iSysApPsmController->ChargerConnected();
-            iSysApPsmController->DoEnablePartialPsm( EFalse ); // disable partial power save now
-            }
-        }
-
-    if ( aSwState == RStarterSession::ECharging || aSwState == RStarterSession::EAlarm )
-        {
-        TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
-        //Also Charging status will be updated with the following function.
-        UpdateBatteryBarsL( state );    
-        }
-        
-    if( IsStateNormal() )
-        {
-        TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL to normal state.") ) );
-
-        iSysApBtController = CreateSysApBtControllerL( *this );
-        iSysApBtSapController = CreateSysApBtSapControllerL( *this );
-
-        if ( iActivateBt )
-            {
-            TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL Activating BT" ) ) );
-            SetBtPowerState( ETrue );
-            }
-
-        if ( iDeactivateBt )
-            {
-            TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL Deactivating BT" ) ) );
-            SetBtPowerState( EFalse );
-            }
-
-        // Other late initializations.
-        // In order to prevent unexpected behaviour e.g. in OOM situations, these calls are made to ensure
-        // that the services are connected when they are needed for the first time.
-        if ( !StarterSession().Handle() )
-            {
-            User::Leave( KErrBadHandle );
-            }
-
-        if ( !KeyLock().Handle() )
-            {
-            User::Leave( KErrBadHandle );
-            }
-
-#ifdef __SYSAP_MODULE_TEST
-        ModuleTestShowUiNoteL( _L("SysAp: SW state normal!") );
-#endif
-        }
-
-    // Allow lights
-    iSysApLightsController->AllowLightsOn();
-    }
-
-
-#endif // SYSAP_USE_STARTUP_UI_PHASE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::UiReady()
-// 
-// ----------------------------------------------------------------------------
-
-TBool CSysApAppUi::UiReady() const
-    {
-#ifdef SYSAP_USE_STARTUP_UI_PHASE    
-    return iSysApStartupController->UiReady(); 
-#else // SYSAP_USE_STARTUP_UI_PHASE
-    // if startup UI phase information is not used, global system state normal is handled as UI idle state
-    return IsStateNormal();
-#endif // SYSAP_USE_STARTUP_UI_PHASE        
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::PrepareForShutdownAnimation()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::PrepareForShutdownAnimation()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownAnimation() begin") ) );
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-    TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownAnimation() showtime = %d"), iAnimationShowingTime ) );
-    if ( iAnimationShowingTime )
-        {
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-        static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->PlaySound( EAvkonSIDPowerOffTone );
-        CancelGlobalListQuery();
-
-        if ( iSysApPowerKeyMenuObserver )
-            {
-            iSysApPowerKeyMenuObserver->Cancel();
-            }
-
-        // deactivate notifiers before showing the shutdown image
-        AknNotifierController::CancelAllNotifications();
-        AknNotifierController::HideAllNotifications(ETrue);
-        RWindowGroup groupWin = iCoeEnv->RootWin();
-        iCapturedAppskey = groupWin.CaptureKey( EKeyApplication, KModifierMask, KModifierMask );
-        iCapturedAppskeyUpAndDowns = groupWin.CaptureKeyUpAndDowns( EStdKeyApplication0, KModifierMask, KModifierMask );
-        iEikonEnv->RootWin().SetOrdinalPosition(0, ECoeWinPriorityAlwaysAtFront );
-
-        TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownAnimation() Draw background image" ) ) );
-
-        ShowShutdownImage( KBackgroundImageID );
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-        TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownAnimation() Show Shutdown animation" ) ) );
-        TInt err(0);
-        TRAP( err, iSysApShutdownAnimation->StartL( iLastPowerKeyWasShort ) );
-        if ( err )
-            {
-            TRACES( RDebug::Print( _L("SysAp: Shutdown animation fails. Error code: %d" ), err ) );
-            // Start animation timing immediatily if animation starting fails.
-            // Otherwise animation will call StartAnimTiming when it is ready.
-            StartAnimTiming();
-            }
-        }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownAnimation() end") ) );
     }
 
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::PrepareForShutdownImage()
+// CSysApAppUi::HandleBatteryStatusL
 // ----------------------------------------------------------------------------
-
-void CSysApAppUi::PrepareForShutdownImage()
+//
+void CSysApAppUi::HandleBatteryStatusL( const TInt aValue )
     {
-    TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownImage() START" ) ) );
-
-    // If RD_STARTUP_ANIMATION_CUSTOMIZATION is enabled, the following actions are always taken in PrepareForShutdownAnimation
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-    if ( !iAnimationShowingTime ) // actions already taken in PrepareForShutdownAnimation
+    TRACES( RDebug::Print( _L("CSysApAppUi::HandleBatteryStatusL aValue: %d"), aValue ) );
+    
+    if ( aValue == EBatteryStatusEmpty )
         {
-        static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->PlaySound( EAvkonSIDPowerOffTone );
-        CancelGlobalListQuery();
-        
-        if ( iSysApPowerKeyMenuObserver )
-            {
-            iSysApPowerKeyMenuObserver->Cancel();
-            }
-        
-        // deactivate notifiers before showing the shutdown image
-        AknNotifierController::CancelAllNotifications();
-        AknNotifierController::HideAllNotifications(ETrue);
-        RWindowGroup groupWin = iCoeEnv->RootWin();
-        iCapturedAppskey = groupWin.CaptureKey( EKeyApplication, KModifierMask, KModifierMask );
-        iCapturedAppskeyUpAndDowns = groupWin.CaptureKeyUpAndDowns( EStdKeyApplication0, KModifierMask, KModifierMask );
-        }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-#ifndef __SYSAP_MODULE_TEST //to make errors during shutdown sequence being seen more easily
-    iEikonEnv->RootWin().SetOrdinalPosition(0, ECoeWinPriorityAlwaysAtFront );
-    TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownImage() Show Shutdown image" ) ) );
-    ShowShutdownImage( EMbmSysapQgn_startup_screen );
-#endif
-    TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownImage() END" ) ) );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetStatusPaneLauoutL( const TSysApPhoneState aState )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::SetStatusPaneLayoutL( const TSysApPhoneState aState )
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::SetStatusPaneLayoutL aState: %d"), aState ) );
-    if( aState == ESysApNormal )
-        //Status pane cannot be even visible on Normal mode
-        {
-        StatusPane()->MakeVisible( EFalse );
-        StatusPane()->SwitchLayoutL( R_AVKON_STATUS_PANE_LAYOUT_EMPTY );
-        }
-    else if( aState == ESysApCharging )
-        //SysAp's statuspane is visible on Charging mode
-        {
-        StatusPane()->MakeVisible( ETrue );
-        StatusPane()->SwitchLayoutL( R_AVKON_STATUS_PANE_LAYOUT_POWER_OFF_RECHARGE );
+        //Display Recharge Battery note
+        ShowUiNoteL( ERechargeBatteryNote );
+        BatteryEmptyL();
         }
-    else if( aState == ESysApAlarm )
-    	{
-    	if ( !Layout_Meta_Data::IsLandscapeOrientation() )
-    		{
-    		// Portrait mode
-	        StatusPane()->MakeVisible( ETrue );
-	        StatusPane()->SwitchLayoutL( R_AVKON_STATUS_PANE_LAYOUT_POWER_OFF_RECHARGE );
-    		}
-    	else
-    		{
-    		// Landscape mode
-	        TInt layout = R_AVKON_STATUS_PANE_LAYOUT_POWER_OFF_RECHARGE;
-	        // For side softkey devices, use different layout
-	        if (AVKONENV->StatusPaneResIdForCurrentLayout(R_AVKON_STATUS_PANE_LAYOUT_USUAL) == R_AVKON_STACON_PANE_LAYOUT_USUAL_SOFTKEYS_RIGHT)
-	        	layout = R_AVKON_STACON_PANE_LAYOUT_EMPTY_SOFTKEYS_RIGHT;
-	        else if (AVKONENV->StatusPaneResIdForCurrentLayout(R_AVKON_STATUS_PANE_LAYOUT_USUAL) == R_AVKON_STACON_PANE_LAYOUT_USUAL_SOFTKEYS_LEFT)
-	        	layout = R_AVKON_STACON_PANE_LAYOUT_EMPTY_SOFTKEYS_LEFT;
-
-	        StatusPane()->MakeVisible( ETrue );
-	        StatusPane()->SwitchLayoutL( layout );
-    		}
-    	}
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::OkToInitiateShutdown()
-// ----------------------------------------------------------------------------
-
-TBool CSysApAppUi::OkToInitiateShutdown()
+    else if ( aValue == EBatteryStatusLow )
+        {
+        if ( iSysApPsmController && UiReady() )
+            {
+            iSysApPsmController->BatteryLow( ETrue );
+            
+                       
+            if ( iSysApPsmController->ShowActivateQuery())
+                {
+                // show activation query, replaces the first battery low query
+                ShowQueryL( ESysApBattLowPowerSavingQuery );
+                }
+            else // default low warning note must be shown
+                {
+                // activate partial power save mode on first low warning
+                iSysApPsmController->DoEnablePartialPsm( ETrue ); // activated on first warning note
+                //Display Battery Low note.
+                ShowUiNoteL( EBatteryLowNote );    
+                }                
+            }
+        else
+            {
+            //Display Battery Low note.
+            ShowUiNoteL( EBatteryLowNote );     
+            }            
+        }
+        
+    if ( iSysApBatteryInfoController )
     {
-    TInt swState;
-    RProperty::Get( KPSUidStartup, KPSGlobalSystemState, swState );
-
-    if( !iShutdownStarted &&
-        swState == ESwStateStartingCriticalApps ||
-        swState == ESwStateSelfTestOK ||
-        swState == ESwStateSecurityCheck ||
-        swState == ESwStateCriticalPhaseOK ||
-        swState == ESwStateEmergencyCallsOnly ||
-        swState == ESwStateCharging ||
-        swState == ESwStateAlarm ||
-        swState == ESwStateNormalRfOn ||
-        swState == ESwStateNormalRfOff ||
-        swState == ESwStateNormalBTSap ||
-        swState == ESwStateFatalStartupError )
-        {
-        iShutdownStarted = ETrue;
-        return ETrue;
-        }
-    else
-        {
-        return EFalse;
-        }
+     iSysApBatteryInfoController->BatteryStatusUpdated( aValue );
     }
-
-/**
- * To check the for an emergency call. 
- * 
- * @return ETrue if there is an emergency call active otherwise, EFalse.
- */
-TBool IsEmergencyCall()
-        {
-        TBool retVal( EFalse );
-        TInt err( KErrNone );
-        TInt state( 0 );
-     
-        err = RProperty::Get(KPSUidCtsyEmergencyCallInfo, KCTSYEmergencyCallInfo, state );
-        if ( err == KErrNone && state )
-            {
-            retVal = ETrue;            
-            }
-        return retVal;
-        }	
+      
+   }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::HandleCurrentCallStateChangeL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleCurrentCallStateChangeL( TInt aCurrentCallState )
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: KUidCurrentCall: %d" ), aCurrentCallState ) );
-
-    if( iPowerKeyPopupMenuActive )
-        {
-        CancelGlobalListQuery();
-        }
-
-    switch ( aCurrentCallState )
-        {
-        case EPSCTsyCallStateRinging:
-            {
-            iSysApLightsController->CallComingInL( ETrue );
-            // Disable keylock when a call is coming in
-            if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCradle || iKeyLockOnBeforeAlarm )
-                {
-                TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateRinging: disable keylock") ) );
-                iKeyLockOnBeforeCall = ETrue;
-
-                if ( iKeyLockEnabled || iDeviceLockEnabled )
-                    {
-                    if ( !iSysApFeatureManager->TouchUnlockStrokeSupported() )
-                        {
-                        KeyLock().DisableWithoutNote();
-                        }
-                    }
-                }
-            break;
-            }
-            
-        case EPSCTsyCallStateDialling:
-            {
-            // Disable keypad lock during an emergency call
-            // no need to disable the key lock when a call is made using the wireless car-kit
-            // but if the call is an emergency one then we will disable the keypad lock
-            if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCradle )
-                {
-                TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateDialling: disable keylock") ) );
-                iKeyLockOnBeforeCall = ETrue;
-
-                if ( IsEmergencyCall() && (iKeyLockEnabled || iDeviceLockEnabled ))
-                    {
-                    KeyLock().DisableWithoutNote();
-                    }
-                }
-
-            // Enable signal & network indicators when an emergency call is made in Offline Mode
-            if( iSysApOfflineModeController->OfflineModeActive() )
-                    {
-                    // Signal indicators not updated with VoIP call
-                    if ( StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) != EPSCTsyCallTypeVoIP) 
-                        {
-                        iEmergencyCallActive = ETrue;
-                        UpdateSignalBarsL();
-                        SetSignalIndicatorL();
-                        }
-                    }
-            break;
-            }
-            
-        case EPSCTsyCallStateConnected:
-            {
-            if (StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) == EPSCTsyCallTypeCSVoice)
-                {
-                // Check if GPRS suspended note is required
-                iCallActivated = ETrue;
-                HandleGprsNotesL();
-                }
-            if ( iDeviceLockEnabled )
-                {
-                // Enable keylock via autolock emulation if device lock enabled. 
-                // Otherwise e.g. messages can be read using softkeys during ongoing call.
-                KeyLock().EnableAutoLockEmulation();
-                }
-            break;
-            }
-
-        case EPSCTsyCallStateNone:
-            {
-            // Reset timers in ScreenSaver and Autolock
-            User::ResetInactivityTime();
-
-            if ( iEmergencyCallActive )
-                {
-                iEmergencyCallActive = EFalse;
-                UpdateSignalBarsL( 0 );
-                SetSignalIndicatorL();
-                }
-            if ( iKeyLockOnBeforeCall )
-                {
-                TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateNone: enable keylock") ) );
-                iKeyLockOnBeforeCall = EFalse;
-                if ( !iDeviceLockEnabled )
-                    {
-                    if ( !iKeyLockOnBeforeCradle && !iKeyLockOnBeforeAlarm &&
-                          !iSysApFeatureManager->TouchUnlockStrokeSupported() )
-                        {
-                        if ( iSysApCenRepController->GetInt( KCRUidCommonTelephonySettings, KSettingsSummaryAfterCall ) == 1 )
-                            {
-                            KeyLock().EnableWithoutNote(); // Let's not hide "Summary After Call" dialog
-                            }
-                        else
-                            {
-                            KeyLock().EnableKeyLock();
-                            }
-                        }
-                    }
-                else
-                    {
-                    KeyLock().EnableAutoLockEmulation();
-                    }
-                }
-            if ( iShowkeypadActivatedNoteAfterSoftReject )
-                {
-                ShowUiNoteL( EKeypadActiveNote );
-                iShowkeypadActivatedNoteAfterSoftReject = EFalse;
-                }
-            iCallActivated = EFalse;
-            break;
-            }
-            
-        default:
-            break;
-        }
-
-    if ( aCurrentCallState != EPSCTsyCallStateRinging )
-        {
-        iSysApLightsController->CallComingInL( EFalse );
-        }
-
-    SetIhfIndicatorL();
-    SetHacIndicatorL();
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DoSwStateNormalConstructionL()
+// CSysApAppUi::ShowUiNoteL( const TSysApNoteIds aNote ) const
 // ----------------------------------------------------------------------------
 
-void CSysApAppUi::DoSwStateNormalConstructionL()
-    {
-    // Let's ensure that the lights will remain on for 15 secs after sw state normal
-    User::ResetInactivityTime();
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::DoSwStateNormalConstructionL : START" ) ) );
-
-    // In case of unexpected reset (e.g. hidden boot) the keylock must be enabled silently. Locking is done
-    // prior to time-consuming initializations, because otherwise UI is in unlocked state for a few seconds.
-    if ( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive ) == 1  )
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::DoSwStateNormalConstructionL: enabling keylock") ) );
-        KeyLock().EnableWithoutNote();
-        }
-
-    // Initiate bearer change observation
-    iSysApConnectionMonitorObserver = CSysApConnectionMonitorObserver::NewL( *this );
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::DoSwStateNormalConstructionL: trying CSysApSsSettingsObserver::NewL()") ) );
-    iSysApSsSettingsObserver = CSysApSsSettingsObserver::NewL( *this );
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::DoSwStateNormalConstructionL: trying new ( ELeave ) CSysApPowerKeyMenuObserver") ) );
-    iSysApPowerKeyMenuObserver = new( ELeave ) CSysApPowerKeyMenuObserver( *this );
-
-    TRACES( RDebug::Print( _L("SysAp: trying CSystemLock::NewL" ) ) );
-    iSysApSystemLock = CSystemLock::NewL();
-
-    iSysApCenRepCallForwardingObserver = CSysApCenRepCallForwardingObserver::NewL( *this );
-
-    iSysApCenRepMsgWaitingObserver = CSysApCenRepMsgWaitingObserver::NewL( *this );
-
-    
-    if ( iSysApFeatureManager->Supported( KSysApFeatureIdBatteryInfoPopup ) )
-        {
-        iSysApBatteryInfoController = CSysApBatteryInfoController::NewL( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsConf, 
-                                                                                                     KCoreAppUIsBatteryInformationLowThreshold ) );    
-        }
-    
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::DoSwStateNormalConstructionL : END" ) ) );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DoSimChangedFromPreviousBootL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::DoSimChangedFromPreviousBootL()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::DoSimChangedFromPreviousBootL: iSimChangedDone=%d" ), iSimChangedDone ) );
-
-    if ( !iSimChangedDone  )
-        {
-        iSimChangedDone = ETrue;
-        CSysApSimChanged* simChanged = CSysApSimChanged::NewL( *this, iEikonEnv->FsSession() );
-        CleanupStack::PushL( simChanged );
-        simChanged->HandleSimChangedL();
-        CleanupStack::PopAndDestroy( simChanged );
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::CancelWaitNote()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::CancelWaitNote()
+void CSysApAppUi::ShowUiNoteL( const TSysApNoteIds aNote ) const
     {
-    TRACES( RDebug::Print( _L("CSysApAppUi::CancelWaitNote" ) ) );
-    if ( iSysApWaitNote )
-        {
-        iSysApWaitNote->Cancel();
-        delete iSysApWaitNote;
-        iSysApWaitNote = NULL;
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::CancelGlobalListQuery()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::CancelGlobalListQuery()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::CancelGlobalListQuery" ) ) );
-    if ( iGlobalListQuery )
-        {
-        iGlobalListQuery->CancelListQuery();
-        delete iGlobalListQuery;
-        iGlobalListQuery = NULL;
-        }
-    }
-
-#ifndef RD_MULTIPLE_DRIVE
-// ----------------------------------------------------------------------------
-// CSysApAppUi::MountMMC()
-// ----------------------------------------------------------------------------
-
-TInt CSysApAppUi::MountMMC()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::MountMMC") ) );
-    TInt err ( KErrNotSupported );
-    if ( iSysApFeatureManager->MmcSupported() )
-        {
-#ifdef __WINS__ // Let's sleep a second in WINS
-        User::After( 1000000 );
-#endif
-        err = iEikonEnv->FsSession().MountFileSystem( KFSName, KMMCDrive );
-        TRACES( RDebug::Print( _L("CSysApAppUi::MountMMC: RFs::MountFileSystem() returned: %d"), err ) );
-        if ( err == KErrInUse )
-            {
-            User::After( 1000000 );
-            err = iEikonEnv->FsSession().MountFileSystem( KFSName, KMMCDrive );
-            TRACES( RDebug::Print( _L("CSysApAppUi::MountMMC: RFs::MountFileSystem() returned: %d"), err ) );
-            }
-        }
-    return err;
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DismountMMC()
-// ----------------------------------------------------------------------------
-
-TInt CSysApAppUi::DismountMMC()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::DismountMMC") ) );
-#ifdef __WINS__ // Let's sleep a second in WINS
-        User::After( 1000000 );
-#endif
-
-    TInt err ( KErrNotSupported );
-    if ( iSysApFeatureManager->MmcSupported() )
-        {
-        err = iEikonEnv->FsSession().DismountFileSystem( KFSName, KMMCDrive );
-        TRACES( RDebug::Print( _L("CSysApAppUi::DismountMMC: RFs::DismountFileSystem() returned: %d"), err ) );
-        }
-    return err;
-    }
+    TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL aNote: %d"), aNote ) );
+    
+    TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) );
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::EjectMMCL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::EjectMMCL()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::EjectMMCL") ) );
-    iMMCEjectUsed = ETrue;
-    iMMCPowerMenuEjectUsed = ETrue;
-    iTimeToKill = EFalse;
-    iApplicationScanningRoundNumber = 0;
-    CloseUIAppsInHotSwapL();
-    }
-
-#else // RD_MULTIPLE_DRIVE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::EjectMMCL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::EjectMMCL()
-    {
-    // Called from eject confirm query, check drive inserted before start
-    TInt insertedIndex( CSysApDriveList::Find(
-        iInsertedMemoryCards, iDriveToEject ) );
-
-    TRACES( RDebug::Print(
-        _L( "CSysApAppUi::EjectMMCL: iMMCEjectUsed: %d, drive: %d, index: %d "),
-        iMMCEjectUsed, iDriveToEject, insertedIndex ) );
-
-    if ( insertedIndex != KErrNotFound )
-        {
-        iSysApDriveList->MarkDriveToEject(
-            iDriveToEject, CSysApDriveList::EEjectFromMenu );
-        iSysApDriveEjectHandler->StartEject();
-        }
-    iMMCEjectUsed = EFalse;
-    }
-
-#endif // RD_MULTIPLE_DRIVE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DisconnectBtSap()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::DisconnectBtSap()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::DisconnectBtSap") ) );
-    iSysApBtSapController->Disconnect();
-    }
-
-#ifndef RD_MULTIPLE_DRIVE
-// ----------------------------------------------------------------------------
-// CSysApAppUi::RunUnlockNotifierL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::RunUnlockNotifierL( TSysApMemoryCardStatus aMemoryCardStatus )
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::RunUnlockNotifierL: START") ) );
-    if ( iSysApFeatureManager->MmcSupported() )
-        {
-        if ( UiReady() )
+    if( UiReady() || swState == ESwStateSecurityCheck)
+      {
+          switch ( aNote )
             {
-            TSysApMemoryCardStatus memoryCardStatus;
-            if ( aMemoryCardStatus == ESysApMemoryCardStatusNotKnown )
+            case EBatteryLowNote:
+                {
+                 _LIT(KPowerPressKey,"Battery low");
+                 HBufC* aString = HBufC16::NewLC(100);
+                 TPtrC aStringPointer = aString->Des();
+                 aStringPointer.Set(KPowerPressKey);
+                 TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
+                 ShowExampleUiNoteL( aStringPointer );
+                 CleanupStack::PopAndDestroy(); // aString
+                }
+                break;
+            case EBatteryFullNote:
                 {
-                memoryCardStatus = iSysApMMCObserver->MemoryCardStatus();
+                _LIT(KPowerPressKey,"Battery full");
+                HBufC* aString = HBufC16::NewLC(100);
+                TPtrC aStringPointer = aString->Des();
+                aStringPointer.Set(KPowerPressKey);
+                TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
+                ShowExampleUiNoteL( aStringPointer );
+                CleanupStack::PopAndDestroy(); // aString
+                }
+                break;
+            case ERechargeBatteryNote:
+                {
+                iSysApLightsController->BatteryEmptyL( ETrue );
+                _LIT(KPowerPressKey,"Battery empty. Recharge");
+                HBufC* aString = HBufC16::NewLC(100);
+                TPtrC aStringPointer = aString->Des();
+                aStringPointer.Set(KPowerPressKey);
+                TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
+                ShowExampleUiNoteL( aStringPointer );
+                CleanupStack::PopAndDestroy(); // aString
                 }
-            else
+                break;
+            case ENotChargingNote:
                 {
-                memoryCardStatus = aMemoryCardStatus;
+                _LIT(KPowerPressKey,"Not charging");
+                HBufC* aString = HBufC16::NewLC(100);
+                TPtrC aStringPointer = aString->Des();
+                aStringPointer.Set(KPowerPressKey);
+                TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
+                ShowExampleUiNoteL( aStringPointer );
+                CleanupStack::PopAndDestroy(); // aString
                 }
-
-            TRACES( RDebug::Print( _L("CSysApAppUi::RunUnlockNotifierL: memoryCardStatus=%d"), memoryCardStatus ) );
-
-            switch ( memoryCardStatus )
+                break;
+            case EBatteryFullUnplugChargerNote:
                 {
-                case ESysApMemoryCardInserted:
-                    TRACES( RDebug::Print( _L("CSysApAppUi::RunUnlockNotifierL MMC inserted") ) );
-                    if ( aMemoryCardStatus == ESysApMemoryCardInserted )
-                        {
-                        RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
-                        }
-                    break;
-                case ESysApMemoryCardLocked:
-                    {
-                    TRACES( RDebug::Print( _L("CSysApAppUi::RunUnlockNotifierL MMC locked") ) );
-                    RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
-                    TInt callState = StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState );
-
-                    if (  (! ( iDeviceLockEnabled || iKeyLockEnabled ) ) &&
-                          callState != EPSCTsyCallStateRinging && // We don't want to see the MMC passwd query
-                          callState != EPSCTsyCallStateAlerting ) // when the user is e.g. making an emergency call
-                        {
-                        if ( iSysApFeatureManager->MemoryCardLockSupported() )
-                            {
-                            if ( ! iMemoryCardDialog )
-                                {
-                                TRACES( RDebug::Print( _L("CSysApAppUi::RunUnlockNotifierL: ACTIVATE MMC passwd query") ) );
-                                CAknMemoryCardDialog* mmcDialog = CAknMemoryCardDialog::NewLC( this );
-                                iMemoryCardDialog = mmcDialog; // temporary variable used for hiding codescanner error 
-                                iMemoryCardDialog->SetSelfPointer( &iMemoryCardDialog );
-                                iMemoryCardDialog->UnlockCardLD(); // when UnlockCardLD completes it calls UnlockComplete()
-                                }
-                            }
-                        else
-                            {
-                            // Since locked cards are not supported, notify user that card is locked.
-                            ShowQueryL( ESysApMemoryCardLockedNote );
-                            }
-                        }
-                    }
-                    break;
-
-                case ESysApMemoryCardNotInserted:
-                default:
-                    TRACES( RDebug::Print( _L("CSysApAppUi::RunUnlockNotifierL MMC not inserted") ) );
-                    if ( aMemoryCardStatus == ESysApMemoryCardNotInserted )
-                        {
-                        RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
-                        }
+                /*	
+                TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) ); 
+                iSysApLightsController->BatteryEmptyL( ETrue );
+                 _LIT(KunplugCharger,"txt_power_dpopinfo_unplug_charger_to_save_energy");                 
+                 HBufC* unplugCharger = HbTextResolverSymbian::LoadL(KunplugCharger);
+                 _LIT(KbatteryFull,"txt_power_management_dpophead_100_full");
+                 HBufC* batteryFull = HbTextResolverSymbian::LoadL(KbatteryFull);
+                 CHbDeviceNotificationDialogSymbian::NotificationL(KbatteryFullIcon,*unplugCharger,*batteryFull);  
+                 */
+                 
+                 iSysApLightsController->BatteryEmptyL( ETrue );
+                 _LIT(KPowerPressKey,"Charging complete. Unplug charger to save energy.");
+                 HBufC* aString = HBufC16::NewLC(200);
+                 TPtrC aStringPointer = aString->Des();
+                 aStringPointer.Set(KPowerPressKey);
+                 TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
+                 ShowExampleUiNoteL( aStringPointer );
+                 CleanupStack::PopAndDestroy(); // aString     
+                 }
+                break;
+            case EUnplugChargerNote:
+                {
+                _LIT(KPowerPressKey,"Unplug charger from power supply to save energy");
+                HBufC* aString = HBufC16::NewLC(250);
+                TPtrC aStringPointer = aString->Des();
+                aStringPointer.Set(KPowerPressKey);
+                TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
+                ShowExampleUiNoteL( aStringPointer );
+                CleanupStack::PopAndDestroy(); // aString
                 }
+                break;
+            default:
+                break;
             }
         }
-    TRACES( RDebug::Print( _L("CSysApAppUi::RunUnlockNotifierL: END") ) );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::UnlockComplete() from MAknMemoryCardDialogObserver
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::UnlockComplete( TInt aResult )
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::UnlockComplete result: %d"), aResult ) );
-    if ( aResult == KErrNone )
-        {
-        RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
-        }
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::MMCStatusChangedL() from MSysApMemoryCardObserver
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::MMCStatusChangedL()
-    {
-    TRACES( RDebug::Print( _L( "CSysApAppUi::MMCStatusChangedL START: iMMCInserted: %d, iMMCEjectUsed: %d, iHideFirstBeep: %d, iHideNextBeep: %d" ), iMMCInserted, iMMCEjectUsed, iHideFirstBeep, iHideNextBeep ) );
-
-    if ( iSysApFeatureManager->MmcSupported() && !iShutdownStarted )
-        {
-        TSysApMemoryCardStatus memoryCardStatus = iSysApMMCObserver->MemoryCardStatus();
-        TRACES( RDebug::Print( _L( "CSysApAppUi::MMCStatusChangedL memoryCardStatus=%d" ), memoryCardStatus ) );
-
-        switch ( memoryCardStatus )
-            {
-            case ESysApMemoryCardInserted:
-            case ESysApMemoryCardLocked:
-                TRACES( RDebug::Print( _L( "CSysApAppUi::MMCStatusChangedL: MMC drive mounted" ) ) );
-                if ( ! iMMCInserted ) // MMC was not inserted before
-                    {
-                    TRACES( RDebug::Print( _L( "CSysApAppUi::MMCStatusChangedL: MMC newly inserted" ) ) );
-                    CancelWaitNote(); // just to be sure, the user might keep on closing and opening the MMC latch
-                    // An MMC has been newly inserted, so play a sound and check if its password protected
-
-                    if ( UiReady() )
-                        {
-                        if ( !iHideFirstBeep && !iHideNextBeep ) // starting up
-                            {
-                            Beep();
-                            // Switch lights on
-                            iSysApLightsController->MemoryCardInsertedL();
-                            }
-                        iHideNextBeep = EFalse;
-                        }
-
-                    iMMCPowerMenuEjectUsed = EFalse;
-                    iMMCEjectUsed = EFalse;
-                    iMMCInserted = ETrue;
-
-                    // No need to show ESysApRemoveMmcNote after MMC already mounted
-                    if ( iSysApConfirmationQuery )
-                        {
-                        if ( iSysApConfirmationQuery->CurrentQuery() == ESysApRemoveMmcNote )
-                            {
-                            iSysApConfirmationQuery->Cancel();
-                            }
-                        }
-
-                    // Check if the MMC is locked and unlock it if necessary
-                    RunUnlockNotifierL( memoryCardStatus );
-                    }
-                break;
-            default:
-                TRACES( RDebug::Print( _L( "CSysApAppUi::MMCStatusChangedL: MMC drive not mounted" ) ) );
-                delete iMemoryCardDialog; // sets itself to null
-                RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
-                if ( iMMCInserted )
-                    {
-                    // No need to show ESysApEjectMmcQuery after MMC already removed
-                    if ( iSysApConfirmationQuery )
-                        {
-                        if ( iSysApConfirmationQuery->CurrentQuery() == ESysApEjectMmcQuery )
-                            {
-                            iSysApConfirmationQuery->Cancel();
-                            }
-                        }
-
-                    iMMCInserted = EFalse;
-
-                    TInt propertyValue( StateOfProperty( KPSUidUsbWatcher, KUsbWatcherSelectedPersonality ) );
-                    if ( !iMMCEjectUsed && propertyValue != KUsbPersonalityIdMS )
-                        {
-                        // if USB file transfer active, do not close applications
-                        // if eject selected in MMC App, MMC App takes care of the following and
-                        // if eject selected from powerkeymenu, applications have already been shutdown
-                        iTimeToKill = EFalse;
-                        iApplicationScanningRoundNumber = 0;
-                        CloseUIAppsInHotSwapL();
-                        }
-                    }
-                else
-                    {
-                    // If MMC was not previously inserted and eject was chosed from power key menu, attempt to remount.
-                    if ( iMMCPowerMenuEjectUsed )
-                        {
-                        TRACES( RDebug::Print( _L( "CSysApAppUi::MMCStatusChangedL: Attempt to remount" ) ) );
-                        MountMMC();
-                        // If mount was successful, unnecessary note will be canceled in insert notification handling.
-                        }
-                    }
-                break;
-            }
-
-        // Update memory card indicator status
-        SetMemoryCardIndicatorL();
-        }
-    TRACES( RDebug::Print( _L( "CSysApAppUi::MMCStatusChangedL   END: iMMCInserted: %d, iMMCEjectUsed: %d, iHideFirstBeep: %d, iHideNextBeep: %d" ), iMMCInserted, iMMCEjectUsed, iHideFirstBeep, iHideNextBeep ) );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowMMCDismountedDialogL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ShowMMCDismountedDialogL()
-    {
-    TInt propertyValue( StateOfProperty( KPSUidUsbWatcher, KUsbWatcherSelectedPersonality ) );
-
-    // Do not show any note if USB file transfer is active.
-    if ( propertyValue != KUsbPersonalityIdMS )
-        {
-        if ( iSysApFeatureManager->MemoryCardHatchSupported() )
-            { // MMC hatch has been opened and MMC has been dismounted
-            TRACES( RDebug::Print( _L( "CSysApAppUi::ShowMMCDismountedDialogL: Show note: Remove MMC and press OK." ) ) );
-            ShowQueryL( ESysApRemoveMmcNote );
-            }
-        else
-            {
-            // MMC has been removed and dismounted
-            TRACES( RDebug::Print( _L( "CSysApAppUi::ShowMMCDismountedDialogL: Show note: You might have lost some data." ) ) );
-            // No confirmation but let's set this true to enable MMC passwd query
-            ShowUiNoteL( EMemoryCardRemovedWithoutEjectNote );
-            }
-        }
-    else
-        {
-        TRACES( RDebug::Print( _L( "CSysApAppUi::ShowMMCDismountedDialogL: No note shown, USB file transfer caused dismount." ) ) );
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::MMCDismountedDialogConfirmed
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::MMCDismountedDialogConfirmed()
-    {
-    TRACES( RDebug::Print( _L( "CSysApAppUi::MMCDismountedDialogConfirmed") ) );
-
-    // Try to remount just in case when eject was chosen from power key menu
-    if ( iMMCPowerMenuEjectUsed )
-        {
-        iMMCPowerMenuEjectUsed = EFalse;
-
-        if ( MountMMC() == KErrLocked ) // In case a locked card was not removed after all
-            {
-            TRAPD( err, MMCStatusChangedL() ); // This will update power menu and memory card icon. Also memory card password is requeried.
-            if ( err != KErrNone )
-                {
-                TRACES( RDebug::Print( _L( "CSysApAppUi::MMCDismountedDialogConfirmed: MMCStatusChangedL failed, err=%d"), err ) );
-                }
-            }
-        }
-
-    }
-
-#else // RD_MULTIPLE_DRIVE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::MMCInsertedL
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::MMCInsertedL()
-    {
-    TRACES( RDebug::Print( _L( "CSysApAppUi::MMCInsertedL") ) );
-
-    if ( iSysApFeatureManager->MmcSupported() && !iShutdownStarted )
-		{
-		TBool normalState( UiReady() );
-
-		if ( normalState )
-			{
-			TInt defaultMemoryCard( iSysApDriveList->DefaultMemoryCard() );
-			TSysApMemoryCardStatus memoryCardStatus( iSysApDriveList->MemoryCardStatus( defaultMemoryCard ) );
-
-			TRACES( RDebug::Print(
-				_L( "CSysApAppUi::MMCInsertedL: drive: %d, memoryCardStatus: %d" ), defaultMemoryCard, memoryCardStatus ) );
-
-			switch ( memoryCardStatus )
-				{
-				case ESysApMemoryCardInserted: // Fall through
-				case ESysApMemoryCardLocked:
-					{
-					// Reset eject and unlock of inserted memory card
-					iSysApDriveList->ResetDriveToEject( defaultMemoryCard );
-					iSysApDriveList->ResetDriveUnlockQueryShown( defaultMemoryCard );
-
-					CancelWaitNote();
-
-					if ( memoryCardStatus == ESysApMemoryCardInserted )
-						{
-						TRACES( RDebug::Print(
-							_L( "CSysApAppUi::MMCInsertedL: memoryCardStatus ESysApMemoryCardInserted: %d" ), memoryCardStatus ) );
-						RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
-						}
-					else
-						{
-						TRACES( RDebug::Print(
-							_L( "CSysApAppUi::MMCInsertedL: memoryCardStatus ESysApMemoryCardLocked: %d" ), memoryCardStatus ) );
-						RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
-						}
-					break;
-					}
-				case ESysApMemoryCardNotInserted:
-					{
-					// Always reset eject and unlock of removed memory card
-					TBool isEject( iSysApDriveList->IsDriveToEject( defaultMemoryCard ) );
-
-					TRACES( RDebug::Print(
-						_L( "CSysApAppUi::MMCInsertedL: isEject: %d, drive: %d" ),
-						isEject, defaultMemoryCard ) );
-
-					iSysApDriveList->ResetDriveToEject( defaultMemoryCard );
-					iSysApDriveList->ResetDriveUnlockQueryShown( defaultMemoryCard );
-
-					TRACES( RDebug::Print(
-						_L( "SysApAppUi::MMCInsertedL: memoryCardStatus ESysApMemoryCardNotInserted: %d" ), memoryCardStatus ) );
-
-					RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
-					break;
-					}
-				case ESysApMemoryCardStatusNotKnown: // Fall through
-				default:
-					{
-					break;
-					}
-				}
-				RunUnlockNotifierL();
-			}
-		}
-	}
-
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::RunUnlockNotifierL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::RunUnlockNotifierL()
-    {
-    TRACES( RDebug::Print(
-        _L("CSysApAppUi::RunUnlockNotifierL: START iDeviceLockEnabled: %d, iKeyLockEnabled: %d" ),
-         iDeviceLockEnabled, iKeyLockEnabled ) );
-
-    if ( !iSysApFeatureManager->MmcSupported() ||
-         iDeviceLockEnabled ||
-         iKeyLockEnabled ||
-         !UiReady() )
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::RunUnlockNotifierL: END") ) );
-        return;
-        }
-
-    // We don't want to see the MMC passwd query
-    // when the user is e.g. making an emergency call
-    TInt callState( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) );
-    if ( callState != EPSCTsyCallStateRinging &&
-        callState != EPSCTsyCallStateAlerting )
-        {
-        iSysApDriveUnlockHandler->StartUnlock();
-        }
-
-    TRACES( RDebug::Print(
-        _L("CSysApAppUi::RunUnlockNotifierL: END callState: %d"), callState ) );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::MMCStatusChangedL() from MSysApMemoryCardObserver
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::MMCStatusChangedL( TInt aDrive )
-    {
-    TRACES( RDebug::Print(
-        _L( "CSysApAppUi::MMCStatusChangedL START: MMCCount: %d, iMMCEjectUsed: %d" ),
-        iInsertedMemoryCards.Count(), iMMCEjectUsed ) );
-
-    if ( iShutdownStarted || !iSysApFeatureManager->MmcSupported() )
-        {
-        TRACES( RDebug::Print(
-            _L( "CSysApAppUi::MMCStatusChangedL iShutdownStarted: %d END" ),
-            iShutdownStarted ) );
-        return;
-        }
-
-    TBool normalState( UiReady() );
-
-    TInt defaultMemoryCard( iSysApDriveList->DefaultMemoryCard() );
-    TSysApMemoryCardStatus memoryCardStatus( iSysApDriveList->MemoryCardStatus( aDrive ) );
-    TInt insertedIndex( CSysApDriveList::Find( iInsertedMemoryCards, aDrive ) );
-
-    TRACES( RDebug::Print(
-        _L( "CSysApAppUi::MMCStatusChangedL: normalState: %d, index: %d, drive: %d, memoryCardStatus: %d" ),
-        normalState, insertedIndex, aDrive, memoryCardStatus ) );
-
-    switch ( memoryCardStatus )
-        {
-        case ESysApMemoryCardInserted: // Fall through
-        case ESysApMemoryCardLocked:
-            {
-            if ( insertedIndex == KErrNotFound ) // Not inserted before
-                {
-                // Reset eject and unlock of inserted memory card
-                iSysApDriveList->ResetDriveToEject( aDrive );
-                iSysApDriveList->ResetDriveUnlockQueryShown( aDrive );
-
-                CancelWaitNote();
-
-                if ( aDrive == defaultMemoryCard )
-                    {
-                    if ( memoryCardStatus == ESysApMemoryCardInserted )
-                        {
-                         RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
-                      	}
-                    else
-                        {
-                        RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
-                        }
-                    }
-
-                if ( normalState )
-                    {
-                    // Ignore extra beep from USB file transfer
-                    TBool ignoreBeep(
-                        iSysApDriveList->IsDriveInsertBeepIgnored( aDrive ) );
-
-                    TRACES( RDebug::Print(
-                        _L( "CSysApAppUi::MMCStatusChangedL: ignoreBeep: %d, drive: %d" ),
-                        ignoreBeep, aDrive ) );
-
-                    if ( !ignoreBeep )
-                        {
-                        Beep();
-                        iSysApLightsController->MemoryCardInsertedL();
-                        }
-
-                    iSysApDriveList->ResetDriveInsertBeepIgnored( aDrive );
-
-                    // Keep ignoring extra beep if USB file transfer is active
-                    TInt propertyValue( StateOfProperty( KPSUidUsbWatcher, KUsbWatcherSelectedPersonality ) );
-
-                    TRACES( RDebug::Print(
-                        _L( "CSysApAppUi::MMCStatusChangedL: usbState: %d" ), propertyValue ) );
-
-                    if ( propertyValue == KUsbPersonalityIdMS )
-                        {
-                        iSysApDriveList->MarkDriveInsertBeepIgnored( aDrive );
-                        }
-                    }
-
-                if ( iDriveToDismount == aDrive && iSysApConfirmationQuery )
-                    {
-                    if ( iSysApConfirmationQuery->CurrentQuery() == ESysApRemoveMmcNote )
-                        {
-                        // User put back ejected memory card or did not remove it
-                        iSysApConfirmationQuery->Cancel();
-                        }
-                    }
-                RunUnlockNotifierL();
-                }
-            break;
-            }
-        case ESysApMemoryCardNotInserted:
-            {
-            // Always reset eject and unlock of removed memory card
-            TBool isEject( iSysApDriveList->IsDriveToEject( aDrive ) );
-
-            TRACES( RDebug::Print(
-                _L( "CSysApAppUi::MMCStatusChangedL: isEject: %d, drive: %d" ),
-                isEject, aDrive ) );
-
-            iSysApDriveList->ResetDriveToEject( aDrive );
-            iSysApDriveList->ResetDriveUnlockQueryShown( aDrive );
-
-            if ( insertedIndex != KErrNotFound ) // Inserted before
-                {
-                if ( memoryCardStatus == ESysApMemoryCardNotInserted )
-                    {
-                    // Reset extra beep ignore if memory card was removed without eject
-                    iSysApDriveList->ResetDriveInsertBeepIgnored( aDrive );
-                    }
-
-                CancelGlobalListQuery(); // Cancel power menu
-
-                if ( aDrive == defaultMemoryCard )
-                    {
-                    RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
-                    }
-
-                if ( iSysApConfirmationQuery )
-                    {
-                    if ( iSysApConfirmationQuery->CurrentQuery() == ESysApEjectMmcQuery )
-                        {
-                        // User removed memory card too early
-                        iSysApConfirmationQuery->Cancel();
-                        // Allow application closing to execute.
-                        // Also FileManager is closed in this case, regardless where the eject was initiated from.
-                        iMMCEjectUsed = EFalse;
-                        }
-                    }
-
-                // Stop unlock of removed memory card
-                iSysApDriveUnlockHandler->StopUnlock( aDrive );
-
-                if ( !iMMCEjectUsed && !isEject )
-                    {
-                    TInt propertyValue( StateOfProperty( KPSUidUsbWatcher, KUsbWatcherSelectedPersonality ) );
-
-                    TRACES( RDebug::Print(
-                        _L( "CSysApAppUi::MMCStatusChangedL: usbState: %d" ), propertyValue ) );
-
-                    if ( propertyValue != KUsbPersonalityIdMS )
-                        {
-                        if ( iSysApFeatureManager->MemoryCardHatchSupported() )
-                            {
-                            // Store drive removed without eject and start eject handling
-                            iSysApDriveList->MarkDriveToEject(
-                                aDrive, CSysApDriveList::EEjectRemovedWithoutEject );
-                            iSysApDriveEjectHandler->StartEject();
-                            }
-                        else
-                            {
-                            // Just show the note
-                            ShowUiNoteL( EMemoryCardRemovedWithoutEjectNote );
-                            }
-                        }
-                    }
-                iMMCEjectUsed = EFalse;
-                }
-            break;
-            }
-        case ESysApMemoryCardStatusNotKnown: // Fall through
-        default:
-            {
-            break;
-            }
-        }
-
-    // Update inserted memory cards
-    iSysApDriveList->GetMemoryCardsL(
-        iInsertedMemoryCards, CSysApDriveList::EIncludeInserted );
-
-    // Update memory card indicator status
-    SetMemoryCardIndicatorL();
-
-    TRACES( RDebug::Print(
-        _L( "CSysApAppUi::MMCStatusChangedL END: MMCCount: %d, iMMCEjectUsed: %d" ),
-        iInsertedMemoryCards.Count(), iMMCEjectUsed ) );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowMMCDismountedDialogL()
-// ----------------------------------------------------------------------------
-
-TBool CSysApAppUi::ShowMMCDismountedDialogL(
-        TInt aDrive, CSysApDriveList::TDriveEjectType aEjectType )
-    {
-    TRACES( RDebug::Print(
-        _L( "CSysApAppUi::ShowMMCDismountedDialogL: aDrive: %d, aEjectType: %d" ),
-        aDrive, aEjectType ) );
-
-    TBool ret( EFalse );
-    iDriveToDismount = aDrive;
-    HBufC* driveName = iSysApDriveList->GetFormattedDriveNameLC(
-        aDrive,
-        R_QTN_EJECT_REMOVE_MEMORY_INFO );
-
-    if ( aEjectType == CSysApDriveList::EEjectFromMenu )
-        {
-        TRACES( RDebug::Print(
-            _L( "CSysApAppUi::ShowMMCDismountedDialogL: Show note: Remove MMC and press OK...." ) ) );
-        ShowQueryL( ESysApRemoveMmcNote, *driveName );
-        ret = ETrue;
-        }
-    else
-        {
-        // Memory card was removed without eject
-        TInt propertyValue( StateOfProperty( KPSUidUsbWatcher, KUsbWatcherSelectedPersonality ) );
-
-        // Do not show any note if USB file transfer is active.
-        if ( propertyValue != KUsbPersonalityIdMS )
-            {
-            if ( iSysApFeatureManager->MemoryCardHatchSupported() )
-                {
-                // MMC hatch has been opened and MMC has been dismounted
-                TRACES( RDebug::Print(
-                    _L( "CSysApAppUi::ShowMMCDismountedDialogL: Show note: Remove MMC and press OK." ) ) );
-                ShowQueryL( ESysApRemoveMmcNote, *driveName );
-                ret = ETrue;
-                }
-            else
-                {
-                iSysApDriveList->ResetDrivesToEject();
-
-                // MMC has been removed and dismounted
-                TRACES( RDebug::Print( _L(
-                    "CSysApAppUi::ShowMMCDismountedDialogL: Show note: You might have lost some data." ) ) );
-
-                // No confirmation but let's set this true to enable MMC passwd query
-                ShowUiNoteL( EMemoryCardRemovedWithoutEjectNote );
-                }
-            }
-        else
-            {
-            iSysApDriveList->ResetDrivesToEject();
-            TRACES( RDebug::Print(
-                _L( "CSysApAppUi::ShowMMCDismountedDialogL: No note shown, USB file transfer caused dismount." ) ) );
-            }
-        }
-
-    CleanupStack::PopAndDestroy( driveName );
-
-    TRACES( RDebug::Print(
-        _L( "CSysApAppUi::ShowMMCDismountedDialogL: ret: %d" ), ret ) );
-
-    return ret;
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::MMCDismountedDialogConfirmed
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::MMCDismountedDialogConfirmed()
-    {
-    TRACES( RDebug::Print(
-        _L( "CSysApAppUi::MMCDismountedDialogConfirmed: iDriveToDismount: %d" ),
-        iDriveToDismount ) );
-
-    // Try remount to check if drive was put back
-    iSysApDriveList->MountDrive( iDriveToDismount );
-    if ( !iSysApDriveEjectHandler->CompleteDismount( iDriveToDismount ) )
-        {
-        // When ready, check for locked memory cards and update indicators
-        TRAP_IGNORE( SetMemoryCardIndicatorL() );
-        TRAP_IGNORE( RunUnlockNotifierL() );
-        }
-    }
-
-#endif // RD_MULTIPLE_DRIVE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::EjectStarted()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::EjectStarted( TBool ejectStarted )
-    {
-    TRACES( RDebug::Print( _L( "CSysApAppUi::EjectStarted" ) ) );
-    iMMCEjectUsed = ejectStarted;
-    
-#ifndef RD_MULTIPLE_DRIVE
-    iFileManagerCloseDisabled = ejectStarted;
-#endif // RD_MULTIPLE_DRIVE
-}
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DoLightsTimeoutChangedL
-// ----------------------------------------------------------------------------
-void CSysApAppUi::DoLightsTimeoutChangedL( const TInt aTimeout )
-    {
-    iSysApLightsController->DoLightsTimeoutChangedL( aTimeout );
-    }
-
-#ifdef __SYSAP_MODULE_TEST
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ModuleTestShowUiNoteL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ModuleTestShowUiNoteL( const TDesC& noteText ) const
-    {
-    CAknGlobalNote* note = CAknGlobalNote::NewLC();
-    note->SetTone( EAvkonSIDNoSound );
-    note->ShowNoteL( EAknGlobalInformationNote, noteText );
-    CleanupStack::PopAndDestroy(); // note
-    }
-
-#endif
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowShutdownNoteL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::ShowShutdownNoteL()
-    {
-    TRACES( RDebug::Print( _L( "CSysApAppUi::ShowShutdownNoteL") ) );
-    ShowUiNoteL( EShutdownNote );
-    User::After( KTimeToShowShutdownNote );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::Beep()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::Beep()
-    {
-    static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->PlaySound( EAvkonSIDInformationTone );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SimSupported()
-// ----------------------------------------------------------------------------
-TBool CSysApAppUi::SimSupported()
-    {
-    return iSysApFeatureManager->SimSupported();
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::IsStateNormal()
-//
-// ----------------------------------------------------------------------------
-TBool CSysApAppUi::IsStateNormal() const
-    {
-    TInt state;
-    TInt errorCode =
-        RProperty::Get( KPSUidStartup, KPSGlobalSystemState, state );
-    if ( errorCode == KErrNone )
-        {
-        return state == ESwStateNormalRfOn ||
-               state == ESwStateNormalRfOff ||
-               state == ESwStateNormalBTSap;
-        }
-    else
-        {
-        TRACES( RDebug::Print( _L( "CSysApAppUi::IsStateNormal: Failed to read global system state, error code %d." ), errorCode ) );
-        return EFalse;
-        }
-    }
 
 // ----------------------------------------------------------------------------
 // CSysApAppUi::BatteryEmptyL()
@@ -5743,761 +1982,222 @@
     iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive, 0 );
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::Max()
-// ----------------------------------------------------------------------------
-
-TInt CSysApAppUi::Max( const TInt aA, const TInt aB, const TInt aC )
-     {
-     TInt max( aA );
-     if ( aB > max )
-         {
-         max = aB;
-         }
-     if ( aC > max )
-         {
-         max = aC;
-         }
-     return max;
-     }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::SetStarterState()
-// ----------------------------------------------------------------------------
-
-TInt CSysApAppUi::SetStarterState( const RStarterSession::TGlobalState aState )
-    {
-    if ( iSysApStartupController->GlobalStateChangeAllowed( aState ) )
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::SetStarterState: aState=%d" ), aState ) );
-        return StarterSession().SetState( aState );
-        }
-    else
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::SetStarterState: aState=%d - not allowed" ), aState ) );
-        return KErrNone;
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::GetBtSapDeviceNameL()
-// ----------------------------------------------------------------------------
-
-HBufC* CSysApAppUi::GetBtSapDeviceNameL()
-    {
-    return iSysApBtSapController->GetBtSapDeviceNameL();
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowAlarmIndicatorL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ShowAlarmIndicatorL( TBool aShowIndicator )
-    {
-    if ( aShowIndicator)
-        {
-        SetIndicatorStateL( EAknIndicatorAlarmClock, EAknIndicatorStateOn );
-        }
-    else
-        {
-        SetIndicatorStateL( EAknIndicatorAlarmClock, EAknIndicatorStateOff );
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SimulateFlipKeyEventL()
+// CSysApAppUi::ShowQueryL()
 // ----------------------------------------------------------------------------
 
-void CSysApAppUi::SimulateFlipKeyEventL( TBool aFlipOpen )
+void CSysApAppUi::ShowQueryL( const TSysApConfirmationQueryIds /* aQueryId */, const TDesC& /* aValue */)
     {
-    TRACES( RDebug::Print( _L("CSysApAppUi::SimulateFlipKeyEventL: aFlipOpen: %d" ), aFlipOpen ) );
-
-    /*
-       Flip key is constructed when a flip notification via Pub&Sub is received. The reason behind
-       providing this as a key event is to enable unified handling of keys also with flip, and because
-       flip is captured&consumed by Avkon it is not possible to capture flip key events directly
-       from default handler/plugins.
-    */
-
-    TKeyEvent flipEvent;
-    flipEvent.iCode = aFlipOpen ? EKeyFlipOpen : EKeyFlipClose;
-    flipEvent.iScanCode = 0;
-    flipEvent.iModifiers = 0;
-	flipEvent.iRepeats = 0;
-
-    HandleKeyEventL( flipEvent, EEventKey );
+    // do nothing
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetFlipOpenL()
-// ----------------------------------------------------------------------------
 
-void CSysApAppUi::SetFlipOpenL( TBool aFlipOpen )
-    {
-    iSysApLightsController->SetFlipOpenL( aFlipOpen );
-    }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::SetGripOpenL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::SetGripOpenL( TBool aGripOpen )
-    {
-    iSysApLightsController->SetGripOpenL( aGripOpen );
-    }
-
+// CSysApAppUi::HandleChargingStatusL
 // ----------------------------------------------------------------------------
-// CSysApAppUi::SetNetworkConnectionAllowed()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::SetNetworkConnectionAllowed( TCoreAppUIsNetworkConnectionAllowed aNetworkConnectionAllowed )
+//
+void CSysApAppUi::HandleChargingStatusL( const TInt aValue )
     {
-    TRACES( RDebug::Print( _L("CSysApAppUi::SetNetworkConnectionAllowed: status: %d" ), aNetworkConnectionAllowed ) );
-
-    iSysApCenRepController->SetInt( KCRUidCoreApplicationUIs, KCoreAppUIsNetworkConnectionAllowed, (TInt) aNetworkConnectionAllowed );
+    TRACES( RDebug::Print( _L("CSysApAppUi::HandleChargingStatusL aValue: %d"), aValue ) );
+    
+    TBool showNote( ETrue );
+    
+    UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
 
-    // Also set the Symbian PS key used for the same purpose:
-    RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, aNetworkConnectionAllowed ? ESAPhoneOn : ESAPhoneOff);
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::GetTelServerL()
-// ----------------------------------------------------------------------------
-
-RTelServer* CSysApAppUi::GetTelServer()
-    {
-    if ( iSysApEtelConnector )
+    if ( iSysApPsmController && UiReady() ) 
+        {             
+        if ( iCharging && !iSysApPsmController->ChargerConnected() ) // first time after charger connection
+            {
+            iSysApPsmController->ConnectCharger( ETrue );
+            if ( iSysApPsmController->ShowDeactivateQuery() )
+                {
+                ShowQueryL( ESysApBattChargingPowerSavingQuery );
+                // Query is on the display. Don't show the note.
+                showNote = EFalse;               
+                }
+            else
+                {
+                iSysApPsmController->DoEnablePartialPsm( EFalse );
+                }              
+            }
+        else if ( aValue == EChargingStatusNotConnected )
+            {
+            iSysApPsmController->ConnectCharger( EFalse );
+            }            
+        }
+    if( showNote )
         {
-        return iSysApEtelConnector->GetTelServer();
-        }
-    else
-        {
-        return NULL;
+        HandleChargerNotesL( aValue );    
         }
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::CoverDisplaySupported()
-// ----------------------------------------------------------------------------
-
-TBool CSysApAppUi::CoverDisplaySupported()
-    {
-    return iSysApFeatureManager->CoverDisplaySupported();
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::StarterSession()
-// ----------------------------------------------------------------------------
-
-RStarterSession& CSysApAppUi::StarterSession()
-    {
-    if ( !iStarterSession.Handle() )
-        {
-        // All server connections are tried to be made KTriesToConnectServer times because occasional
-        // fails on connections are possible at least on some servers
-        TRACES( RDebug::Print( _L("CSysApAppUi::StarterSession: trying RStarterSession::Connect()") ) );
-        TInt thisTry = 0;
-        TInt err;
-        while ( ( err = iStarterSession.Connect() ) != KErrNone && ( thisTry++ ) <= KTriesToConnectServer )
-            {
-            User::After( KTimeBeforeRetryingServerConnection );
-            }
-
-        if ( err != KErrNone )
-            {
-            // What do in error case?
-            TRACES( RDebug::Print( _L("CSysApAppUi::StarterSession: RStarterSession::Connect() failed with %d"), err ) );
-            }
-        }
-
-    return iStarterSession;
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::KeyLock()
-// ----------------------------------------------------------------------------
-
-RAknKeylock2& CSysApAppUi::KeyLock()
-    {
-    if ( !iKeyLock.Handle() )
-        {
-        // All server connections are tried to be made KTriesToConnectServer times because occasional
-        // fails on connections are possible at least on some servers
-        TInt thisTry = 0;
-        TInt err;
-
-        TRACES( RDebug::Print( _L("CSysApAppUi::KeyLock: trying RAknKeylock2::Connect()") ) );
-        thisTry = 0;
-        while ( ( err = iKeyLock.Connect() ) != KErrNone && ( thisTry++ ) <= KTriesToConnectServer )
-            {
-            User::After( KTimeBeforeRetryingServerConnection );
-            }
-
-        if ( err != KErrNone )
-            {
-            // What do in error case?
-            TRACES( RDebug::Print( _L("CSysApAppUi::KeyLock: RAknKeylock2::Connect() failed with %d"), err ) );
-            }
-        }
-
-    return iKeyLock;
-    }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::CenRepController()
-// ----------------------------------------------------------------------------
-
-CSysApCenRepController& CSysApAppUi::CenRepController()
-    {
-    __ASSERT_ALWAYS( iSysApCenRepController, User::Panic( _L("CSysApAppUi::CenRepController"), KErrBadHandle ) );
-
-    return *iSysApCenRepController;
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ExecCommandL
+// CSysApAppUi::HandleChargerNotesL()
 // ----------------------------------------------------------------------------
-//
-void CSysApAppUi::ExecCommandL( TSysapCommand aCommand )
+void CSysApAppUi::HandleChargerNotesL( const TInt aValue )
     {
-    ExecCommandL( aCommand, KNullDesC8 );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ExecCommandL
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::ExecCommandL( TSysapCommand aCommand, const TDesC8& aParam )
-    {
-    TRACES( RDebug::Print(_L("CSysApAppUi::ExecCommandL: aCommand=%d"), aCommand ) );
-
-    switch ( aCommand )
+    TBool showNote(StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) !=  EPSCTsyCallStateRinging);
+    if ( aValue == EChargingStatusCharging )
+        {
+        iSysApLightsController->BatteryEmptyL( EFalse );
+        TRACES( RDebug::Print( _L("SysAp: charger connected") ) );
+        iSysApLightsController->ChargerConnectedL( ETrue );
+        ShowChargingNoteL();
+        }
+    //Display Not Charging note
+    else if ( aValue == EChargingStatusError )
+        {
+        if(showNote)
+            {
+            ShowUiNoteL( ENotChargingNote );
+            }
+        }
+    else if ( aValue == EChargingStatusChargingComplete )
         {
-        case EResetKeyguardState: // reset the internal keyguard flags of the SysAp, except for iKeyLockOnBeforeCradle
-            iKeyLockOnBeforeCall = EFalse;
-            iKeyLockOnBeforeAlarm = EFalse;
-            break;
-
-        case ECancelPowermenu: // hide power menu if it is visible
-            if( iPowerKeyPopupMenuActive )
-                {
-                CancelGlobalListQuery();
-                }
-            break;
-
-        case EUpdateLights: // apply key specific light handling
+        iSysApLightsController->ChargingCompleteL();
+        
+        TSysApNoteIds note( EBatteryFullNote );
+        
+        if ( !iSysApUsbChargerDetector.HostOnlyUsbChargingUsed() &&
+             iSysApFeatureManager->Supported( KSysApFeatureIdChargerReminderNotes ) )
+            {
+            note = EBatteryFullUnplugChargerNote;
+            }
+        iSysApUsbChargerDetector.Reset();
+        if(showNote)
             {
-            TUpdateLightsBuf lightBuf;
-            lightBuf.Copy( aParam );
-
-            switch ( lightBuf() )
+            ShowUiNoteL( note );
+            }
+        }
+    else if ( aValue == EChargingStatusNotConnected )
+        {
+        TRACES( RDebug::Print( _L("SysAp: charger removed") ) );
+        iSysApLightsController->ChargerConnectedL( EFalse );
+        
+        if ( !iSysApUsbChargerDetector.HostOnlyUsbChargingUsed() &&
+             iSysApFeatureManager->Supported( KSysApFeatureIdChargerReminderNotes ) )
+            {
+        if(showNote)
                 {
-                case EKeyGripClose:
-                    SetGripOpenL( EFalse );
-                    break;
-
-                case EKeyGripOpen:
-                    SetGripOpenL( ETrue );
-                    break;
-
-                case EKeyFlipClose:
-                    SetFlipOpenL( EFalse );
-                    break;
-
-                case EKeyFlipOpen:
-                    SetFlipOpenL( ETrue );
-                    break;
-
-                default:
-                    // No specific light handling for other keys.
-                    break;
+                ShowUiNoteL( EUnplugChargerNote );
                 }
             }
-            break;
-
-        default:
-            // do nothing in release builds since no harm is done
-            __ASSERT_DEBUG( EFalse, User::Panic( _L("CSysApAppUi::ExecCommandL: Invalid command"), KErrArgument ) );
-            break;
+        iSysApUsbChargerDetector.Reset();
+        }
+    else if ( aValue == EChargingStatusNotCharging )
+        {
+        TRACES( RDebug::Print( _L("SysAp: Not charging") ) );
+        }
+    else if ( aValue == EChargingStatusAlmostComplete )
+        {
+        TRACES( RDebug::Print( _L("SysAp: Charging almost complete") ) );
+        }
+    else if ( aValue == EChargingStatusChargingContinued )
+        {
+        //in this case we simply want to scroll the battery bars and not turn light on or show ui note
+        // set lights controller iBatteryEmpty to EFalse
+        iSysApLightsController->BatteryEmptyL( EFalse );
+        TRACES( RDebug::Print( _L("SysAp: charging continues") ) );
         }
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ExecQueryL
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::ExecQueryL( TSysapQuery aQuery, TDes8& aReturn )
-    {
-    ExecQueryL( aQuery, aReturn, KNullDesC8 );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ExecQueryL
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::ExecQueryL( TSysapQuery aQuery, TDes8& aReturn, const TDesC8& /*aParam*/ )
-    {
-    TRACES( RDebug::Print(_L("CSysApAppUi::ExecQueryL: aQuery=%d"), aQuery ) );
-
-    switch ( aQuery )
-        {
-        case EGetHwrmLight: // get handle to HWRM client session. Returns CHWRMLight*.
-            {
-            THwrmLightBuf retBuf( iSysApLightsController->GetHwrmLight() );
-            aReturn.Copy( retBuf );
-            }
-            break;
-
-        case EGetKeylock: // get handle to keylock client session. Returns RAknKeylock2*.
-            {
-            TKeyLockBuf retBuf( &(KeyLock()) );
-            aReturn.Copy( retBuf );
-            }
-            break;
-
-        default:
-            __ASSERT_DEBUG( EFalse, User::Panic( _L("CSysApAppUi::ExecQueryL: Invalid query"), KErrArgument ) );
-            User::Leave( KErrArgument );
-            break;
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowShutdownImage
-// ----------------------------------------------------------------------------
-//
-TInt CSysApAppUi::ShowShutdownImage( TInt aBitmapId )
-    {
-    TRACES( RDebug::Print(_L("CSysApAppUi::ShowShutdownImage") ) );
-
-    TRAPD( err, ShowShutdownImageL( aBitmapId ) );
-
-    if ( err != KErrNone )
-        {
-        TRACES( RDebug::Print(_L("CSysApAppUi::ShowShutdownImageL failed, err=%d"), err ) );
-        }
-
-    return err;
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowShutdownImageL
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::ShowShutdownImageL( TInt aBitmapId )
-    {
-    TRACES( RDebug::Print(_L("CSysApAppUi::ShowShutdownImageL") ) );
-
-    if ( !iSysApShutdownImage ) // Shutdown image may be shown without entering normal state (e.g. charging), so construct here
-        {
-        TRACES( RDebug::Print( _L("CSysApAppUi::ShowShutdownImageL: trying CSysApShutdownImage::NewL()") ) );
-        iSysApShutdownImage = CSysApShutdownImage::NewL();
-        }
-
-    TRACES( RDebug::Print( _L("CSysApAppUi::ShowShutdownImageL: trying CSysApShutdownImage::ShowShutdownImageL()") ) );
-    iSysApShutdownImage->ShowShutdownImageL( aBitmapId );
-    }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::IgnoreZeroNetworkBarNotifications
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::IgnoreZeroNetworkBarNotifications(TBool aIgnore)
-    {
-    iIgnoreZeroNetworkBarNotifications = aIgnore;
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::BtSapEnabled()
+// CSysApAppUi::UpdateBatteryBarsL( const TInt aState )
 // ----------------------------------------------------------------------------
 
-TBool CSysApAppUi::BtSapEnabled()
+void CSysApAppUi::UpdateBatteryBarsL( const TInt  /* aState */)
     {
-    if ( iSysApBtSapController )
+    TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMChargingStatus ) );
+//    TRACES( RDebug::Print( _L("CSysApAppUi::UpdateBatteryBarsL aState: %d, chargerState:%d"), aState, state ) );
+    HandleUsbCharger( state );
+    if( state == EChargingStatusCharging ||
+        state == EChargingStatusChargingContinued ||
+        state == EChargingStatusAlmostComplete )
         {
-        return iSysApBtSapController->BtSapEnabled();    
+        if ( !iCharging )
+            {
+            TRACES( RDebug::Print( _L("CSysApAppUi::UpdateBatteryBarsL: Starting Charging") ) );
+            iCharging = ETrue;
+            }
+        }
+    else
+        {
+        if ( iCharging )
+            {
+            TRACES( RDebug::Print( _L("CSysApAppUi::UpdateBatteryBarsL: Stopping Charging") ) );
+            iCharging = EFalse;
+            }
         }
     
-    return EFalse;
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DeactivateBT
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::DeactivateBT()
-    {
-    // Will deactivate BT when changing to normal mode
-    iDeactivateBt = ETrue;
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetHacIndicatorL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::SetHacIndicatorL()
-    {
-
-    if ( !iSysApCenRepHacSettingObserver )
+    if ( !iSysApPsmController ) // created here if first state change has not occurred yet
         {
-        // Do nothing if HAC setting observer has not been created yet
-        // This occurs in case some party is trying to set HAC indicator during
-        // ConstructL(), e.g. when switching from offline to online during startup
-        TRACES( RDebug::Print( _L("CSysApAppUi::SetHacIndicatorL: do nothing, HAC observer does not exist yet") ) );
-        return;
+        iSysApPsmController = CSysApPsmController::NewL( *this );        
         }
 
-    if ( iSysApCenRepHacSettingObserver->HacMode() )
+    if ( iSysApPsmController )
         {
-        TBool accessoryConnected ( EFalse );
-
-        TAccMode accMode(EAccModeHandPortable);
-
-        if ( iSysApAccessoryObserver )
-            {
-            accMode = iSysApAccessoryObserver->GetAccessoryMode();
-
-            if ( accMode != EAccModeHandPortable )
-                {
-                accessoryConnected = ETrue;
-                }
-            }
-
-        TInt indicatorState = EAknIndicatorStateOn;
-
-        if ( !accessoryConnected ) // When accessory is not connected, check offline and call state
+        if ( iSysApPsmController->FullPsmEnabled() )
             {
-            if ( OfflineModeActive() ) // HAC indicator is not shown in offline mode
-                {
-                indicatorState = EAknIndicatorStateOff;
-                }
-            else
-                {
-                // during active call with IHF activated HAC indicator is not shown
-                TInt callState( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) );
-                if ( callState < KErrNone )
-                    {
-                    callState = EPSCTsyCallStateNone;
-                    }
-
-                if ( callState != EPSCTsyCallStateNone && IhfEnabledL() )
-                    {
-                    indicatorState = EAknIndicatorStateOff;
-                    }
-                }
-
+             // activate psm indicator 
             }
         else
             {
-            // If an accessory is connected, HAC indicator should not be shown
-            indicatorState = EAknIndicatorStateOff;
-            }
-
-        SetIndicatorStateL( EAknIndicatorHAC, indicatorState );
-
+            // deactivate psm indicator
+            }            
         }
-    else
+        
+       if ( iSysApBatteryInfoController )        
         {
-        // If HAC is not active, always disable indicator regardless of accessory state
-        SetIndicatorStateL( EAknIndicatorHAC, EAknIndicatorStateOff );
+         iSysApBatteryInfoController->BatteryLevelUpdatedL();
         }
+        
+     }
 
 
-    }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::HandleResourceChangeL()
+// CSysApAppUi::ShowChargingNoteL()
 // ----------------------------------------------------------------------------
 
-void CSysApAppUi::HandleResourceChangeL( TInt aType )
+void CSysApAppUi::ShowChargingNoteL()
     {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleResourceChangeL aType: %d"), aType ) );
-    CAknAppUi::HandleResourceChangeL(aType);
+    TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL") ) );
+    TBool showNote( ETrue );
 
-    if ( aType == KEikDynamicLayoutVariantSwitch )
+    TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) );
+    TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL: swState: %d"), swState ) );
+
+    if( UiReady() || swState == ESwStateSecurityCheck )
         {
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
-        iSysApShutdownImage->SetRect( ApplicationRect() );
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-        TInt mode;
-        User::LeaveIfError( RProperty::Get( KPSUidStartup, KPSGlobalStartupMode, mode ) );
-
-        if ( mode == EStartupModeAlarm )
+        if ( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) ==  EPSCTsyCallStateRinging )
+            {
+            showNote = EFalse;
+            }
+        TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL KCTsyCallState=%d"), StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) ) );
+        if ( showNote ) // Power Mgmt UI spec defines that no Charging note is shown while the phone is ringing/alerting
             {
-            SetStatusPaneLayoutL( ESysApAlarm );
+            /* 
+            TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
+            _LIT(KChargingNote,"txt_power_management_dblist_charging");
+            HBufC* chargingNote = HbTextResolverSymbian::LoadL(KChargingNote);
+            CHbDeviceNotificationDialogSymbian::NotificationL(KNullDesC,*chargingNote);     
+            */
+             
+            _LIT(KChargingNote,"Charging");
+            HBufC* aString = HBufC16::NewLC(50);
+            TPtrC aStringPointer = aString->Des();
+            aStringPointer.Set(KChargingNote);
+            TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );   
+            ShowExampleUiNoteL( aStringPointer );
+            CleanupStack::PopAndDestroy(); // aString            
             }
         }
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetMemoryCardIndicatorL
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::SetMemoryCardIndicatorL()
-    {
-    if ( iSysApFeatureManager->Supported( KSysApFeatureIdMemoryCardIcon ) )
-        {
-#ifndef RD_MULTIPLE_DRIVE
-        TSysApMemoryCardStatus memoryCardStatus = iSysApMMCObserver->MemoryCardStatus();
-
-        TRACES( RDebug::Print( _L("CSysApAppUi::SetMemoryCardIndicatorL: memoryCardStatus=%d"), memoryCardStatus ) );
-
-        if ( memoryCardStatus == ESysApMemoryCardInserted || memoryCardStatus == ESysApMemoryCardLocked )
-#else // RD_MULTIPLE_DRIVE
-        TInt insertedCount( CSysApDriveList::NonUsbDriveCount( iInsertedMemoryCards ) );
-
-        TRACES( RDebug::Print( _L("CSysApAppUi::SetMemoryCardIndicatorL: insertedCount=%d"), insertedCount ) );
-
-        if ( insertedCount > 0 )
-#endif // RD_MULTIPLE_DRIVE
-            {
-            SetIndicatorStateL( EAknIndicatorMemoryCard, EAknIndicatorStateOn );
-            }
-        else
-            {
-            SetIndicatorStateL( EAknIndicatorMemoryCard, EAknIndicatorStateOff );
-            }
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SysApFeatureManager
-// ----------------------------------------------------------------------------
-
-CSysApFeatureManager& CSysApAppUi::SysApFeatureManager()
-    {
-    __ASSERT_DEBUG( iSysApFeatureManager, User::Panic( _L("iSysApFeatureManager == NULL"), KErrBadHandle ) );
-
-    return *iSysApFeatureManager;
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetUsbAttachStatus
-// ----------------------------------------------------------------------------
-#ifndef RD_MULTIPLE_DRIVE
-void CSysApAppUi::SetUsbAttachStatus( const TBool aUsbAttached )
-    {
-    // Prevent double beep when USB file transfer gets activated but
-    // allow MMC inserted beep when:
-    // a) USB file transfer is active
-    // b) MMC is not inserted when USB cable is attached
-    iHideNextBeep = ( iMMCInserted && aUsbAttached );
-    }
-#else // RD_MULTIPLE_DRIVE
-void CSysApAppUi::SetUsbAttachStatus( const TBool aUsbAttached )
-    {
-    TRACES( RDebug::Print(
-        _L( "CSysApAppUi::SetUsbAttachStatus: aUsbAttached: %d" ),
-        aUsbAttached ) );
-
-    if ( aUsbAttached )
-        {
-        // For ignoring extra beeps caused by USB file transfer
-        iSysApDriveList->ResetDrivesInsertBeepIgnored();
-        iSysApDriveList->MarkDrivesInsertBeepIgnored( iInsertedMemoryCards );
-        }
-    }
-#endif // RD_MULTIPLE_DRIVE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::IhfEnabledL
-// ----------------------------------------------------------------------------
-
-TBool CSysApAppUi::IhfEnabledL()
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::IhfEnabledL(): iSysApAudioRoutingObserver=0x%x"), iSysApAudioRoutingObserver ) );
-
-    if ( !iSysApAudioRoutingObserver ) // create observer if needed
-        {
-        iSysApAudioRoutingObserver = CSysApAudioRoutingObserver::NewL( *this );
-        }
-
-    return iSysApAudioRoutingObserver->IhfEnabled();
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::IsDeviceModeKey
-// ----------------------------------------------------------------------------
-
-TBool CSysApAppUi::IsDeviceModeKey( const TKeyEvent& aKeyEvent ) const
-    {
-    return CSysApDefaultKeyHandler::IsDeviceModeKey( aKeyEvent );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ResourcesFreed
-// ----------------------------------------------------------------------------
-
-TBool CSysApAppUi::ResourcesFreed() const
-    {
-    return iResourcesFreed;
-    }
-
-/* 
-----------------------------------------------------------------------------
-CSysApAppUi::IsEncryptionOperationOngoingL()
-Introduced the code as a part of Sub : 405-3362 - Power Management SUB for ES 
-recapture functionalities in platform which support multidrive as well. 
--------------------------------------------------------------------------------
-*/
-TBool CSysApAppUi::IsEncryptionOperationOngoingL() const
-    {
-		TBool deFeatureSupported(EFalse);
-		FeatureManager::InitializeLibL();
-		deFeatureSupported = FeatureManager::FeatureSupported( KFeatureIdFfDeviceEncryptionFeature);
-		FeatureManager::UnInitializeLib();
-
-		if(deFeatureSupported)
-			{         
-			/**
-			 * Store the last memory status changed
-			 * 0: Idle. It can be Encrypted or Decrypted
-			 * 1: Encrypting
-			 * 2: Decrypting
-			 **/
-			 
-			RProperty deProperty;
-			User::LeaveIfError(deProperty.Attach(KDevEncProtectedUid, KDevEncOperationKey,EOwnerThread));
-			TInt deValue = 0;
-			if((deProperty.Get(deValue)== KErrNone)&&( deValue == EOpEncrypting || deValue == EOpDecrypting))
-				{
-				deProperty.Close();
-				return ETrue;
-				}
-			else
-				{
-				deProperty.Close();
-				return EFalse;
-				}
-			}
-		else
-			{
-			return EFalse;
-			}
-    }
-// ----------------------------------------------------------------------------
-// CSysApAppUi::EtelConnector
-// ----------------------------------------------------------------------------
-
-CSysApEtelConnector* CSysApAppUi::EtelConnector() const
-    {
-    return iSysApEtelConnector;
-    }
-
-#ifndef RD_MULTIPLE_DRIVE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::EjectUsed
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::EjectUsed( TInt /*aDrive*/ )
-    {
-    }
-
-#else // RD_MULTIPLE_DRIVE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowEjectWaitNoteL
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ShowEjectWaitNoteL( TInt aDriveToEject )
-    {
-    if ( iSysApWaitNote )
-        {
-        return;
-        }
-    HBufC* text = iSysApDriveList->GetFormattedDriveNameLC(
-        aDriveToEject,
-        0, // Not used
-        R_QTN_EJECTING_MEMORY_NAME_WAIT );
-    iSysApWaitNote = CSysApWaitNote::NewL(
-        iSysApFeatureManager->CoverDisplaySupported() );
-    iSysApWaitNote->ShowNoteL( EClosingApplicationsNote, text );
-    CleanupStack::PopAndDestroy( text );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::IsEjectQueryVisible
-// ----------------------------------------------------------------------------
-
-TBool CSysApAppUi::IsEjectQueryVisible()
-    {
-    if ( !iSysApConfirmationQuery )
-        {
-        return EFalse;
-        }
-    TInt queryId( iSysApConfirmationQuery->CurrentQuery() );
-    return ( queryId == ESysApEjectMmcQuery || queryId == ESysApRemoveMmcNote );
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::UpdateInsertedMemoryCardsL
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::UpdateInsertedMemoryCardsL()
-    {
-    // Update inserted memory cards
-    iSysApDriveList->GetMemoryCardsL(
-        iInsertedMemoryCards, CSysApDriveList::EIncludeInserted );
-
-    // Update memory card indicator status
-    SetMemoryCardIndicatorL();
-
-    // Handle unlock
-    RunUnlockNotifierL();
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::EjectUsed
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::EjectUsed( TInt aDrive )
-    {
-    // Check drive inserted before starting eject confirm query
-    TInt insertedIndex( CSysApDriveList::Find( iInsertedMemoryCards, aDrive ) );
-
-    TRACES( RDebug::Print(
-        _L( "CSysApAppUi::EjectUsed: drive: %d, index: %d" ),
-        aDrive, insertedIndex ) );
-
-    if ( insertedIndex == KErrNotFound )
-        {
-        return;
-        }
-
-    iMMCEjectUsed = ETrue;
-    iDriveToEject = aDrive;
-    iSysApDriveList->ResetDrivesToEject();
-    TRAPD( err, EjectMMCL() );
-    if ( err != KErrNone )
-        {
-        TRACES( RDebug::Print(
-            _L( "CSysApAppUi::EjectUsed: err: %d" ), err ) );
-        iMMCEjectUsed = EFalse;
-        }
-    }
-
-#endif // RD_MULTIPLE_DRIVE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::EjectMMCCanceled
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::EjectMMCCanceled()
-    {
-    // Called from eject confirm query, reset eject status
-#ifdef RD_MULTIPLE_DRIVE
-    iMMCEjectUsed = EFalse;
-#endif // RD_MULTIPLE_DRIVE
-    }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::UsbChargerDetector
-// ----------------------------------------------------------------------------
-//
-TSysApUsbChargerDetector& CSysApAppUi::UsbChargerDetector()
-    {
-    return iSysApUsbChargerDetector;
-    }
 
 // ----------------------------------------------------------------------------
 // CSysApAppUi::HandleUsbCharger
@@ -6527,36 +2227,252 @@
     }
 
 // ----------------------------------------------------------------------------
-// CSysApAppUi::SetEnvelopeIndicatorL
+// CSysApAppUi::HandleCurrentCallStateChangeL()
 // ----------------------------------------------------------------------------
-//
-void CSysApAppUi::SetEnvelopeIndicatorL()
+
+void CSysApAppUi::HandleCurrentCallStateChangeL( TInt aCurrentCallState )
     {
-    TInt phoneStoreStatus( StateOfProperty( KUidPSSMSStackCategory, KUidPSSMSStackDiskSpaceMonitorKey ) );
-    TInt inboxStatus( StateOfProperty( KUidSystemCategory, KUidInboxStatusValue ) );
-    TBool simStoreFull( iSysApEtelConnector && iSysApEtelConnector->IsSimSmsStoreFull() );
+    TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: KUidCurrentCall: %d" ), aCurrentCallState ) );
+
+    switch ( aCurrentCallState )
+        {
+        case EPSCTsyCallStateRinging:
+            {
+            iSysApLightsController->CallComingInL( ETrue );
+            // Disable keylock when a call is coming in
+            if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCradle || iKeyLockOnBeforeAlarm )
+                {
+                TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateRinging: disable keylock") ) );
+                iKeyLockOnBeforeCall = ETrue;
+
+                if ( iKeyLockEnabled || iDeviceLockEnabled )
+                    {
+                    if ( !iSysApFeatureManager->TouchUnlockStrokeSupported() )
+                        {
+                        iKeyguardController->DisableKeyguard(EFalse);
+                        }
+                    }
+                }
+            break;
+            }
+            
+        case EPSCTsyCallStateDialling:
+            {
+            // Disable keypad lock during an emergency call
+            // no need to disable the key lock when a call is made using the wireless car-kit
+            // but if the call is an emergency one then we will disable the keypad lock
+            if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCradle )
+                {
+                TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateDialling: disable keylock") ) );
+                iKeyLockOnBeforeCall = ETrue;
+
+                if ( IsEmergencyCall() && (iKeyLockEnabled || iDeviceLockEnabled ))
+                    {
+                    iKeyguardController->DisableKeyguard(EFalse);
+                    }
+                }
+
+            // Enable signal & network indicators when an emergency call is made in Offline Mode
+            if( iSysApOfflineModeController->OfflineModeActive() )
+                    {
+                    // Signal indicators not updated with VoIP call
+                    if ( StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) != EPSCTsyCallTypeVoIP) 
+                        {
+                        iEmergencyCallActive = ETrue;
+                        // not supporting this
+                        // UpdateSignalBarsL();
+                        // SetSignalIndicatorL();
+                        }
+                    }
+            break;
+            }
+            
+        case EPSCTsyCallStateConnected:
+            {
+            if (StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) == EPSCTsyCallTypeCSVoice)
+                {
+                // Check if GPRS suspended note is required
+                iCallActivated = ETrue;
+                // not supporting this
+                // HandleGprsNotesL();
+                }
+            if ( iDeviceLockEnabled )
+                {
+                // Enable keylock via autolock emulation if device lock enabled. 
+                // Otherwise e.g. messages can be read using softkeys during ongoing call.
+                iKeyguardController->EnableKeyguard(EFalse);
+                }
+            break;
+            }
+
+        case EPSCTsyCallStateNone:
+            {
+            // Reset timers in ScreenSaver and Autolock
+            User::ResetInactivityTime();
 
-    TRACES( RDebug::Print(
-        _L("CSysApAppUi::SetEnvelopeIndicatorL() phoneStoreStatus %d, simStoreFull %d, inboxStatus %d"),
-        phoneStoreStatus, simStoreFull, inboxStatus ) );
+            if ( iEmergencyCallActive )
+                {
+                iEmergencyCallActive = EFalse;
+                // not supporting this
+                // UpdateSignalBarsL( 0 );
+                // SetSignalIndicatorL();
+                }
+            if ( iKeyLockOnBeforeCall )
+                {
+                TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateNone: enable keylock") ) );
+                iKeyLockOnBeforeCall = EFalse;
+                if ( !iDeviceLockEnabled )
+                    {
+                    if ( !iKeyLockOnBeforeCradle && !iKeyLockOnBeforeAlarm &&
+                          !iSysApFeatureManager->TouchUnlockStrokeSupported() )
+                        {
+                        if ( iSysApCenRepController->GetInt( KCRUidCommonTelephonySettings, KSettingsSummaryAfterCall ) == 1 )
+                            {
+                            // Let's not hide "Summary After Call" dialog
+                            iKeyguardController->EnableKeyguard(EFalse);
+                            }
+                        else
+                            {
+                            iKeyguardController->EnableKeyguard(ETrue);
+                            }
+                        }
+                    }
+                else
+                    {
+                    iKeyguardController->EnableKeyguard(EFalse);
+                    }
+                }
+            if ( iShowkeypadActivatedNoteAfterSoftReject )
+                {
+                ShowUiNoteL( EKeypadActiveNote );
+                iShowkeypadActivatedNoteAfterSoftReject = EFalse;
+                }
+            iCallActivated = EFalse;
+            break;
+            }
+            
+        default:
+            break;
+        }
 
-    if ( phoneStoreStatus == ESmsDiskSpaceFull || simStoreFull )
+    if ( aCurrentCallState != EPSCTsyCallStateRinging )
         {
-        // Blink the Envelope indicator
-        SetIndicatorStateL( EAknIndicatorEnvelope, EAknIndicatorStateAnimate );
+        iSysApLightsController->CallComingInL( EFalse );
         }
-    else if ( inboxStatus == ESADocumentsInInbox )
+
+    SetIhfIndicatorL();
+    SetHacIndicatorL();
+    }
+
+
+
+/**
+ * To check the for an emergency call. 
+ * 
+ * @return ETrue if there is an emergency call active otherwise, EFalse.
+ */
+TBool CSysApAppUi::IsEmergencyCall()
         {
-        // Show the Envelope indicator.
-        SetIndicatorStateL( EAknIndicatorEnvelope, EAknIndicatorStateOn );
+        TBool retVal( EFalse );
+        TInt err( KErrNone );
+        TInt state( 0 );
+     
+        err = RProperty::Get(KPSUidCtsyEmergencyCallInfo, KCTSYEmergencyCallInfo, state );
+        if ( err == KErrNone && state )
+            {
+            retVal = ETrue;            
+            }
+        return retVal;
+        }
+
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::IsStateNormal()
+//
+// ----------------------------------------------------------------------------
+TBool CSysApAppUi::IsStateNormal() const
+    {
+    TInt state;
+    TInt errorCode =
+        RProperty::Get( KPSUidStartup, KPSGlobalSystemState, state );
+    if ( errorCode == KErrNone )
+        {
+        return state == ESwStateNormalRfOn ||
+               state == ESwStateNormalRfOff ||
+               state == ESwStateNormalBTSap;
         }
     else
         {
-        // Hide the Envelope indicator.
-        SetIndicatorStateL( EAknIndicatorEnvelope, EAknIndicatorStateOff );
+        TRACES( RDebug::Print( _L( "CSysApAppUi::IsStateNormal: Failed to read global system state, error code %d." ), errorCode ) );
+        return EFalse;
         }
     }
-    
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleAccessoryProfileInStartupL()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::HandleAccessoryProfileInStartupL()
+    {
+    TRACES( RDebug::Print( _L( "CSysApAppUi::HandleAccessoryProfileInStartupL" ) ) );
+
+    if ( !iSysApOfflineModeController->OfflineModeActive() )
+        {
+        iIgnoreAccessorySpecificProfileChanges = EFalse;
+        TBool accessoryConnectedInShutdown( EFalse );
+        TInt accessoryTemp( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected ) );
+        if ( accessoryTemp == 1 )
+            {
+            accessoryConnectedInShutdown = ETrue;
+            }
+
+        TBool accessoryConnectedNow ( EFalse );
+
+        TAccMode accessoryState(EAccModeHandPortable);
+        if ( iSysApAccessoryObserver )
+            {
+            accessoryState = iSysApAccessoryObserver->GetAccessoryMode();
+            }
+
+        if ( accessoryState != EAccModeHandPortable )
+            {
+            accessoryConnectedNow = ETrue;
+            }
+        TRACES( RDebug::Print( _L( "CSysApAppUi::HandleAccessoryProfileInStartupL: accessoryConnectedInShutdown: %d, accessoryConnectedNow: %d" ),
+                              accessoryConnectedInShutdown, accessoryConnectedNow ) );
+
+        if ( accessoryConnectedInShutdown && !accessoryConnectedNow )
+            {
+            HandleAccessoryDisconnectedL();
+            }
+        else if ( !accessoryConnectedInShutdown && accessoryConnectedNow )
+            {
+            HandleAccessoryConnectedL( accessoryState );
+            }
+        else if ( !accessoryConnectedNow )
+            {
+            // not supporting this 
+            // TInt activeProfile ( ActiveProfileId() );
+            // SysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApActiveProfileBeforeAccessoryConnected, activeProfile );
+            }
+        }
+    }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::CenRepController()
+// ----------------------------------------------------------------------------
+
+CSysApCenRepController& CSysApAppUi::CenRepController()
+    {
+    __ASSERT_ALWAYS( iSysApCenRepController, User::Panic( _L("CSysApAppUi::CenRepController"), KErrBadHandle ) );
+
+    return *iSysApCenRepController;
+    }
+
+
 // ----------------------------------------------------------------------------
 // CSysApAppUi::LogsObserverL
 // ----------------------------------------------------------------------------
@@ -6573,192 +2489,249 @@
     
     return *iSysApCenRepLogsObserver;
     }
-    
+
+
 // ----------------------------------------------------------------------------
-// CSysApAppUi::NotifyPowerSaveModeL
+// CSysApAppUi::HandleWlanIndicator()
 // ----------------------------------------------------------------------------
-//
-void CSysApAppUi::NotifyPowerSaveModeL( TSysApPsmStatus aStatus )
+void CSysApAppUi::HandleWlanIndicatorL( TInt aValue )
     {
-    TRACES( RDebug::Print( _L("CSysApAppUi::NotifyPowerSaveModeL aStatus: %d"), aStatus ) );
-
-    // cancel any active power saving query because user has changed the state manually
-    CancelQuery( ESysApBattChargingPowerSavingQuery );
-    CancelQuery( ESysApBattLowPowerSavingQuery );
-    
-    switch ( aStatus )
+    if ( aValue == EPSWlanIndicatorAvailable )
+        {
+        // do nothing
+        }
+    else if ( aValue == EPSWlanIndicatorActive )
+        {
+        // do nothing
+        }
+    else if ( aValue == EPSWlanIndicatorActiveSecure )
+        {
+        // do nothing
+        }
+    else // No indication required
         {
-        case MSysApPsmControllerNotifyCallback::EPsmActivationComplete:
-            UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
-            ShowUiNoteL( EPowerSaveModeActivated );
-            break;
-        
-        case MSysApPsmControllerNotifyCallback::EPsmDeactivationComplete:
-            UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
-            ShowUiNoteL( EPowerSaveModeDeactivated );
-            break;
-            
-        case MSysApPsmControllerNotifyCallback::EPsmActivationFailed:
-            ShowUiNoteL( ECannotActivatePowerSaveMode );
-            break;
-            
-        case MSysApPsmControllerNotifyCallback::EPsmDeactivationFailed:
-            ShowUiNoteL( ECannotDeactivatePowerSaveMode );
-            break;            
-        
-        default:
-            break;   
+        // do nothing
+        }
+    }
+
+void CSysApAppUi::ShowNotificationDialog(const TDesC& noteText)const
+{
+    //Todo:4.Notification--Just Popup message
+    //Todo: #include <HbDeviceNotificationDialogSymbian.h>
+    CHbDeviceNotificationDialogSymbian *notificationDialog =  CHbDeviceNotificationDialogSymbian::NewL();
+    CleanupStack::PushL(notificationDialog);
+    notificationDialog->SetTextL(noteText);//noteText with Qm file input
+    notificationDialog->SetTimeout(100);
+    notificationDialog->ShowL();
+    CleanupStack::PopAndDestroy(notificationDialog);
+}
+
+void CSysApAppUi::SetKeyLockEnabledL()
+    {
+    iKeyLockEnabled = ETrue;
+    iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive, 1 );
+    // not supporting indicator 
+//    SetIndicatorStateL( EAknIndicatorKeyguard, EAknIndicatorStateOn );
+    iSysApLightsController->KeylockStateChangedL( ETrue );
+    }
+
+void CSysApAppUi::SetKeyLockDisabledL()
+    {
+    iKeyLockEnabled = EFalse;
+    iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive, 0 );
+    // SetIndicatorStateL( EAknIndicatorKeyguard, EAknIndicatorStateOff );
+    if (! iDeviceLockEnabled )
+        {
+        iSysApLightsController->KeylockStateChangedL( EFalse );
+        if ( iSysApFeatureManager->MmcHotSwapSupported() )
+            {
+            if ( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) !=  EPSCTsyCallStateRinging && StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) !=  EPSCTsyCallStateAlerting )
+                {
+                // RunUnlockNotifierL();
+                // need to handle MMC unlock query in next sub
+                }
+            }
         }
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleBatteryStatusL
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::HandleBatteryStatusL( const TInt aValue )
+void CSysApAppUi::SetLightsOnUnlockNoteL()
+    {
+    iSysApLightsController->SetLightsOnUnlockNoteL();
+    }
+
+void CSysApAppUi::SetLightsOnEcsQueryL()
     {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleBatteryStatusL aValue: %d"), aValue ) );
-    
-    if ( aValue == EBatteryStatusEmpty )
-        {
-        //Display Recharge Battery note
-        ShowUiNoteL( ERechargeBatteryNote );
-        BatteryEmptyL();
-        }
-    else if ( aValue == EBatteryStatusLow )
-        {
-        if ( iSysApPsmController && UiReady() )
-            {
-            iSysApPsmController->BatteryLow( ETrue );
-            
-            if ( iSysApPsmController->ShowActivateQuery())
-                {
-                // show activation query, replaces the first battery low query
-                ShowQueryL( ESysApBattLowPowerSavingQuery );
-                }
-            else // default low warning note must be shown
-                {
-                // activate partial power save mode on first low warning
-                iSysApPsmController->DoEnablePartialPsm( ETrue ); // activated on first warning note
-                //Display Battery Low note.
-                ShowUiNoteL( EBatteryLowNote );    
-                }                
-            }
-        else
-            {
-            //Display Battery Low note.
-            ShowUiNoteL( EBatteryLowNote );    
-            }            
-        }
-    
-    if ( iSysApBatteryInfoController )
-        {
-        iSysApBatteryInfoController->BatteryStatusUpdated( aValue );
-        }
-            
+    iSysApLightsController->SetLightsOnEcsQueryL();
+    }
+
+void CSysApAppUi::SetLightsOnSecurityQueryL()
+    {
+    iSysApLightsController->SetLightsOnSecurityQueryL();
+    }
+
+TBool CSysApAppUi::CheckLongPowerKeyPressed()
+    {
+    return iCheckLongPowerKeyEvent;
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleChargingStatusL
+
 // ----------------------------------------------------------------------------
-//
-void CSysApAppUi::HandleChargingStatusL( const TInt aValue )
+// CSysApAppUi::HandleKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType )
+// ----------------------------------------------------------------------------
+
+TKeyResponse CSysApAppUi::HandleKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType )
     {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleChargingStatusL aValue: %d"), aValue ) );
-    
-    TBool showNote( ETrue );
-    
-    UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
-
-    if ( iSysApPsmController && UiReady() ) 
+    if ( ! iShutdownStarted )
         {
-        if ( iCharging ) // iCharging updated in UpdateBatteryBarsL
+        TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL: aKeyEvent.iCode:%d, aKeyEvent.iScanCode:%d, aType:%d, iIgnoreNextPowerKeyUpEvent:%d, iPowerKeyPopupMenuActive:%d, iLastPowerKeyWasShort:%d, iPowerKeyPopupMenuDismissed:%d"),
+                               aKeyEvent.iCode, aKeyEvent.iScanCode, aType, iIgnoreNextPowerKeyUpEvent, iPowerKeyPopupMenuActive, iLastPowerKeyWasShort, iPowerKeyPopupMenuDismissed ) );
+
+#ifdef _DEBUG
+        // camery latency measurement environment instrumentation, don't remove
+        if ( aType == EEventKey && aKeyEvent.iCode == EKeyCamera )
             {
-            // cancel activation query if charger is connected while query is on display
-            CancelQuery( ESysApBattLowPowerSavingQuery );
+            TRACES( RDebug::Print( _L("e_KEY_EVENT_SENDING 0") ) );
             }
-             
-        if ( iCharging && !iSysApPsmController->ChargerConnected() ) // first time after charger connection
+#endif // _DEBUG
+
+        TKeyResponse response(EKeyWasNotConsumed);
+        if (response)
+            {
+            //Do nothing:: To supress warning
+            }
+        if (iSysApKeyManagement && aKeyEvent.iCode != EKeyPowerOff && aKeyEvent.iCode != 'E')
+            {
+            response = iSysApKeyManagement->HandleKeyEventL(aKeyEvent, aType );
+            }
+        
+        if( aType == EEventKey )
             {
-            iSysApPsmController->ConnectCharger( ETrue );
-            
-            if ( iSysApPsmController->ShowDeactivateQuery() )
-                {
-                ShowQueryL( ESysApBattChargingPowerSavingQuery );
-                // Query is on the display. Don't show the note.
-                showNote = EFalse;               
-                }
-            else
+            switch ( aKeyEvent.iCode )
                 {
-                iSysApPsmController->DoEnablePartialPsm( EFalse );
-                }                
+#ifdef _DEBUG
+                case 'E': //For testing
+                    Exit();
+                    break;
+#endif
+                case EKeyPowerOff:
+                    //Short power key press
+                    iKeyBoardRepeatCount++;
+                    if( aKeyEvent.iRepeats == 0 )
+                        {
+                        TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, Short powerkey") ) );
+                        iLastPowerKeyWasShort = ETrue;
+                        TRACES( RDebug::Print( _L("CSysApAppUi::Key was consumed by pressing short power") ) );          
+                        //Powermenu
+                        if (iPowerMenuDialog != NULL)
+                            {
+                            //PowerMenu already exist
+                            delete iPowerMenuDialog;
+                            iPowerMenuDialog = NULL;
+                            } 
+                            
+                        iPowerMenuDialog = CHbDevicePowerMenuSymbian::NewL(*this);
+                        iPowerMenuDialog->ShowL();                        
+                        iIgnoreNextPowerKeyRepeats = EFalse;
+                        }
+                    //Long power key press
+                    else if( aKeyEvent.iRepeats > 0 && iKeyBoardRepeatCount >= iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApPowerkeyRepeatcount ))
+                        {
+                        iKeyBoardRepeatCount = -1;
+                        TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, Long powerkey") ) );
+                        iLastPowerKeyWasShort = EFalse;
+                        HandleLongPowerKeyPressedL();
+                        }
+                    break;
+
+                default:
+                    {
+                    TKeyResponse response = EKeyWasNotConsumed;
+                    if (iSysApKeyManagement)
+                        {
+                        response = iSysApKeyManagement->HandleKeyEventL(aKeyEvent, aType );
+                        }
+
+                    if ( response == EKeyWasNotConsumed ) // none of the plugins consumed the key, offer it to default handling
+                        {
+                        iSysApDefaultKeyHandler->HandleKeyEventL( aKeyEvent, aType );
+                        }
+                    }
+                    break;
+                }
             }
-        else if ( aValue == EChargingStatusNotConnected )
+        else if( aType == EEventKeyUp )
             {
-            iSysApPsmController->ConnectCharger( EFalse );
-            
-            // cancel deactivation query if charger is disconnected while query is on display 
-            CancelQuery( ESysApBattChargingPowerSavingQuery );
-            }            
+            if( aKeyEvent.iScanCode == EStdKeyDevice2 )
+                {
+                if ( iIgnoreNextPowerKeyUpEvent )
+                    {
+                    if ( !iPowerKeyPopupMenuDismissed ) // If the popup menu has been dismissed, do nothing
+                        {
+                        iPowerKeyPopupMenuActive = ETrue;
+                        iIgnoreNextPowerKeyUpEvent = EFalse;
+                        }
+                    }
+                else if( iLastPowerKeyWasShort )
+                    {
+                    if ( iPowerKeyPopupMenuActive )
+                        {
+                        }
+                    }
+
+                }
+            }
+
+        TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL:ended, aKeyEvent.iCode:%d, aKeyEvent.iScanCode:%d, aType:%d, iIgnoreNextPowerKeyUpEvent:%d, iPowerKeyPopupMenuActive:%d, iLastPowerKeyWasShort:%d, iPowerKeyPopupMenuDismissed:%d"),
+                               aKeyEvent.iCode, aKeyEvent.iScanCode, aType, iIgnoreNextPowerKeyUpEvent, iPowerKeyPopupMenuActive, iLastPowerKeyWasShort, iPowerKeyPopupMenuDismissed ) );
         }
-    if( showNote )
+    else // shutdown started
         {
-        HandleChargerNotesL( aValue );    
+        TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL: aKeyEvent.iCode:%d, aKeyEvent.iScanCode:%d, aType:%d"),
+                               aKeyEvent.iCode, aKeyEvent.iScanCode, aType ) );
+
+        // When shutdown has been started, only device mode key events are passed to plug-in framework
+        // This for enabling plug-in activities during shutdown animation
+        if ( IsDeviceModeKey( aKeyEvent ) ) // Other key events are not passed, because they must cancel the shutdown animation as stated in UI spefication
+            {
+            if ( aType == EEventKey && iSysApKeyManagement )
+                {
+                iSysApKeyManagement->HandleKeyEventL( aKeyEvent, aType );
+                }
+            }
+        TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL: ended") ) );
+        }
+    return EKeyWasConsumed;
+    }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleCommandL( TInt aCommand)
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::HandleCommandL( TInt aCommand )
+    {
+    TRACES( RDebug::Print( _L("CSysApAppUi::HandleCommandL aCommend: %d"), aCommand ) );
+    switch ( aCommand )
+        {
+        case EEikCmdExit:   // EAknCmdExit
+            Exit();
+            break;
+        default:
+            break;
         }
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleActivatePsmQueryResponse
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::HandleActivatePsmQueryResponse( TBool aEnable )
+TBool CSysApAppUi::ReleasePowerMenuCustomDialogMemory()
     {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleActivatePsmQueryResponse aEnable: %d"), 
-        aEnable ) );
-    
-    __ASSERT_DEBUG( iSysApPsmController, User::Invariant() );
-    
-    if ( aEnable )
+    if (iPowerMenuDialog!=NULL)
         {
-        iSysApPsmController->DoEnableFullPsm( ETrue );    
+        //PowerMenu already exist
+        delete iPowerMenuDialog;
+        iPowerMenuDialog = NULL;
+        return ETrue;
         }
-    else
-        {
-        iSysApPsmController->DoEnablePartialPsm( ETrue );     
-        }        
+    return EFalse;
     }
 
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleDeactivatePsmQueryResponse
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::HandleDeactivatePsmQueryResponse( TBool aDisable )
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::HandleDeactivatePsmQueryResponse aDisable: %d"), 
-        aDisable ) );
 
-    __ASSERT_DEBUG( iSysApPsmController, User::Invariant() );
-    
-    if ( aDisable )
-        {
-        iSysApPsmController->DoEnableFullPsm( EFalse );        
-        }
-    }
-    
-// ----------------------------------------------------------------------------
-// CSysApAppUi::CancelQuery
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::CancelQuery( TSysApConfirmationQueryIds aQueryId )
-    {
-    TRACES( RDebug::Print( _L("CSysApAppUi::CancelQuery aQueryId: %d"), aQueryId ) );
-
-    if ( iSysApConfirmationQuery )
-        {
-        if ( aQueryId == iSysApConfirmationQuery->CurrentQuery() || aQueryId == ESysApNoQuery )
-            {
-            iSysApConfirmationQuery->Cancel();
-            }
-        }
-    }
-// End of File
+//end of file
--- a/coreapplicationuis/SysAp/Src/SysApDocument.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApDocument.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -31,7 +31,26 @@
 CSysApDocument::~CSysApDocument()
     {
     }
+/*
+// ---------------------------------------------------------
+// CSysApDocument::ConstructL()
+// ---------------------------------------------------------
+void CSysApDocument::ConstructL()
+    {
+    }
 
+// ---------------------------------------------------------
+// CSysApDocument::NewL()
+// ---------------------------------------------------------
+CSysApDocument* CSysApDocument::NewL(CEikApplication& aApp)     // CSysApp reference
+    {
+    CSysApDocument* self = new (ELeave) CSysApDocument(aApp);
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    CleanupStack::Pop(); // self
+    return self;
+    }
+*/
 // ----------------------------------------------------------------------------
 // CSysApDocument::CreateAppUiL()
 // constructs CSysApUi
@@ -46,7 +65,7 @@
 // ----------------------------------------------------------------------------
 void CSysApDocument::UpdateTaskNameL( CApaWindowGroupName* aWgName )
 	{
-	CAknDocument::UpdateTaskNameL( aWgName );
+	CEikDocument::UpdateTaskNameL( aWgName );
 	aWgName->SetHidden( ETrue );
 	}
 
--- a/coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -94,9 +94,9 @@
     TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: No power key supported=%d"), iNoPowerKeySupported ) );
     
 //    iFmTxSupported = FeatureManager::FeatureSupported( KFeatureIdFmtx );
- //   TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: FM TX supported=%d"), iFmTxSupported ) );
+//    TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: FM TX supported=%d"), iFmTxSupported ) );
 
-    iPenEnabled = AknLayoutUtils::PenEnabled();
+//    iPenEnabled = AknLayoutUtils::PenEnabled();
     TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: Pen enabled=%d"), iPenEnabled ) );
     
     iVmbxCallDivertIconSupported = FeatureManager::FeatureSupported( KFeatureIdVmbxCallDivertIcon );
@@ -180,11 +180,11 @@
                                                iGripNotSupported( ETrue ),
                                                iPowerSaveSupported( EFalse ),
                                                iNoPowerKeySupported( EFalse ),
-//                                               iFmTxSupported( EFalse ),
+                                               //iFmTxSupported( EFalse ),
                                                iPenEnabled( EFalse ),
                                                iVmbxCallDivertIconSupported( EFalse ),
                                                iTouchUnlockStrokeSupported( EFalse )
-//                                               iFmTxRdsTextSupported( EFalse )
+                                               //iFmTxRdsTextSupported( EFalse )
 
     {
     }
@@ -379,6 +379,7 @@
     return iFmTxSupported;
     }
 */
+
 // ----------------------------------------------------------------------------
 // CSysApFeatureManager::PenEnabled()
 // ----------------------------------------------------------------------------
--- a/coreapplicationuis/SysAp/Src/SysApLightsController.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApLightsController.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -150,7 +150,7 @@
 
     TBool blinkEnabled = ETrue; 
                 
-    if( iSysApFeatureManager->Supported( KSysApFeatureIdNoFlasUiInSilentMode ) ) 
+    if( iSysApFeatureManager->Supported( KSysApFeatureIdNoFlasUiInSilentMode )) 
         {
         blinkEnabled = EFalse;
         }
--- a/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -38,6 +38,7 @@
 #include "sysapremconobserver.h"
 #include <lbs/locationfwdomainpskeys.h>
 #include <smsuaddr.h>
+#include <avkondomainpskeys.h>
 
 #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
   #include <ASShdAlarm.h>
@@ -47,11 +48,13 @@
   #include <asshdalarm.h>
 #endif //SYMBIAN_ENABLE_SPLIT_HEADERS
 
-
 // CONSTANTS
 const TUint KCoreAppUIsMmcRemovedWithoutEjectCmdMask = 0xFFFF;
 const TUint KCoreAppUIsMmcRemovedWithoutEjectValShift = 16;
 
+const TUid KPSUidSecurityUIs = { 0x100059b5 };
+const TUint32 KSecurityUIsLights  = 0x00000308;
+
 // ============================ MEMBER FUNCTIONS ==============================
 
 // ----------------------------------------------------------------------------
@@ -93,10 +96,10 @@
     iOutboxStatusSubscriber->Subscribe();
     iIrdaStatusSubscriber = CSysApSubscriber::NewL( *this, KIrdaPropertyCategory, KIrdaStatus );
     iIrdaStatusSubscriber->Subscribe();
-    iGprsStatusSubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, KPSUidGprsStatusValue );
-    iGprsStatusSubscriber->Subscribe();
-    iWcdmaStatusSubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, KPSUidWcdmaStatusValue ); 
-    iWcdmaStatusSubscriber->Subscribe();
+//    iGprsStatusSubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, KPSUidGprsStatusValue );
+//    iGprsStatusSubscriber->Subscribe();
+//    iWcdmaStatusSubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, KPSUidWcdmaStatusValue ); 
+//    iWcdmaStatusSubscriber->Subscribe();
     iLocationGlobalPrivacySubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, KPSUidLocationGlobalPrivacyValue );
     iLocationGlobalPrivacySubscriber->Subscribe();
     iRestoreBackupSubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, conn::KUidBackupRestoreKey );
@@ -185,6 +188,15 @@
 
     iSmsPhoneStoreSubscriber = CSysApSubscriber::NewL( *this, KUidPSSMSStackCategory, KUidPSSMSStackDiskSpaceMonitorKey );
     iSmsPhoneStoreSubscriber->Subscribe();
+    
+    iKeylockEventSubscriber = CSysApSubscriber::NewL( *this, KPSUidAvkonDomain, KAknKeyguardStatus );
+    iKeylockEventSubscriber->Subscribe();
+    
+    iLightsOnRequestSubscriber = CSysApSubscriber::NewL( *this, KPSUidSecurityUIs, KSecurityUIsLights );
+    iLightsOnRequestSubscriber->Subscribe();
+    
+    iPowerMenuCustomDialogSubscriber = CSysApSubscriber::NewL( *this, KPSUidCoreApplicationUIs, KCoreAppUIsPowerMenuCustomDialogStatus );
+    iPowerMenuCustomDialogSubscriber->Subscribe();
     }
 
 // ----------------------------------------------------------------------------
@@ -202,8 +214,8 @@
     delete iInboxStatusSubscriber;
     delete iOutboxStatusSubscriber; 
     delete iIrdaStatusSubscriber;
-    delete iGprsStatusSubscriber; 
-    delete iWcdmaStatusSubscriber;
+//    delete iGprsStatusSubscriber; 
+//    delete iWcdmaStatusSubscriber;
     delete iHomeZoneStatusSubscriber;
     delete iNewEmailStatusSubscriber; 
     delete iLocationGlobalPrivacySubscriber;
@@ -236,6 +248,9 @@
     delete iVideoSharingIndicatorSubscriber;
     delete iGpsIndicatorSubscriber;
     delete iSmsPhoneStoreSubscriber;
+    delete iKeylockEventSubscriber;
+    delete iLightsOnRequestSubscriber;
+    delete iPowerMenuCustomDialogSubscriber;
     }
 
 
@@ -306,7 +321,8 @@
         {
         HandleHwrmFmTxCategoryL( aKey, value );
         }
-*/    else if ( aCategory == KPSUidDataSynchronizationInternalKeys )
+*/
+    else if ( aCategory == KPSUidDataSynchronizationInternalKeys )
         {
         HandleDataSyncCategoryL( aKey, value );
         }
@@ -318,6 +334,14 @@
         {
         HandleSmsStackCategoryL( aKey, value );
         }
+    else if ( aCategory == KPSUidAvkonDomain)
+        {
+        HandleLKeylockEventL( aKey, value );
+        }
+    else if ( aCategory == KPSUidSecurityUIs)
+        {
+        HandleLightsOnRequestL( aKey, value );
+        }
     }
 // ----------------------------------------------------------------------------
 // CSysApPubSubObserver::HandleCoreAppUIsCategoryL()
@@ -361,23 +385,23 @@
         case KCoreAppUIsUipInd:
             if ( aValue == ECoreAppUIsDoNotShow )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorInstantMessage, EAknIndicatorStateOff ); 
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorInstantMessage, EAknIndicatorStateOff ); 
                 }
             else if ( aValue == ECoreAppUIsShow )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorInstantMessage, EAknIndicatorStateOn ); 
+//                iSysApAppUi.SetIndicatorStateL( EAknIndicatorInstantMessage, EAknIndicatorStateOn ); 
                 }
             break;
         case KCoreAppUIsMessageToneQuit:
-            iSysApAppUi.HandleMessageTonePlayingQuitability( aValue );
+ //           iSysApAppUi.HandleMessageTonePlayingQuitability( aValue );
             break;
         case KCoreAppUIsNspsRawKeyEvent:
-            iSysApAppUi.HandleNspsRawKeyEventL();
+ //           iSysApAppUi.HandleNspsRawKeyEventL();
             break;
         case KCoreAppUIsLightsRawKeyEvent:
             if ( aValue == ECoreAppUIsKeyEvent )
                 {
-                iSysApAppUi.HandleRawKeyEventLightsRequireL();
+  //              iSysApAppUi.HandleRawKeyEventLightsRequireL();
                 }
             break;
         case KCoreAppUIsMmcRemovedWithoutEject:
@@ -385,27 +409,27 @@
             TUint cmd( aValue & KCoreAppUIsMmcRemovedWithoutEjectCmdMask );
             if ( cmd == ECoreAppUIsEjectCommandUsed )
                 {
-                iSysApAppUi.EjectStarted( ETrue );
+ //               iSysApAppUi.EjectStarted( ETrue );
                 }
             else if ( cmd == ECoreAppUIsEjectCommandNotUsed )
                 {
-                iSysApAppUi.EjectStarted( EFalse );
+ //               iSysApAppUi.EjectStarted( EFalse );
                 }
             else if ( cmd == ECoreAppUIsEjectCommandUsedToDrive )
                 {
                 TInt drive( aValue >> KCoreAppUIsMmcRemovedWithoutEjectValShift );
-                iSysApAppUi.EjectUsed( drive );
+ //               iSysApAppUi.EjectUsed( drive );
                 }
             break;
             }
         case KCoreAppUIsNewEmailStatus:
             if ( aValue == ECoreAppUIsNewEmail )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorEmailMessage, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorEmailMessage, EAknIndicatorStateOn );
                 }
             else if ( aValue == ECoreAppUIsNoNewEmail )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorEmailMessage, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorEmailMessage, EAknIndicatorStateOff );
                 }
             break;
 
@@ -423,68 +447,84 @@
         case KCoreAppUIsPoCIndicator:
             if ( aValue == ECoreAppUIsPocIndicatorOff || aValue == ECoreAppUIsPocIndicatorUninitialized )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOff );
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOff );
                 }
             else if ( aValue == ECoreAppUIsPocIndicatorDoNotDisturb )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOff );
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOn );
                 }
             else if ( aValue == ECoreAppUIsPocIndicatorConnectionOn )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOn );
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOff );
+//                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOn );
+//                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOff );
                 }
             break;
         case KCoreAppUIsPoCMissedIndicator:
             if ( aValue == ECoreAppUIsPocMissedIndicatorOff || aValue == ECoreAppUIsPocMissedIndicatorUninitialized )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCMissed, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCMissed, EAknIndicatorStateOff );
                 }
             else if ( aValue == ECoreAppUIsPocMissedIndicatorOn )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCMissed, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCMissed, EAknIndicatorStateOn );
                 }
             break;
             
         case KCoreAppUIsTarmIndicator:
-            iSysApAppUi.HandleTarmIndicatorL( aValue );
+ //           iSysApAppUi.HandleTarmIndicatorL( aValue );
             break;
 
         case KCoreAppUIsMtvRecStatus:
             if ( aValue == ECoreAppUIsMtvRecStatusOn  )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTVRec, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTVRec, EAknIndicatorStateOn );
                 }
             else if ( aValue == ECoreAppUIsMtvRecStatusOff || aValue == ECoreAppUIsMtvRecStatusUninitialized )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTVRec, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTVRec, EAknIndicatorStateOff );
                 }
             break;
 
         case KCoreAppUIsMtvDvbhStatus:
             if ( aValue == ECoreAppUIsMtvDvbhStatusOn )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTV, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTV, EAknIndicatorStateOn );
                 }
             else if ( aValue == ECoreAppUIsMtvDvbhStatusOff || aValue == ECoreAppUIsMtvDvbhStatusUninitialized )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTV, EAknIndicatorStateOff );
+//                iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTV, EAknIndicatorStateOff );
                 }
             break;
         
         case KCoreAppUIsVideoSharingIndicator:
             if ( aValue == ECoreAppUIsVideoSharingIndicatorOn )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorVideoSharing, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorVideoSharing, EAknIndicatorStateOn );
                 }
             else if ( aValue == ECoreAppUIsVideoSharingIndicatorOff || aValue == ECoreAppUIsVideoSharingIndicatorUninitialized )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorVideoSharing, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorVideoSharing, EAknIndicatorStateOff );
                 }
             break;
-
+            
+        case KCoreAppUIsPowerMenuCustomDialogStatus:
+            if ( aValue == ECoreAppUIsPowerMenuCustomDialogOn )
+                { 
+                TBool powerMenuMemoryStatus = EFalse;
+                powerMenuMemoryStatus = iSysApAppUi.ReleasePowerMenuCustomDialogMemory();
+                if(powerMenuMemoryStatus)
+                    {
+                    RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsPowerMenuCustomDialogStatus, ECoreAppUIsPowerMenuCustomDialogOff );
+                    }
+                }
+            else if ( aValue == ECoreAppUIsPowerMenuCustomDialogOff || aValue == ECoreAppUIsPowerMenuCustomDialogUninitialized )
+                {
+                   // do nothing
+                }
+            break;   
+        
         default:
             break;
         }
@@ -525,43 +565,43 @@
     switch ( aKey )
         {
         case KUidInboxStatusValue:
-            iSysApAppUi.SetEnvelopeIndicatorL();
+//            iSysApAppUi.SetEnvelopeIndicatorL();
             break;
 
         case KUidOutboxStatusValue:
             if ( aValue == ESADocumentsInOutbox )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorOutbox, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorOutbox, EAknIndicatorStateOn );
                 }
             //Hide the Outbox indicator
             else if ( aValue == ESAOutboxEmpty )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorOutbox, EAknIndicatorStateOff );
+//                iSysApAppUi.SetIndicatorStateL( EAknIndicatorOutbox, EAknIndicatorStateOff );
                 }
             break;
 
         case KIrdaStatus:
             if ( aValue == TIrdaStatusCodes::EIrLoaded || aValue == TIrdaStatusCodes::EIrBlocked || aValue == TIrdaStatusCodes::EIrDisconnected )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateAnimate );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateAnimate );
                 }
             else if ( aValue == TIrdaStatusCodes::EIrConnected )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateOn );
                 }
             else if ( aValue == TIrdaStatusCodes::EIrUnloaded )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateOff );
                 }
             break;
 
-        case KPSUidGprsStatusValue:
-        case KPSUidWcdmaStatusValue:        
-            iSysApAppUi.SetSignalIndicatorL();
-            break;
+//        case KPSUidGprsStatusValue:
+ //       case KPSUidWcdmaStatusValue:        
+ //           iSysApAppUi.SetSignalIndicatorL();
+//            break;
 
         case KPSUidLocationGlobalPrivacyValue:
-            iSysApAppUi.HandleLocationPrivacyIndicatorL( aValue );
+//            iSysApAppUi.HandleLocationPrivacyIndicatorL( aValue );
             break;
 
         case conn::KUidBackupRestoreKey:
@@ -594,7 +634,7 @@
     switch ( aKey )
         {
         case KHWRMBatteryLevel:
-            iSysApAppUi.UpdateBatteryBarsL( aValue );
+ //           iSysApAppUi.UpdateBatteryBarsL( aValue );
             break;
         
         case KHWRMBatteryStatus:
@@ -642,17 +682,17 @@
                     TRACES(RDebug::Print(_L("CSysApPubSubObserver::HandleHwrmFmTxCategoryL Active/Inactive -> Off transition")));
                     
     	            // turn any FM TX indicators off
-	                iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );
-	                iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );
+//	                iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );
+//	                iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );
                     
                     // give notification
                     if ( aValue == EFmTxStatePowerSaveAccessory )
                     	{
-                    	iSysApAppUi.ShowUiNoteL( EFmTxAccessoryStandbyNote );
+//                    	iSysApAppUi.ShowUiNoteL( EFmTxAccessoryStandbyNote );
                     	}
                     else
                     	{
-                    	iSysApAppUi.ShowUiNoteL( EFmTxOffNote );
+ //                   	iSysApAppUi.ShowUiNoteL( EFmTxOffNote );
                     	}
                     isFmTxTurnedOff = ETrue;                                                                           	
                     }
@@ -662,8 +702,8 @@
                     TRACES(RDebug::Print(_L("CSysApPubSubObserver::HandleHwrmFmTxCategoryL Active -> Inactive transition")));
                    
                     // enable not sending indicator
-	                iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );                      
-                    iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOn );                  
+//	                iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );                      
+//                    iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOn );                  
                     }
                 else if ( aValue == EFmTxStateActive )
                     {
@@ -671,8 +711,8 @@
                     TRACES(RDebug::Print(_L("CSysApPubSubObserver::HandleHwrmFmTxCategoryL Inactive -> Active transition")));
                     
                     // enable active indicator
-                    iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );    
-                    iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOn );					                
+//                    iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );    
+//                    iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOn );					                
                     }    
         
                 break;    
@@ -689,11 +729,11 @@
                     TRACES(RDebug::Print(_L("CSysApPubSubObserver::HandleHwrmFmTxCategoryL Off -> Active transition")));
                                         
                     // enable active indicator
-                    iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );   
-                    iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOn );					                  
+ //                   iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );   
+ //                   iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOn );					                  
                     
                     // give notification
-                    iSysApAppUi.ShowUiNoteL( EFmTxOnNote );
+ //                   iSysApAppUi.ShowUiNoteL( EFmTxOnNote );
                     isFmTxTurnedOn = ETrue;
                     }
                 else if ( aValue == EFmTxStateInactive || aValue == EFmTxStateScanning )
@@ -702,11 +742,11 @@
                 	TRACES(RDebug::Print(_L("CSysApPubSubObserver::HandleHwrmFmTxCategoryL Off -> Inactive transition")));
                 	
                     // enable not sending indicator
-	                iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );                      
-                    iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOn );                      	
+//	                iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );                      
+ //                   iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOn );                      	
                     
                     // give notification
-                    iSysApAppUi.ShowUiNoteL( EFmTxOnNote );
+ //                   iSysApAppUi.ShowUiNoteL( EFmTxOnNote );
                     isFmTxTurnedOn = ETrue;
                 	}                
                 break;                
@@ -794,16 +834,16 @@
         case KNWHomeZoneStatus:
             if ( aValue == ENWHomeZone )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorHomeZone, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorHomeZone, EAknIndicatorStateOn );
                 }
             else if ( aValue == ENWNone || aValue == ENWCityZone )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorHomeZone, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorHomeZone, EAknIndicatorStateOff );
                 }
             break; 
 
         case KNWTelephonyNetworkMode:
-            iSysApAppUi.SetSignalIndicatorL();
+ //           iSysApAppUi.SetSignalIndicatorL();
             break;
 
         default:
@@ -821,11 +861,11 @@
         case KHWRMFlipStatus:
             if ( aValue == EPSHWRMFlipClosed )
                 {
-                iSysApAppUi.SimulateFlipKeyEventL( EFalse );
+ //               iSysApAppUi.SimulateFlipKeyEventL( EFalse );
                 }
             else if ( aValue == EPSHWRMFlipOpen )
                 {
-                iSysApAppUi.SimulateFlipKeyEventL( ETrue );
+ //               iSysApAppUi.SimulateFlipKeyEventL( ETrue );
                 }
             break; 
 
@@ -844,11 +884,11 @@
         case KDataSyncStatus:
             if ( aValue > EDataSyncNotRunning )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorSynchronization , EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorSynchronization , EAknIndicatorStateOn );
                 }
             else
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorSynchronization, EAknIndicatorStateOff );
+  //              iSysApAppUi.SetIndicatorStateL( EAknIndicatorSynchronization, EAknIndicatorStateOff );
                 }
             break;
         
@@ -868,15 +908,15 @@
         case KPosIntGpsHwStatus:
             if ( aValue == EPosIntGpsHwOff )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateOff );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateOff );
                 }
             else if ( aValue == EPosIntGpsHwOn )    
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateOn );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateOn );
                 }
             else if ( aValue == EPosIntGpsHwIntermediate )
                 {
-                iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateAnimate );
+ //               iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateAnimate );
                 }
             break;
         
@@ -893,8 +933,8 @@
     {
     switch ( aKey )
         {
-        case KUidPSSMSStackDiskSpaceMonitorKey:
-            iSysApAppUi.SetEnvelopeIndicatorL();
+        case KAknKeyguardStatus:
+ //           iSysApAppUi.SetEnvelopeIndicatorL();
             break;
 
         default:
@@ -902,7 +942,39 @@
         }
     }
 
-// End of File
+void CSysApPubSubObserver::HandleLKeylockEventL( const TUint /* aKey */, const TInt aValue )
+    {
+    switch( aValue )
+        {
+        case EEikKeyLockEnabled:
+            iSysApAppUi.SetKeyLockEnabledL();
+            break;
+        case EEikKeyLockDisabled:
+            iSysApAppUi.SetKeyLockDisabledL();    
+            break;
+        default:
+            break;
+       }
+    }
 
+void CSysApPubSubObserver::HandleLightsOnRequestL( const TUint /* aKey */, const TInt aValue )
+    {
+    switch ( aValue )
+        {
+        case EEikKeyLockLightsOnRequest:
+             iSysApAppUi.SetLightsOnUnlockNoteL();
+             break;
+        case EEikEcsQueryLights: // emergency note is shown
+             iSysApAppUi.SetLightsOnEcsQueryL();
+             break;
 
+        case EEikSecurityQueryLights: // for device lock security query
+             iSysApAppUi.SetLightsOnSecurityQueryL();
+             break;
 
+        default:
+            break;
+        }
+    }
+
+// End of File
--- a/coreapplicationuis/SysAp/Src/SysApShutdownImage.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApShutdownImage.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -17,15 +17,20 @@
 
 
 // INCLUDE FILES
-#include <aknappui.h>
-#include <AknIconUtils.h>
-#include <AknUtils.h>
+//#include <aknappui.h>
+//#include <AknIconUtils.h>
+//#include <AknUtils.h>
+#include <eikenv.h>
 #include <coemain.h>
 #include <barsread.h> //use of TResourceReader
-#include <sysap.mbg>
+//#include <sysap.mbg>
 #include "SysApShutdownImage.h"
 #include "SysAp.hrh"
 #include <data_caging_path_literals.hrh>
+#include <HbDeviceMessageBoxSymbian.h>
+#include <SVGEngineInterfaceImpl.h>
+
+//_LIT(KDC_APP_BITMAP_DIR,"\\resource\\apps\\"); 
 
 // ============================ MEMBER FUNCTIONS ==============================
 
@@ -70,13 +75,16 @@
     {
     TRACES( RDebug::Print(_L("CSysApShutdownImage::ShowShutdownImageL:start" ) ) );
     TInt err ( 0 );
+    TRect rect(iCoeEnv->ScreenDevice()->SizeInPixels());
+    SetRect(rect);
+    TRACES( RDebug::Print(_L("CSysApShutdownImage::After:SetRect --Minus one" ) ) );
+    ActivateL();
 
-    SetRect(iAvkonAppUi->ApplicationRect());
-    ActivateL();
+    TRACES( RDebug::Print(_L("CSysApShutdownImage::After:ActivateL --Zero" ) ) );
 
     if ( aBitmapId )
         {
-        _LIT( KDirAndFile, "z:sysap.mif" );
+        _LIT( KDirAndFile, "z:qgn_sysap_screen.svg" );
         TParse* fp = new (ELeave) TParse();
         CleanupStack::PushL(fp);
         fp->Set( KDirAndFile, &KDC_APP_BITMAP_DIR, NULL );
@@ -99,27 +107,35 @@
                 delete iBitmap;
                 iBitmap = NULL;
                 // Ownership of bitmap is transferred to CSysApShutdownImage in CreateIconL
-                iBitmap = AknIconUtils::CreateIconL( fp->FullName(), aBitmapId );
-                TAknLayoutRect bitmapRect;
-                bitmapRect.LayoutRect( Rect(), AKN_LAYOUT_WINDOW_screen );
-                AknIconUtils::SetSize( iBitmap, bitmapRect.Rect().Size(), EAspectRatioPreservedAndUnusedSpaceRemoved );
+                iBitmap = ReadSVGL(fp->FullName());
+                TRACES( RDebug::Print(_L("CSysApShutdownImage::After:ReadSVGL --First" ) ) );
                 TInt xDelta=0; // for x coordinates
                 TInt yDelta=0; // for y coordinates
                 TSize bmpSizeInPixels = iBitmap->SizeInPixels();
+                TRACES( RDebug::Print(_L("CSysApShutdownImage::After:SizeInPixels --Second" ) ) );
                 //center image to the center of the screen
                 TRect rect = Rect();
                 xDelta=( rect.Width() - bmpSizeInPixels.iWidth ) / 2;
                 yDelta=( rect.Height() - bmpSizeInPixels.iHeight ) / 2;
                 TPoint pos = TPoint( xDelta , yDelta ); // displacement vector
                 //pos += rect.iTl; // bitmap top left corner position
+                TRACES( RDebug::Print(_L("CSysApShutdownImage::After:TPoint --Three" ) ) );
                 CWindowGc& gc = SystemGc();
+                TRACES( RDebug::Print(_L("CSysApShutdownImage::After:SystemGc --Four" ) ) );
                 ActivateGc();
+                TRACES( RDebug::Print(_L("CSysApShutdownImage::After:ActivateGc --Five" ) ) );
                 Window().Invalidate( rect );
+                TRACES( RDebug::Print(_L("CSysApShutdownImage::After:Invalidate --Six" ) ) );
                 Window().BeginRedraw( rect );
+                TRACES( RDebug::Print(_L("CSysApShutdownImage::After:BeginRedraw --Seven" ) ) );
                 gc.Clear();
+                TRACES( RDebug::Print(_L("CSysApShutdownImage::After:gc.Clear --Eight" ) ) );
                 gc.BitBlt( pos, iBitmap ); // CWindowGc member function
+                TRACES( RDebug::Print(_L("CSysApShutdownImage::After:gc.BitBlt --Nine" ) ) );
                 Window().EndRedraw();
+                TRACES( RDebug::Print(_L("CSysApShutdownImage::After:gc.EndRedraw --Ten" ) ) );
                 DeactivateGc();
+                TRACES( RDebug::Print(_L("CSysApShutdownImage::After:gc.DeactivateGc --Eleven" ) ) );
                 ControlEnv()->WsSession().Flush(); // force draw of the context
                 TRACES( RDebug::Print(_L("CSysApShutdownImage::ShowShutdownImageL:end" ) ) );
                 }
@@ -144,7 +160,60 @@
         ControlEnv()->WsSession().Flush(); // force draw of the context
 #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
         }
+    }
 
+// ----------------------------------------------------------------------------
+// CSysApShutdownImage::ShowShutdownImage()
+// ----------------------------------------------------------------------------
+CFbsBitmap* CSysApShutdownImage::ReadSVGL (TFileName aFileName)
+    {
+    TRACES( RDebug::Print(_L("CSysApShutdownImage::ReadSVGL:start" ) ) );    
+    TFontSpec fontspec;
+    TDisplayMode mode = EColor16MA;
+    TInt SIZE_X(360), SIZE_Y(360);
+    TSize size(SIZE_X, SIZE_Y);
+
+    //if ( mode >= (TDisplayMode)13 )  { mode = EColor16MA; }
+
+    CFbsBitmap* frameBuffer = new ( ELeave ) CFbsBitmap;
+    CleanupStack::PushL( frameBuffer );
+    frameBuffer->Create( size, mode );
+    
+    CSvgEngineInterfaceImpl* svgEngine = NULL;
+    svgEngine = CSvgEngineInterfaceImpl::NewL(frameBuffer, NULL, fontspec );    
+    
+    if (svgEngine == NULL)
+        {
+        TRACES( RDebug::Print(_L("CSysApShutdownImage::ReadSVGL:SVG engine creation failed" ) ) );   
+        }
+    
+    CleanupStack::PushL( svgEngine );
+    TInt domHandle = 0;
+    svgEngine->PrepareDom( aFileName, domHandle ) ;
+    if (domHandle == 0)
+        {
+        TRACES( RDebug::Print(_L("CSysApShutdownImage::ReadSVGL():DOM handle creation failed" ) ) );
+        }
+
+    CFbsBitmap* bitmap = new(ELeave) CFbsBitmap;    
+    CleanupStack::PushL( bitmap );
+    User::LeaveIfError( bitmap->Create( size, EColor64K ) );
+
+    svgEngine->UseDom( domHandle, bitmap, NULL ) ;
+    
+    MSvgError* err;
+    svgEngine->Start( err );
+    if (err->HasError())
+        {
+        TRACES( RDebug::Print(_L("CSysApShutdownImage::ReadSVGL(): SVG Engine Start failed" ) ) );
+        }
+
+    svgEngine->DeleteDom( domHandle );
+    CleanupStack::Pop( bitmap );
+    CleanupStack::PopAndDestroy( svgEngine );
+    CleanupStack::PopAndDestroy( frameBuffer );
+    TRACES( RDebug::Print(_L("CSysApShutdownImage::ReadSVGL:End" ) ) );   
+    return bitmap;
     }
 
 // ----------------------------------------------------------------------------
--- a/coreapplicationuis/SysAp/Src/SysApSimChanged.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApSimChanged.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -117,13 +117,13 @@
     dateTime.Set( 2100, EJanuary, 1, 0, 0, 0, 0 );
     TTime date(dateTime);
     
-    TRACES( RDebug::Print( _L("CSysApSimChanged::ClearLogsL(): trying CLogClient::NewL") ) );
+/*    TRACES( RDebug::Print( _L("CSysApSimChanged::ClearLogsL(): trying CLogClient::NewL") ) );
     CLogClient* logClient = CLogClient::NewL( iFs );    
     logClient->ClearLog( date, active->iStatus );
-    
+*/    
     CActiveScheduler::Start();
 
-    delete logClient;
+//    delete logClient;
     CleanupStack::PopAndDestroy( active );
     }
     
@@ -136,7 +136,7 @@
     TRACES( RDebug::Print( _L("CSysApSimChanged::ClearSsSettingsL()") ) );
     
     // Reset SSSettings values
-    RSSSettings ssSettings;
+/*    RSSSettings ssSettings;
     User::LeaveIfError( ssSettings.Open( iSysApAppUi.GetTelServer() ) );
     
     TRACES( RDebug::Print( _L("CSysApSimChanged::ClearSsSettingsL(): trying RSSSettings::HandleSIMChanged") ) );
@@ -144,6 +144,7 @@
     ssSettings.Close();    
     
     User::LeaveIfError( err );
+*/
     }
 
 // -----------------------------------------------------------------------------
@@ -170,7 +171,7 @@
     if ( simNotOwned )
         {
         ClearRepositoriesL();
-        ClearLogsL();
+//        ClearLogsL();
         }
     }
 // =============== CShareActive MEMBER FUNCTIONS ===============================
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Src/SysApTaskList.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,122 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include "SysApTaskList.h"
+#include <apgwgnam.h>
+
+CSysApTaskList* CSysApTaskList::NewL(RWsSession& aWsSession)
+	{
+	CSysApTaskList* self = NewLC(aWsSession);
+	CleanupStack::Pop(self);
+	return self;
+	}
+
+ CSysApTaskList* CSysApTaskList::NewLC(RWsSession& aWsSession)
+	{
+	CSysApTaskList* self = new(ELeave) CSysApTaskList(aWsSession);
+	CleanupStack::PushL(self);
+	self->ConstructL();
+	return self;
+	}
+
+CSysApTaskList::CSysApTaskList(RWsSession& aWsSession)
+: iWs(aWsSession)
+	{
+	}
+
+void CSysApTaskList::ConstructL()
+	{
+	UpdateListL();
+	}
+
+ CSysApTaskList::~CSysApTaskList()
+	{
+	iWgs.Close();
+	}
+
+ void CSysApTaskList::UpdateListL()
+	{
+	User::LeaveIfError(iWs.WindowGroupList(0, &iWgs));
+	}
+
+ const RArray<RWsSession::TWindowGroupChainInfo>& CSysApTaskList::WgArray() const
+	{
+	return iWgs;
+	}
+
+ TApaTask CSysApTaskList::FindRootApp(TUid aAppUid) const
+	{
+	TApaTask task(iWs);
+	task.SetWgId(0);		// initialise task to non-existant task
+	// wgId = 0 tells FindAppByUid to start looking for apps
+	TInt wgId=0;
+	FOREVER
+		{
+	 	CApaWindowGroupName::FindByAppUid(aAppUid, iWs, wgId);
+	 	// KErrNotFound means that no more apps can be found
+	 	if (wgId == KErrNotFound)
+	 		break;
+	 	if (IsRootWindowGroup(wgId))
+	 		{
+	 		// Found a root wg with the right app UID, return it.
+	 		task.SetWgId(wgId);
+	 		break;
+	 		}
+		}
+	return task;
+	}
+
+ TBool CSysApTaskList::IsRootWindowGroup(TInt aWgId) const
+	{
+	TInt count = iWgs.Count();
+	for (TInt ii=0; ii<count; ii++)
+		{
+        const RWsSession::TWindowGroupChainInfo& info = iWgs[ii];
+        // find the window group id and check that it has no parent
+        if (info.iId == aWgId)
+        	return (info.iParentId <= 0);
+		}
+	return EFalse;
+	}
+
+ TInt CSysApTaskList::FindParentWgId(TInt aWgId) const
+	{
+	TInt count = iWgs.Count();
+	for (TInt ii=0; ii<count; ii++)
+		{
+        const RWsSession::TWindowGroupChainInfo& info = iWgs[ii];
+        if (info.iId == aWgId && info.iParentId > 0 && info.iParentId != info.iId)
+        	return info.iParentId;
+		}
+	return 0;
+	}
+
+ TInt CSysApTaskList::FindChildWgId(TInt aWgId) const
+	{
+	TInt count = iWgs.Count();
+	for (TInt ii=0; ii<count; ii++)
+		{
+        const RWsSession::TWindowGroupChainInfo& info = iWgs[ii];
+        if (info.iParentId == aWgId && info.iId > 0 && info.iParentId != info.iId)
+        	return info.iId;
+		}
+	return 0;
+	}
+
+
+
+
+
--- a/coreapplicationuis/SysAp/Src/SysApTimer.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApTimer.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -18,8 +18,8 @@
 
 // INCLUDES
 
-#include <avkon.hrh>
-#include <avkon.rsg>
+//#include <avkon.hrh>
+//#include <avkon.rsg>
 #include "SysAp.hrh"
 #include "SysApTimer.h"
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Src/hbdevicepowermenusymbian.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,434 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#include <hbdevicedialogsymbian.h>
+#include <hbsymbianvariant.h>
+#include <coreapplicationuisdomainpskeys.h>
+#include "hbdevicepowermenusymbian.h"
+
+
+//These Keys will be used in CHbSymbianVariantMap
+//Donot Change these strings
+_LIT(KVolumeLevel, "VolumeLevel");
+_LIT(KSilenceLatchOn, "SilenceLatchOn");        //Used to latch silencebutton
+_LIT(KCypherOff, "CypherOff");                  //used to poweroffButtonEnabled/Disabled
+_LIT(KVibrationEnable, "VibrationEnable");
+_LIT(KOfflineEnable, "OfflineEnable");
+_LIT(KShutDown, "ShutDown");
+
+//used to load plugin 
+_LIT(KPluginIdentifier, "com.nokia.hb.devicepowermenu/1.0");
+
+
+NONSHARABLE_CLASS(CHbDevicePowerMenuPrivate) : public CBase, public MHbDeviceDialogObserver
+{
+public:
+    static CHbDevicePowerMenuPrivate* NewL(CHbDevicePowerMenuSymbian* aDialog);
+    virtual ~CHbDevicePowerMenuPrivate();
+
+    void ShowL();
+    void AddVariantL(const TDesC& aKey, const TAny* aData, CHbSymbianVariant::TType aDataType);
+
+    //Set Methods
+    void SetVolume(TInt aVolume);
+    void SetSilenceMode(TBool aEnable);
+    void SetOfflineMode(TBool aChecked);
+    void SetVibrationEnabled(TBool aEnable);
+    void SetPowerOffEnabled(TBool aEnable);
+
+public:
+    // MHbDeviceDialogObserver
+    void DataReceived(CHbSymbianVariantMap& aData);
+    void DeviceDialogClosed(TInt aCompletionCode);
+
+private: 
+    CHbDevicePowerMenuPrivate();
+    void ConstructL(CHbDevicePowerMenuSymbian* aDialog);
+
+private:
+    //symbian FW client intreface to load Qt.plugin
+    CHbDeviceDialogSymbian*         iDeviceDialog;
+    //Parameter for loading qt.plugin
+    CHbSymbianVariantMap*           iVariantMap;
+    //Symbian client interface for Powermenu
+    CHbDevicePowerMenuSymbian*      iPowerMenuManager;
+
+    //Variants used in VariantMap
+    TInt        iVolumeLevel;           //Volume level ranges 1 to 10
+    TBool       iSilenceLatchOn;        //Silence Enabled or Disbaled
+    TBool       iVibrationEnable;       //Master Vibarate enabled/Disabled
+    TBool       iOfflineEnable;         //Oflline Mode enabled or Disabled
+    TBool       iCypherOff;             //Encryption/Decryption ON/OFF
+};
+
+/**
+ * Create an object of CHbDevicePowerMenuPrivate
+ */
+CHbDevicePowerMenuPrivate* CHbDevicePowerMenuPrivate::NewL(CHbDevicePowerMenuSymbian* aDialog)
+    {
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::NewL: START") ) );
+    CHbDevicePowerMenuPrivate* self = new (ELeave) CHbDevicePowerMenuPrivate();
+    CleanupStack::PushL(self);
+    self->ConstructL(aDialog);
+    CleanupStack::Pop(self);
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::NewL: END") ) );
+    return self;
+    }
+
+/**
+ * Constructor
+ */
+CHbDevicePowerMenuPrivate::CHbDevicePowerMenuPrivate()
+    {
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::Constructor") ) );
+    //Do nothing
+    }
+
+/**
+ * Destructor
+ */
+CHbDevicePowerMenuPrivate::~CHbDevicePowerMenuPrivate()
+    {
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::Destructor: START") ) );
+    delete iDeviceDialog;
+    delete iVariantMap;
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::Destructor: END") ) );
+    }
+
+/**
+ * Constrcuts all its member variables
+ */
+void CHbDevicePowerMenuPrivate::ConstructL(CHbDevicePowerMenuSymbian* aDialog)
+    {
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::ConstructL: START") ) ); 
+    iPowerMenuManager = aDialog;
+    iDeviceDialog = CHbDeviceDialogSymbian::NewL();
+    iVariantMap = CHbSymbianVariantMap::NewL();
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::ConstructL: END") ) ); 
+    }
+
+/**
+ * Builds all parameters required for showing the PowerMenu Dialog.
+ * Loads the required powermenu plugin and calls show on DeviceDialog.
+ * This Displays the Customized PowerMenu Widget. 
+ */
+void CHbDevicePowerMenuPrivate::ShowL()
+    {
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::ShowL: START") ) ); 
+    AddVariantL(KVolumeLevel, &iVolumeLevel, CHbSymbianVariant::EInt);
+    AddVariantL(KSilenceLatchOn, &iSilenceLatchOn, CHbSymbianVariant::EBool);
+    AddVariantL(KVibrationEnable, &iVibrationEnable, CHbSymbianVariant::EBool);
+    AddVariantL(KOfflineEnable, &iOfflineEnable, CHbSymbianVariant::EBool);
+    AddVariantL(KCypherOff, &iCypherOff, CHbSymbianVariant::EBool);
+    //No shutdown varinat will be added to showL
+    User::LeaveIfError(iDeviceDialog->Show(KPluginIdentifier, *iVariantMap, this));
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::ShowL: END") ) ); 
+    }
+
+/**
+ * Sets Volume to aVolume
+ */
+void CHbDevicePowerMenuPrivate::SetVolume(TInt aVolume)
+    {
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetVolume: START") ) ); 
+    iVolumeLevel = aVolume;
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetVolume: END") ) ); 
+    }
+
+/**
+ * Sets SilenceMode to Enable/Disable
+ */
+void CHbDevicePowerMenuPrivate::SetSilenceMode(TBool aEnable)
+    {
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetSilenceMode: START") ) ); 
+    iSilenceLatchOn = aEnable;
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetSilenceMode: END") ) ); 
+    }
+
+/**
+ * Sets OfflineMode to Checked/UnChecked
+ */
+void CHbDevicePowerMenuPrivate::SetOfflineMode(TBool aChecked)
+    {
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetOfflineMode: START") ) ); 
+    iOfflineEnable = aChecked;
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetOfflineMode: END") ) ); 
+    }
+
+/**
+ * Sets VibrationEnabled to Checked/UnChecked
+ */
+void CHbDevicePowerMenuPrivate::SetVibrationEnabled(TBool aChecked)
+    {
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetVibrationEnabled: START") ) ); 
+    iVibrationEnable = aChecked;
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetVibrationEnabled: END") ) ); 
+    }
+
+/**
+ * Sets PowerOffEnabled to Enable/Disable
+ */
+void CHbDevicePowerMenuPrivate::SetPowerOffEnabled(TBool aEnable)
+    {
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetPowerOffEnabled: START") ) ); 
+    iCypherOff = aEnable;
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetPowerOffEnabled: END") ) ); 
+    }
+
+/**
+ * Data received from HBDeviceDialog will hit by emit deviceDialogData in plugin
+ * The values received from UI will set to ControlPanel.
+ */
+void CHbDevicePowerMenuPrivate::DataReceived(CHbSymbianVariantMap& aData)
+    {
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: START") ) ); 
+    // Updates received from the plugin.
+	//1. Volume
+	const CHbSymbianVariant* volumeVariant =  aData.Get(KVolumeLevel);
+	if(volumeVariant)
+		{
+        TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: volumeVariant::Start") ) );
+		TInt* volumeValue = volumeVariant->Value<TInt>();
+		if(volumeValue)
+			{
+			iVolumeLevel = *volumeValue;
+			iPowerMenuManager->iProfileEngine->SetMasterVolumeL( iVolumeLevel );
+			}
+	    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived:volumeVariant::End") ) );
+		}
+	
+	//2. Silence
+	const CHbSymbianVariant* SilenceVariant =  aData.Get(KSilenceLatchOn);
+	if(SilenceVariant)
+		{
+        TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: SilenceVariant::Start") ) );
+		TBool* LatchValue = SilenceVariant->Value<TBool>();
+		if(LatchValue)
+			{
+			iSilenceLatchOn = *LatchValue;
+			iPowerMenuManager->iProfileEngine->SetSilenceModeL( iSilenceLatchOn );//member in CHbDevicePowerMenuSymbian
+			}
+		TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: SilenceVariant::End") ) );
+		}
+	
+	//3. Vibration
+	const CHbSymbianVariant* VibrationVariant =  aData.Get(KVibrationEnable);
+	if(VibrationVariant)
+		{
+        TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: VibrationVariant::Start") ) );
+		TBool* VibrationValue = VibrationVariant->Value<TBool>();
+		if(VibrationValue)
+			{
+			iVibrationEnable = *VibrationValue;
+			iPowerMenuManager->iProfileEngine->SetMasterVibraL( iVibrationEnable );//member in CHbDevicePowerMenuSymbian
+			}
+        TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: VibrationVariant::End") ) );
+		}
+	
+	//4.Offline
+	const CHbSymbianVariant* OfflineVariant =  aData.Get(KOfflineEnable);
+	if(OfflineVariant)
+		{
+        TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: OfflineVariant::Start") ) );
+		TBool* OfflineValue = OfflineVariant->Value<TBool>();
+		if(OfflineValue)
+			{
+			iOfflineEnable = *OfflineValue;
+			User::LeaveIfError( iPowerMenuManager->iCenrepOffline->Set(  KSettingsAirplaneMode, iOfflineEnable )  ); 
+			}
+        TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: OfflineVariant::End") ) );
+		}
+	
+	//5.shutdown
+	const CHbSymbianVariant* ShutDownVariant =  aData.Get(KShutDown);
+	if(ShutDownVariant)
+		{
+        TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: ShutDownVariant::Start") ) );
+		TBool* ShutDownValue = ShutDownVariant->Value<TBool>();
+		if(ShutDownValue)
+			{
+			TBool shutDown = *ShutDownValue;
+			if (shutDown)
+			    {
+                iPowerMenuManager->iSysApServer.HandleLongPowerKeyPressedL();
+			    }
+			
+			}
+        TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: ShutDownVariant::End") ) );
+		}
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: END") ) ); 
+	return;
+    }
+
+/**
+ * DeviceDialogClosed will be executed by the event emit deviceDialogClosed in plugin.
+ * This will be executed when   1. Tap out side the Dialog to Close
+ *                              2. When Power Off Button is clicked. 
+ */
+void CHbDevicePowerMenuPrivate::DeviceDialogClosed(TInt /*aCompletionCode*/)
+    {
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DeviceDialogClosed") ) ); 
+    // Inform sysap to release the memory of power menu custom dialog.
+    RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsPowerMenuCustomDialogStatus, ECoreAppUIsPowerMenuCustomDialogOn );
+    }
+
+/**
+ * Contrcuts VariantMap
+ */
+void CHbDevicePowerMenuPrivate::AddVariantL(const TDesC& aKey, const TAny* aData, CHbSymbianVariant::TType aDataType)
+    {
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::AddVariantL: START") ) ); 
+    CHbSymbianVariant *variant = CHbSymbianVariant::NewL(aData, aDataType);
+    CleanupStack::PushL(variant);
+    //iVariantMap takes the ownerhip of variant
+    User::LeaveIfError(iVariantMap->Add(aKey, variant));
+    CleanupStack::Pop(variant);
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::AddVariantL: End") ) ); 
+    }
+
+/*
+ * Creates an object of CHbDevicePowerMenuSymbian
+*/
+CHbDevicePowerMenuSymbian* CHbDevicePowerMenuSymbian::NewL(CSysApAppUi& aSysApServer)
+    {
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::NewL: START") ) ); 
+    CHbDevicePowerMenuSymbian* self = new (ELeave) CHbDevicePowerMenuSymbian(aSysApServer);
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    CleanupStack::Pop(self);
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::NewL: END") ) ); 
+    return self;
+    }
+
+/*
+ *  Destructs the class.
+*/
+CHbDevicePowerMenuSymbian::~CHbDevicePowerMenuSymbian()
+    {
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::Destructor: START") ) ); 
+    delete iCenrepProfile;
+    delete iCenrepOffline;
+    iProfileEngine->Release();
+    delete iPowerMenuPrivate;
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::Destructor: End") ) ); 
+    }
+
+/*
+ * Executes the dialog asynchronously.
+*/
+void CHbDevicePowerMenuSymbian::ShowL()
+    {    
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::ShowL: START") ) ); 
+    iPowerMenuPrivate->ShowL();
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::ShowL: End") ) ); 
+    }
+
+/**
+ * Sets Volume to aVolume
+ */
+void CHbDevicePowerMenuSymbian::SetVolume(TInt aVolume)
+	{
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetVolume: START") ) ); 
+    iPowerMenuPrivate->SetVolume(aVolume);
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetVolume: End") ) ); 
+	}
+
+/**
+ * Sets SilenceMode to Enable/Disable
+ */
+void CHbDevicePowerMenuSymbian::SetSilenceMode(TBool aEnable)
+	{
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetSilenceMode: START") ) ); 
+	iPowerMenuPrivate->SetSilenceMode(aEnable);
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetSilenceMode: END") ) ); 
+	}
+
+/**
+ * Sets OfflineMode to Checked/UnChecked
+ */
+void CHbDevicePowerMenuSymbian::SetOfflineMode(TBool aChecked)
+	{
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetOfflineMode: START") ) ); 
+	iPowerMenuPrivate->SetOfflineMode(aChecked);
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetOfflineMode: End") ) ); 
+	}
+
+/**
+ * Sets VibrationEnabled to Checked/UnChecked
+ */
+void CHbDevicePowerMenuSymbian::SetVibrationEnabled(TBool aEnable)
+	{
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetVibrationEnabled: START") ) ); 
+	iPowerMenuPrivate->SetVibrationEnabled(aEnable);
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetVibrationEnabled: End") ) ); 
+	}
+
+/**
+ * Sets PowerOffEnabled to Enable/Disable
+ */
+void CHbDevicePowerMenuSymbian::SetPowerOffEnabled(TBool aEnable)
+	{
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetPowerOffEnabled: START") ) ); 
+	iPowerMenuPrivate->SetPowerOffEnabled(aEnable);
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetPowerOffEnabled: END") ) ); 
+	}
+
+/*
+ * Constructor.
+*/
+CHbDevicePowerMenuSymbian::CHbDevicePowerMenuSymbian(CSysApAppUi& aSysApServer)
+	:iSysApServer(aSysApServer)
+	{
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::Constructor") ) ); 
+	//Do Nothing
+	}
+
+/*
+ * 2nd Constructor.
+ * Constructs and initializes all its meber variables
+*/
+void CHbDevicePowerMenuSymbian::ConstructL()
+    {
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::ConstructL: START") ) ); 
+    iProfileEngine = ::CreateProfileEngineExtended2L();
+    iCenrepOffline = CRepository::NewL( KCRUidCommunicationSettings );
+    iCenrepProfile = CRepository::NewL( KCRUidProfileEngine );
+	iPowerMenuPrivate = CHbDevicePowerMenuPrivate::NewL(this);
+
+    //To Sync with Contro panel 
+	TBool airplaneMode(0);
+	User::LeaveIfError( iCenrepOffline->Get( KSettingsAirplaneMode, airplaneMode ) );
+	SetOfflineMode(airplaneMode);
+	
+	TInt masterVolume(0);
+	User::LeaveIfError( iCenrepProfile->Get( KProEngMasterVolume, masterVolume ) );
+	SetVolume(masterVolume);
+	
+	TBool masterVibrate(0);
+	User::LeaveIfError( iCenrepProfile->Get( KProEngMasterVibra, masterVibrate ) );
+	SetVibrationEnabled(masterVibrate);
+	
+	TBool silenceMode(EFalse);
+	User::LeaveIfError( iCenrepProfile->Get( KProEngSilenceMode, silenceMode ) );
+	SetSilenceMode(silenceMode);
+	
+	//Cypheroff is True when No encryption/Decryption is happening
+	TBool cypherOff(!(iSysApServer.IsEncryptionOperationOngoingL()));
+	SetPowerOffEnabled(cypherOff);
+    TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::ConstructL: END") ) ); 
+    }
+
--- a/coreapplicationuis/SysAp/Src/sysapbatteryinfocontroller.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/sysapbatteryinfocontroller.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -19,13 +19,8 @@
 #include <e32debug.h>
 #include <e32property.h>
 #include <StringLoader.h>
-#include <SysAp.rsg>
 #include "bsutil.h"
 #include <hwrmpowerstatesdkpskeys.h>
-#include <aknappui.h>
-#include <AknCapServerClient.h>
-#include <AknSgcc.h>
-#include "batterypopupcontrol.h"
 #include "sysapbatteryinfocontroller.h"
 #include "SysAp.hrh"
 
@@ -43,8 +38,8 @@
                                                         : iBsUtil( NULL ),
                                                           iCurrentCapacity( KNotInitialized ),
                                                           iThresholdCapacity( aThreshold  ),
-                                                          iBatteryInfoState( EBatteryInfoAboveThreshold ),
-                                                          iBatteryPopup( NULL )
+                                                          iBatteryInfoState( EBatteryInfoAboveThreshold )
+                                                          // iBatteryPopup( NULL )
     {
     // sanity check, fall back to hard coded default value
     const TInt min(0);
@@ -92,7 +87,7 @@
     {
     TRACES( RDebug::Print( _L("CSysApBatteryInfoController::~CSysApBatteryInfoController") ) );
     delete iBsUtil;
-    delete iBatteryPopup;
+    // delete iBatteryPopup;
     }
 
 // ---------------------------------------------------------------------------
@@ -183,38 +178,12 @@
 // CSysApBatteryInfoController::ShowBatteryPreviewPopupL
 // ---------------------------------------------------------------------------
 //
-void CSysApBatteryInfoController::ShowBatteryPreviewPopupL( TInt aCapacity )
+void CSysApBatteryInfoController::ShowBatteryPreviewPopupL( TInt /* aCapacity */ )
     {
-    TRACES( RDebug::Print( _L("CSysApBatteryInfoController::ShowBatteryPreviewPopupL: aCapacity=%d"), aCapacity ) );
-    
-    delete iBatteryPopup;
-    iBatteryPopup = NULL;
-    HBufC* popupTextBuf = StringLoader::LoadLC( R_QTN_BATTERY_STATUS_POPUP, aCapacity ); 
-    iBatteryPopup = CBatteryPopupControl::NewL( *popupTextBuf, KNullDesC );
-    CleanupStack::PopAndDestroy( popupTextBuf );
-        
-    // switch layout for showing the battery popup
-    CAknAppUi* appUi = static_cast<CAknAppUi*>(CCoeEnv::Static()->AppUi());
-    CEikStatusPane* statusPane = appUi->StatusPane();
+    // TRACES( RDebug::Print( _L("CSysApBatteryInfoController::ShowBatteryPreviewPopupL: aCapacity=%d"), aCapacity ) );
     
-    TInt currLayout = statusPane->CurrentLayoutResId();
-        
-    RAknUiServer* aknSrv = CAknSgcClient::AknSrv();
-    if ( aknSrv )
-        {
-        statusPane->SwitchLayoutL( aknSrv->StatusPaneResourceId()  );	
-        }    
-    // Trap for switching layout back to current.
-    TRAPD( err, iBatteryPopup->ShowPopUpL() );
-    
-    if( err )
-        {
-        TRACES( RDebug::Print( _L("CSysApBatteryInfoController::ShowBatteryPreviewPopupL ShowPopUpL() leaved: %d"), err ) );
-        }
-        
-    // restore layout
-    statusPane->SwitchLayoutL( currLayout );
-    
-    User::LeaveIfError( err );
+    // delete iBatteryPopup;
+    // iBatteryPopup = NULL;
+    // preview battery capacity
     }
 
--- a/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -19,8 +19,9 @@
 #include <e32property.h>
 #include <eikon.hrh>
 #include <coemain.h>
-#include <aknkeylock.h>
-#include <AknTaskList.h>
+//#include <aknkeylock.h>
+//#include <AknTaskList.h>
+#include "SysApTaskList.h"
 #include <apgtask.h>
 #include <apgcli.h>
 #include <apgwgnam.h>
@@ -33,11 +34,13 @@
 #include <startupdomainpskeys.h>
 #include <hwrmdomainpskeys.h>
 #include <u32hal.h>
-#include <SysAp.rsg>
+//#include <SysAp.rsg>
 #include "sysapdefaultkeyhandler.h"
 #include "sysapcallback.h"
 #include "SysAp.hrh"
-#include "AknSgcc.h"
+#include <AknSgcc.h>
+//#include "sysapappui.h"
+#include <w32std.h>
 
 
 const TInt KModifierMask( 0 );
@@ -48,18 +51,18 @@
 // CSysApDefaultKeyHandler::CSysApDefaultKeyHandler
 // ---------------------------------------------------------------------------
 //
-CSysApDefaultKeyHandler::CSysApDefaultKeyHandler( MSysapCallback& aCallback ) :
+CSysApDefaultKeyHandler::CSysApDefaultKeyHandler( MSysapCallback& aCallback ):                                                      
                                                      iCallback(aCallback),
                                                      iCameraSupported(EFalse),
                                                      iCoverDisplaySupported(EFalse),
-                                                     iKeylock(NULL),
+//                                                     iKeylock(NULL),
                                                      iCapturedEKeyCamera(0),
                                                      iCapturedEKeyTwistOpen(0),
                                                      iCapturedEKeyTwistClose(0),
                                                      iCapturedEKeyGripOpen(0),
                                                      iCapturedEKeyGripClose(0),
-                                                     iCapturedEKeyPoC(0),
-                                                     iAknUiServerConnected(EFalse)
+                                                     iCapturedEKeyPoC(0)
+//                                                     iAknUiServerConnected(EFalse)
     {
     }
 
@@ -73,63 +76,23 @@
     
     RWindowGroup groupWin = CCoeEnv::Static()->RootWin();
     User::LeaveIfError ( iCapturedEKeyCamera = groupWin.CaptureKey( EKeyCamera, KModifierMask, KModifierMask ) );
-    User::LeaveIfError ( iCapturedEKeyTwistOpen = groupWin.CaptureKey( EKeyTwistOpen, KModifierMask, KModifierMask ) );
-    User::LeaveIfError ( iCapturedEKeyTwistClose = groupWin.CaptureKey( EKeyTwistClose, KModifierMask, KModifierMask ) );   
-    User::LeaveIfError ( iCapturedEKeyGripOpen = groupWin.CaptureKey( EKeyGripOpen, KModifierMask, KModifierMask ) ); 
-    User::LeaveIfError ( iCapturedEKeyGripClose = groupWin.CaptureKey( EKeyGripClose, KModifierMask, KModifierMask ) ); 
-    User::LeaveIfError ( iCapturedEKeyPoC = groupWin.CaptureKey( EKeyPoC, KModifierMask, KModifierMask ) ); 
-    
-    // flip key events don't need to be captured, because in current setup they are not real events but simulated by SysAp
-    // according to notifications received from P&S key that stores flip information
     
     FeatureManager::InitializeLibL();
     iCameraSupported = FeatureManager::FeatureSupported( KFeatureIdCamera );
     iCoverDisplaySupported = FeatureManager::FeatureSupported( KFeatureIdCoverDisplay );
     FeatureManager::UnInitializeLib();
-    
-    TKeyLockBuf lockBuf;
-    iCallback.ExecQueryL( MSysapCallback::EGetKeylock, lockBuf );  
-    iKeylock = lockBuf();
-    
-    __ASSERT_DEBUG( iKeylock, User::Panic( _L("CSysApDefaultKeyHandler::ConstructL: iKeylock not initialized"), KErrBadHandle ) );
-    
-    if ( iCoverDisplaySupported ) // if flip status is monitored, set the initial flip status now
-        {
-        TInt flipValue;
-        TInt err = RProperty::Get( KPSUidHWRM, KHWRMFlipStatus, flipValue );
-
-        TRACES( RDebug::Print( _L("CSysApDefaultKeyHandler::ConstructL: flipValue=%d, err=%d"), flipValue, err ) );
-        
-        if ( err == KErrNone )
-            {
-            switch ( flipValue )
-                {
-                case EPSHWRMFlipOpen:
-                    SetDisplayState( ETrue );
-                    break;
-                    
-                case EPSHWRMFlipClosed:
-                    SetDisplayState( EFalse );
-                    break;
-                    
-                case EPSHWRMFlipStatusUninitialized:
-                default:
-                    // set display state only if the current flip position is known
-                    break;
-                }
-            }
-        }
+ 
     }
 
 // ---------------------------------------------------------------------------
 // CSysApDefaultKeyHandler::NewL
 // ---------------------------------------------------------------------------
 //
-CSysApDefaultKeyHandler* CSysApDefaultKeyHandler::NewL( MSysapCallback& aCallback )
+CSysApDefaultKeyHandler* CSysApDefaultKeyHandler::NewL(MSysapCallback& aCallback )
     {
     TRACES( RDebug::Print( _L("CSysApDefaultKeyHandler::NewL()") ) );
     
-    CSysApDefaultKeyHandler* self = new( ELeave ) CSysApDefaultKeyHandler( aCallback) ;
+    CSysApDefaultKeyHandler* self = new( ELeave ) CSysApDefaultKeyHandler(aCallback) ;
     CleanupStack::PushL( self );
     self->ConstructL();
     CleanupStack::Pop( self );
@@ -144,17 +107,8 @@
 CSysApDefaultKeyHandler::~CSysApDefaultKeyHandler()
     {
     TRACES( RDebug::Print( _L("CSysApDefaultKeyHandler::~CSysApDefaultKeyHandler()") ) );
-    
-    iAknUiServer.Close();
-    
     RWindowGroup groupWin = CCoeEnv::Static()->RootWin();
-    groupWin.CancelCaptureKey( iCapturedEKeyCamera );
-    groupWin.CancelCaptureKey( iCapturedEKeyTwistOpen );
-    groupWin.CancelCaptureKey( iCapturedEKeyTwistClose );
-    groupWin.CancelCaptureKey( iCapturedEKeyGripOpen );
-    groupWin.CancelCaptureKey( iCapturedEKeyGripClose );
-    groupWin.CancelCaptureKey( iCapturedEKeyPoC );
-    
+    groupWin.CancelCaptureKey( iCapturedEKeyCamera );    
     }
     
 
@@ -176,58 +130,7 @@
         response = EKeyWasConsumed; // set again in default case if not consumed
         
         switch ( aKeyEvent.iCode )
-            {
-            case EKeyGripOpen:
-                TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyGripOpen") ) );
-                RProperty::Set( KPSUidHWRM, KHWRMGripStatus, EPSHWRMGripOpen );
-                if (!IsDeviceLocked())
-                    {
-                    iCallback.ExecCommandL( MSysapCallback::EResetKeyguardState );
-                    iKeylock->DisableKeyLock();
-                    iCallback.ExecCommandL( MSysapCallback::ECancelPowermenu );
-                    }
-                // apply default light control
-                iCallback.ExecCommandL( MSysapCallback::EUpdateLights, TUpdateLightsBuf(EKeyGripOpen) );
-                break;
-            
-            case EKeyGripClose:
-                TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyGripClosed") ) );
-                RProperty::Set( KPSUidHWRM, KHWRMGripStatus, EPSHWRMGripClosed );
-                iCallback.ExecCommandL( MSysapCallback::ECancelPowermenu );
-                if ( !IsDeviceLocked() && UiReady() )
-                    {
-                    iKeylock->OfferKeyLock();
-                    }
-                // apply default light control
-                iCallback.ExecCommandL( MSysapCallback::EUpdateLights, TUpdateLightsBuf(EKeyGripClose) );
-                break;
-            
-            case EKeyFlipOpen: // simulated key event
-                {
-                TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyFlipOpen") ) );
-                SetDisplayState( ETrue );
-                // apply default light control
-                iCallback.ExecCommandL( MSysapCallback::EUpdateLights, TUpdateLightsBuf(EKeyFlipOpen) );
-                }
-                break;
-            
-            case EKeyFlipClose: // simulated key event
-                TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyFlipClose") ) );
-                SetDisplayState( EFalse );
-                // apply default light control
-                iCallback.ExecCommandL( MSysapCallback::EUpdateLights, TUpdateLightsBuf(EKeyFlipClose) );
-                break;
-                
-            case EKeyTwistOpen:
-                TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyTwistOpen") ) );
-                RProperty::Set( KPSUidHWRM, KHWRMTwistStatus, EPSHWRMTwistOpen );
-                break;
-                
-            case EKeyTwistClose:
-                TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyTwistClose") ) );
-                RProperty::Set( KPSUidHWRM, KHWRMTwistStatus, EPSHWRMTwistClose );
-                break;                
-
+            {                              
             case EKeyCamera:
                 TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyCamera") ) );
                 if ( iCameraSupported && !IsDeviceLocked() && !DoShowKeysLockedNote() )
@@ -235,17 +138,10 @@
                     ActivateApplicationL( KSysApCamcorderUid );
                     }
                 break;
-                
-            case EKeyPoC:
-                TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyPoC") ) );
-                LaunchPocL();
-                break;                
-             
             default:
                 response = EKeyWasNotConsumed;
                 TRACES( RDebug::Print( _L("CSysApDefaultKeyHandler::CSysApDefaultKeyHandler: key was not consumed.") ) ); 
-                break;
-                    
+                break;               
             }
         }
     
@@ -318,15 +214,17 @@
 //
 void CSysApDefaultKeyHandler::ActivateApplicationL( const TUid aUid ) const
     {
+    TUid check = aUid;
+    
     TRACES( RDebug::Print( _L( "CSysApDefaultKeyHandler::ActivateApplicationL") ) );
     
     // Applications must not be activated before reaching normal system operation state
     if ( UiReady() )
         {
-        CAknTaskList* apaTaskList = CAknTaskList::NewL( CCoeEnv::Static()->WsSession() );
+        CSysApTaskList* apaTaskList = CSysApTaskList::NewLC( CCoeEnv::Static()->WsSession() );
         TApaTask apaTask = apaTaskList->FindRootApp( aUid ); // only root application should not be activated
-        delete apaTaskList;
-        
+        CleanupStack::PopAndDestroy( apaTaskList );
+                
         if ( apaTask.Exists() )
             {
             TRACES( RDebug::Print( _L( "CSysApDefaultKeyHandler::ActivateApplicationL: application brought to foreground") ) );
@@ -336,8 +234,8 @@
                 {
                 TRACES( RDebug::Print( _L("e_CAM_PRI_OFF_TO_ON 1") ) );
                 }
-#endif // _DEBUG            
-            CAknSgcClient::MoveApp ( apaTask.WgId(), ESgcMoveAppToForeground );
+#endif // _DEBUG                        
+            apaTask.BringToForeground();
             }
         else
             {
@@ -380,20 +278,8 @@
 void CSysApDefaultKeyHandler::LaunchPocL()
     {
     TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::LaunchPocL") ) );
-    
-    if ( UiReady() && !IsDeviceLocked() && !DoShowKeysLockedNote() )
-        {
-        CAiwServiceHandler* serviceHandler = CAiwServiceHandler::NewLC();
-        serviceHandler->AttachL( R_POC_AIW_INTEREST );
-            
-        CAiwGenericParamList* inParams = CAiwGenericParamList::NewLC();
-        inParams->AppendL(TAiwGenericParam( EGenericParamPoCLaunchView, TAiwVariant(EAiwPoCMainView)));
-        serviceHandler->ExecuteServiceCmdL( KAiwCmdPoC, *inParams, serviceHandler->OutParamListL());
-        
-        CleanupStack::PopAndDestroy( inParams );
-        CleanupStack::PopAndDestroy( serviceHandler);
-        }
-    }
+    // not supported
+  }
     
 // ----------------------------------------------------------------------------
 // CSysApDefaultKeyHandler::IsDeviceLocked()
@@ -451,25 +337,25 @@
     
     if ( !iAknUiServerConnected )
         {
-        err = iAknUiServer.Connect();
+/*        err = iAknUiServer.Connect();
         
         if ( err != KErrNone )
             {
-            TRACES( RDebug::Print( _L("CSysApDefaultKeyHandler::DoShowKeysLockedNote: RAknUiServer::Connect failed, err=%d"), err ) );
+ //           TRACES( RDebug::Print( _L("CSysApDefaultKeyHandler::DoShowKeysLockedNote: RAknUiServer::Connect failed, err=%d"), err ) );
             return ETrue; // assume that keypad/device is locked
             }
         iAknUiServerConnected = ETrue;            
-        }
+  */      }
     
-    TBool keysLocked;
-    err = iAknUiServer.ShowKeysLockedNote( keysLocked );
+    TBool keysLocked = EFalse;
+/*    err = iAknUiServer.ShowKeysLockedNote( keysLocked );
     
     if ( err != KErrNone )
         {
         TRACES( RDebug::Print( _L("CSysApDefaultKeyHandler::DoShowKeysLockedNote: RAknUiServer::ShowKeysLockedNote failed, err=%d"), err ) );
         keysLocked = ETrue; // assume that keypad/device is locked
         }
-        
+ */       
     return keysLocked;        
     }
 
@@ -500,3 +386,6 @@
     
     return response;        
     }
+
+
+
--- a/coreapplicationuis/SysAp/Src/sysapkeymanagement.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/sysapkeymanagement.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -134,6 +134,10 @@
             {
             iRootWindowGroup.CancelCaptureKeyUpAndDowns( info->iUpAndDownKeyHandles[upAndDownKeyHandleCounter] );
             }
+        for ( TInt keyHandleCounter = info->iLongKeyPressHandle.Count()-1; keyHandleCounter >= 0; keyHandleCounter-- )
+             {
+             iRootWindowGroup.CancelCaptureLongKey( info->iLongKeyPressHandle[keyHandleCounter] );
+             }
         }
     }
 
@@ -166,8 +170,10 @@
                                        captureKey, info->iPluginUid ) );
 			if (info->iIsKeyProvider)
 			    {
+			    TUint repeatValue = 0;
 			    TInt captureUpDownKey = info->iKeys[keyCounter].iScanCode;
 			    TUint modifiers = info->iKeys[keyCounter].iModifiers;
+			    repeatValue = info->iKeys[keyCounter].iRepeats; 
 			    
                 TInt32 keyHandle = iRootWindowGroup.CaptureKey( captureKey, modifiers, modifiers );
                 
@@ -196,6 +202,19 @@
                     //error of Append ignored, key will not be cancelled. We can live with that.
                     TRACES( RDebug::Print( _L("CSysApKeyManagement::CaptureKeys UpAndDowns: Append failed, error %d"), upAndDownKeyHandle ) );
                     }
+                if( repeatValue == 1 )
+                    {
+                    TInt32 longKeyPressHandle = iRootWindowGroup.CaptureLongKey( captureKey, captureKey,0, modifiers,0, ELongCaptureWaitShort);
+                    if ( longKeyPressHandle < KErrNone )
+                        {
+                       TRACES( RDebug::Print( _L("CSysApKeyManagement::CaptureLongKey : error %d"), longKeyPressHandle ) );
+                       continue; // other keys may be possible to capture, so continue
+                        }
+                    if ( ( longKeyPressHandle = info->iLongKeyPressHandle.Append( longKeyPressHandle ) ) != KErrNone ) //store handle for CancelCaptureKeyUpAndDowns
+                         {
+                          TRACES( RDebug::Print( _L("CSysApKeyManagement::CaptureLongKey : Append failed, error %d"), longKeyPressHandle ) );
+                         }                               
+                    }
 			    }
 			else
 			    {
--- a/coreapplicationuis/SysAp/Src/sysapremconobserver.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/sysapremconobserver.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 #include <remconcoreapitarget.h>
 #include <remconinterfaceselector.h>
-#include <aknconsts.h>
+//#include <aknconsts.h>
 #include "sysapremconobserver.h"
 #include "SysApAppUi.h"
 
@@ -102,13 +102,13 @@
 	        || aOperationId == ERemConCoreApiMute )
 	        {
             // A volume key is pressed down
-/*            TRAPD( err, iSysApAppUi.ShowUiNoteL( EFmTxVolumeDisabledNote ) );
+            TRAPD( err, iSysApAppUi.ShowUiNoteL( EFmTxVolumeDisabledNote ) );
             
             if ( err != KErrNone )
                 {
                 TRACES( RDebug::Print( _L("CSysApRemConObserver::MrccatoCommand: err=%d"), err ) );
                 }
-*/	        }
+	        }
 	    }
 	}
 
--- a/coreapplicationuis/SysAp/rom/SysAp.iby	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/rom/SysAp.iby	Tue Jun 29 10:40:11 2010 +0300
@@ -20,6 +20,7 @@
 #define __SysAp_IBY__
 
 file=ABI_DIR\BUILD_DIR\NspsWsPlugin.dll         SHARED_LIB_DIR\NspsWsPlugin.dll
+data=DATAZ_\resource\apps\qgn_sysap_screen.svg        resource\apps\qgn_sysap_screen.svg
 
 S60_APP_EXE(SysAp)
 S60_APP_AIF_RSC(SysAp)
--- a/coreapplicationuis/advancedtspcontroller/data/keyevent.rul	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/data/keyevent.rul	Tue Jun 29 10:40:11 2010 +0300
@@ -22,9 +22,9 @@
             />
             
             <Tsp
-            routingTable='01'            
+            routingTable='01'           
+	    ruleActiveAudio='00' 
             ruleForeground='01'
-            ruleActiveAudio='00'
             ruleLastPlayedAudio='03'
             ruleDefaultApp='02'
             defaultApplicationPhone='100058B3'
@@ -113,9 +113,8 @@
             ruleActiveAudio='00'
             ruleLastPlayedAudio='03'
             ruleForeground='01' 
-            ruleDefaultApp='02'
-            defaultApplicationPhone='100058B3'
-            transparentApplicationBTAudioMan='10208971'
+	    ruleLaunchDefaultApp='04'
+            defaultLaunchApp='102072C3'
             />
             
             <Tsp
@@ -130,7 +129,6 @@
             ruleLastPlayedAudio='03'
             ruleDefaultApp='02'
             defaultApplicationPhone='100058B3'
-            transparentApplicationBTAudioMan='10208971'
 	    />
             
             <Tsp
--- a/coreapplicationuis/advancedtspcontroller/group/RemConTspController.mmp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/group/RemConTspController.mmp	Tue Jun 29 10:40:11 2010 +0300
@@ -29,7 +29,8 @@
 SOURCE          remcontspcontrollermain.cpp
 SOURCE          remcontspcontroller.cpp
 SOURCE          remconidlelistener.cpp
-SOURCE          remconeventtable.cpp
+SOURCE          remconeventtable.cpp 
+SOURCE          tsptriggerevents.cpp
 
 START RESOURCE  ../data/10282CD5.rss
 target          advancedtspcontroller.rsc
--- a/coreapplicationuis/advancedtspcontroller/inc/remcontspcontroller.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/inc/remcontspcontroller.h	Tue Jun 29 10:40:11 2010 +0300
@@ -29,9 +29,10 @@
 #include <cfclient.h>
 #include <cflistener.h>
 #include <AudioClientsListPSData.h>
+#include <remcon/clientinfo.h>
 #include "remconidlelistener.h"
 #include "remconeventtable.h"
-
+#include "tsptriggerevents.h"
 // CONSTANTS
 
 // MACROS
@@ -57,7 +58,10 @@
 class CRemConTspController : public CRemConTargetSelectorPlugin,
                  public MRemConTargetSelectorPluginInterfaceV2,
                  public MRemConTargetSelectorPluginInterfaceV3,
-			     public MCFListener
+                 public MRemConTargetSelectorPluginInterfaceV4,
+                 public MRemConTargetSelectorPluginInterfaceV5,
+			     public MCFListener,
+                 public MTspRulesTriggerObserver
 	{
 	public:		// Constructors and destructor
 		
@@ -243,6 +247,85 @@
                 const TClientInfo& aSender,
                 const TRemConAddress& aConnection);
         
+        /**
+        Called by RemCon to get the TSP to permit an incoming command. This is called
+        if the bearer has provided a target client for the command.  
+        
+        The implementor should decide if they wish to allow this command and then call
+        IncomingCommandPermitted on the observer with a suitable error. 
+        
+        @param aInterfaceUid The UID of the client interface.
+        @param aOperationId The operation ID of the command.
+        @param aClient a TClientInfo referring to the selected client
+        */
+        virtual void PermitIncomingCommand(
+            TUid aInterfaceUid,
+            TUint aOperationId, 
+            const TClientInfo& aClient);
+        
+        /**
+        Called by RemCon to get the TSP to permit an incoming Notify. This is called
+        if the bearer has provided a target client for the Notify.  
+        
+        The implementor should decide if they wish to allow this Notify and then call
+        IncomingNotifyPermitted on the observer with a suitable error. 
+        
+        @param aInterfaceUid The UID of the client interface.
+        @param aOperationId The operation ID of the Notify.
+        @param aClient a TClientInfo referring to the selected client
+        */
+        virtual void PermitIncomingNotify(
+            TUid aInterfaceUid,
+            TUint aOperationId, 
+            const TClientInfo& aClient);
+
+        /** 
+        Called by RemCon when a bearer that can address commands wishes to
+        inform the system that there has been a remote user action to 
+        select a different addressed client.
+        
+        The bearer will then route addressed commands to this client until
+        such time as SetRemoteAddressedClient is called again or the TSP
+        calls SetLocalAddressedClient.
+        
+        @param aBearerUid The bearer that has changed its addressed client
+        @param aClient The RemCon client that is now selected by the bearer
+        */
+        virtual void SetRemoteAddressedClient(const TUid& aBearerUid, 
+                const TClientInfo& aClient);
+        /** Called by RemCon when a new target client has connected.
+         
+         @aClientInfo The information about the new client.
+         */
+        void TargetClientAvailable(const TClientInfo& aClientInfo);
+        
+        /** Called by RemCon when a target client has disconnected. 
+         
+         @aClientInfo The information about the client that has disconnected.
+         */
+        void TargetClientUnavailable(const TClientInfo& aClientInfo);
+        
+        /** Called by RemCon when a bearer wishes to begin being informed when
+        the locally addressed player changes.  Once this function has been called
+        the TSP should inform RemCon via SetLocalAddressedPlayer each time the
+        player to which incoming commands from aBearer would be routed changes.
+        This might occur for example if a new application is launched, or if the
+        foreground application changes, depending on what the TSP's rules are
+        for deciding the target of the incoming message.  These updates should
+        occur until UnregisterLocalAddressedClientObserver is called.
+        
+        @param aBearerUid The bearer that wishes to be informed of updates
+        */
+        TInt RegisterLocalAddressedClientObserver(const TUid& aBearerUid);
+
+        /** Called by RemCon when a bearer wishes to stop being informed of 
+        changes to the local addresse client.
+        
+        @param aBearerUid The bearer that no longer wishes to be informed of updates
+        */
+        TInt UnregisterLocalAddressedClientObserver(const TUid& aBearerUid);
+
+        
 	    // From MCFListener
 	    
 	    /**
@@ -291,6 +374,8 @@
             const TDesC& aSource,
             const TDesC& aType );
             
+        // from MTspRulesTriggerObserver
+        void MtrtoEvaluateRoutingRules();
         /**
         * Gets the foreground application.
         * 
@@ -329,8 +414,9 @@
 	    void GetCorrectClientL(
             TUid aInterfaceUid,
         	TUint aKeyEvent,
-        	TSglQue<TClientInfo>& aClients );
-        
+        	TSglQue<TClientInfo>& aClients,
+        	TBool aLaunchingNewApplicationAllowed);
+
         void SetKeyEventTableL( const CCFActionIndication& aActionToExecute );        
 
         void ActivateApplicationL( const TUid aUid ) const;
@@ -352,12 +438,26 @@
         */
         TBool DeviceLocked() const;
 
-	private:    // Data
-	    
-	    // owned
-		CRemConIdleListener* iIdle;
-		
-		// Interface to P&S key that returns call state
+        /**
+         * Decide if locally addressed client should be updated.
+         */
+        TClientInfo* GetLocalAddressedClient();
+
+private:
+        NONSHARABLE_STRUCT(TClientObserver)
+            {
+        public:
+            TClientObserver(TUid aBearerUid) : iBearerUid(aBearerUid) {};
+        public:
+            TUid iBearerUid;
+            TSglQueLink iClientObserverQueLink;
+            };
+
+private:    // Data
+        // owned
+        CRemConIdleListener* iIdle;
+
+        // Interface to P&S key that returns call state
         RProperty iProperty;
         
         CCFClient* iCFClient;
@@ -371,6 +471,16 @@
         TProcessId iProcessIdActive;
 
         RPointerArray<CRemConEventTable> iArrayOfStoredTables;
+        
+        TSglQue<TClientObserver> iClientObservers;
+        
+        TSglQue<TClientInfo> iAvailableTargets;
+        
+        TSglQue<TClientInfo> iTargetsForAddressing;
+        
+        TClientInfo* iLocalAddressedClient;
+        
+        CTspTriggerEventsWatcher* iTriggerEventsWatcher;
 	
 	public:     // Friend classes
 	
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/advancedtspcontroller/inc/tsptriggerevents.h	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,104 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Observes changes in the default player that should be used for a bearer
+*/
+
+#include <e32base.h>
+#include <e32property.h>
+#include <w32std.h>
+
+
+NONSHARABLE_CLASS(MTspRulesTriggerObserver)
+    {
+public:
+    virtual void MtrtoEvaluateRoutingRules() = 0;
+    };
+
+NONSHARABLE_CLASS(CActiveAudioClientObserver) : public CActive
+    {
+public:
+    static CActiveAudioClientObserver* NewL(MTspRulesTriggerObserver& aObserver);
+    ~CActiveAudioClientObserver();
+
+private:
+    // from CActive
+    void RunL();
+    void DoCancel();
+    
+    CActiveAudioClientObserver(MTspRulesTriggerObserver& aObserver);
+    void ConstructL();
+
+private:
+    MTspRulesTriggerObserver& iObserver;
+    RProperty iAudioApplication;
+    };
+
+NONSHARABLE_CLASS(CTspClientMapperObserver) : public CActive
+    {
+public:
+    static CTspClientMapperObserver* NewL(MTspRulesTriggerObserver& aObserver);
+    ~CTspClientMapperObserver();
+
+private:
+    // from CActive
+    void RunL();
+    void DoCancel();
+    
+    CTspClientMapperObserver(MTspRulesTriggerObserver& aObserver);
+    void ConstructL();
+
+private:
+    MTspRulesTriggerObserver& iObserver;
+    RProperty iPlayingClients;
+    };
+
+NONSHARABLE_CLASS(CWsEventsObserver) : public CActive
+    {
+public:
+    static CWsEventsObserver* NewL(MTspRulesTriggerObserver& aObserver);
+    ~CWsEventsObserver();
+    
+private:
+    // from CActive
+    void RunL();
+    void DoCancel();
+    
+    CWsEventsObserver(MTspRulesTriggerObserver& aObserver);
+    void ConstructL();
+    
+private:
+    MTspRulesTriggerObserver& iObserver;
+    RWsSession iWsSession;
+    RWindowGroup iWindowGroup;
+    };
+
+NONSHARABLE_CLASS(CTspTriggerEventsWatcher) : public CBase
+    {
+public:
+    static CTspTriggerEventsWatcher* NewL(MTspRulesTriggerObserver& aObserver);
+    ~CTspTriggerEventsWatcher();
+    TInt AddBearer(TUid& aBearerUid);
+    TInt RemoveBearer(TUid& aBearerUid);
+
+private:
+    CTspTriggerEventsWatcher(MTspRulesTriggerObserver& aObserver);
+    void ConstructL();
+
+private:
+    MTspRulesTriggerObserver& iObserver;
+    CActiveAudioClientObserver* iAudioClientObserver;
+    CWsEventsObserver* iWsEventsObserver;
+    CTspClientMapperObserver* iClientMapperObserver;
+    };
+
--- a/coreapplicationuis/advancedtspcontroller/src/remcontspcontroller.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/src/remcontspcontroller.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -61,6 +61,8 @@
 // LOCAL CONSTANTS AND MACROS
 
 const TUint32 KUid3MusicPlayer = 0x102072C3;
+const TUint32 KUid3PhoneApp = 0x100058B3; 
+const TUint32 KUid3VoiceCmdApp = 0x102818e7;
 
 //#define __MODULE_TEST__
 
@@ -108,9 +110,11 @@
 // -----------------------------------------------------------------------------
 //
 
-CRemConTspController::CRemConTspController( 
-								MRemConTargetSelectorPluginObserver& aObserver )
-:	CRemConTargetSelectorPlugin( aObserver )
+CRemConTspController::CRemConTspController(MRemConTargetSelectorPluginObserver& aObserver )
+    : CRemConTargetSelectorPlugin( aObserver )
+    , iClientObservers(_FOFF(TClientObserver, iClientObserverQueLink))
+    , iAvailableTargets(_FOFF(TClientInfo, iLink))
+    , iTargetsForAddressing(_FOFF(TClientInfo, iLink2))
 	{
 	}
     
@@ -154,6 +158,24 @@
 	    }
     iArrayOfTables.ResetAndDestroy();
     iArrayOfStoredTables.ResetAndDestroy();
+    
+    TClientInfo* clientInfo;
+    while(!iAvailableTargets.IsEmpty())
+        {
+        clientInfo = iAvailableTargets.First();
+        iAvailableTargets.Remove(*clientInfo);
+        delete clientInfo;
+        }
+
+    TClientObserver* clientObserver;
+    while(!iClientObservers.IsEmpty())
+        {
+        clientObserver = iClientObservers.First();
+        iClientObservers.Remove(*clientObserver);
+        delete clientObserver;
+        }
+    iTargetsForAddressing.Reset(); 
+    delete iTriggerEventsWatcher;
 	COM_TRACE_( "[REMCONTSPCONTROLLER] CRemConTspController::~CRemConTspController() - return" );
 	}
 
@@ -186,6 +208,16 @@
 		ret = reinterpret_cast<TAny*>(
 			static_cast<MRemConTargetSelectorPluginInterfaceV3*>(this) );
 		}
+    else if ( aUid == TUid::Uid(KRemConTargetSelectorInterface4) )
+        {
+        ret = reinterpret_cast<TAny*>(
+            static_cast<MRemConTargetSelectorPluginInterfaceV4*>(this) );
+        }
+    else if ( aUid == TUid::Uid(KRemConTargetSelectorInterface5) )
+        {
+        ret = reinterpret_cast<TAny*>(
+            static_cast<MRemConTargetSelectorPluginInterfaceV5*>(this) );
+        }
 	COM_TRACE_1( "[REMCONTSPCONTROLLER] CRemConTspController::GetInterface() this=%d", ret );
 	return ret;
 	}
@@ -338,9 +370,7 @@
 #ifdef _DEBUG	
 	TraceRemconTargets( aClients );
 #endif
-	
-	TRAPD( err, GetCorrectClientL( aInterfaceUid, aOperationId, aClients ) );
-	
+	TRAPD( err, GetCorrectClientL( aInterfaceUid, aOperationId, aClients, ETrue ) );
 	Observer().IncomingCommandAddressed( err );
 	
 	COM_TRACE_( "[REMCONTSPCONTROLLER] CRemConTspController::AddressIncomingCommand() ends" );
@@ -397,6 +427,228 @@
     }
 
 // -----------------------------------------------------------------------------
+// CRemConTspController::PermitIncomingCommand
+// By default, permit all incoming addressed commands.  Check if the command
+// comes from the AVRCP bearer an if so launch the music player.
+// -----------------------------------------------------------------------------
+void CRemConTspController::PermitIncomingCommand(
+    TUid aInterfaceUid,
+    TUint aOperationId, 
+    const TClientInfo& aClient)
+    {
+	(void) aClient;  // Not used. 
+    // Here we need to check the incoming command.  If it is an AVRCP play
+    // command and there is no sensible handler running we should launch the
+    // MPX Music Player.  This is the same as for AddressIncomingCommand.
+    // Check if appropriate handler running
+    if ((aInterfaceUid != TUid::Uid(KRemConCoreApiUid)) ||
+         (aOperationId != ERemConCoreApiPlay) ||
+         GetLocalAddressedClient())
+        {
+        // no action needed, allow commmand
+        Observer().IncomingCommandPermitted(ETrue);
+        }
+     else 
+        {
+        // Launch an appropriate player in playing state. 
+        TRAPD(err, ActivateApplicationL(TUid::Uid(KUid3MusicPlayer)))
+        if(err != KErrNone)
+            {
+
+            }
+
+        //deny this command
+        Observer().IncomingCommandPermitted(EFalse);
+
+        // We will be informed when the MPX music player connects its client 
+        // session.  That will trigger a rules evaluation which will result in
+        // us informing interested bearers of the new local addressed player.
+        }
+    }
+
+// -----------------------------------------------------------------------------
+// CRemConTspController::PermitIncomingNotify
+// By default, permit all incoming addressed commands.  Check if the command
+// comes from the AVRCP bearer an if so launch the music player.
+// -----------------------------------------------------------------------------
+void CRemConTspController::PermitIncomingNotify(
+    TUid /*aInterfaceUid*/,
+    TUint /*aOperationId*/, 
+    const TClientInfo& /*aClient*/)
+    {
+    // No reason to stop these, just allow all
+    Observer().IncomingNotifyPermitted(ETrue);
+    }
+
+// -----------------------------------------------------------------------------
+// CRemConTspController::SetRemoteAddressedClient
+// Ignore this event.  We don't use what the remote has selected to influence
+// our routing policy.
+// -----------------------------------------------------------------------------
+void CRemConTspController::SetRemoteAddressedClient(const TUid& /*aBearerUid*/, 
+        const TClientInfo& /*aClient*/)
+    {
+    }
+
+// -----------------------------------------------------------------------------
+// CRemConTspController::TargetClientAvailable
+// A new client has connected.  Trigger a rule evaluation to see if we want to switch
+// to this client.
+// -----------------------------------------------------------------------------
+void CRemConTspController::TargetClientAvailable(const TClientInfo& aClientInfo)
+    {
+    COM_TRACE_1("[REMCONTSPCONTROLLER] CRemConTspController::TargetClientAvailable aClientInfo.SecureId=0x%x", aClientInfo.SecureId().iId);
+
+    TClientInfo* clientInfo;
+    TSglQueIter<TClientInfo> iter(iAvailableTargets);
+    
+    while((clientInfo = iter++) != NULL)
+        {
+        if(clientInfo->SecureId() == aClientInfo.SecureId())
+            {
+            // Found a client and clientInfo points to that now. 
+            break; 
+            }
+        }
+    
+    // If clientInfo was not found, create it and add to the available targets queue. 
+    if(!clientInfo)
+        {
+        TClientInfo* newTarget = new TClientInfo();
+        if(newTarget)
+            {
+            newTarget->ProcessId() = aClientInfo.ProcessId();
+            newTarget->SecureId() = aClientInfo.SecureId();
+            
+            // Add to our list of available targets
+            iAvailableTargets.AddLast(*newTarget);
+            }
+        }
+
+    // Re-evaluate what the default addressed player should be if someone is interested to know 
+    if(!iClientObservers.IsEmpty())
+        {
+        MtrtoEvaluateRoutingRules();
+        }
+    }
+
+// -----------------------------------------------------------------------------
+// CRemConTspController::TargetClientUnavailable
+// A client has disconnected.  Trigger a rule evaluation to see if our default
+// player has changed.
+// -----------------------------------------------------------------------------
+void CRemConTspController::TargetClientUnavailable(const TClientInfo& aClientInfo)
+    {
+    COM_TRACE_1("[REMCONTSPCONTROLLER] CRemConTspController::TargetClientUnavailable aClientInfo.SecureId=0x%x", aClientInfo.SecureId().iId);
+
+    // Remove this from our list of available targets
+    if(!iAvailableTargets.IsEmpty())
+        {
+        TClientInfo* clientInfo;
+        TSglQueIter<TClientInfo> iter(iAvailableTargets);
+        while((clientInfo = iter++) != NULL)
+            {
+            if(clientInfo->SecureId() == aClientInfo.SecureId())
+                {
+                iAvailableTargets.Remove(*clientInfo);
+                delete clientInfo;
+                break;
+                }
+            }
+        }
+
+    if(!iClientObservers.IsEmpty())
+        {
+        // Re-evaluate what the default addressed player should be if someone is listening. 
+        MtrtoEvaluateRoutingRules();
+        }
+    }
+
+// -----------------------------------------------------------------------------
+// CRemConTspController::RegisterLocalAddressedClientObserver
+// A bearer is interested in what the local addressed player is.  Start observing.
+// -----------------------------------------------------------------------------
+TInt CRemConTspController::RegisterLocalAddressedClientObserver(const TUid& aBearerUid)
+    {
+    COM_TRACE_1("[REMCONTSPCONTROLLER] CRemConTspController::RegisterLocalAddressedClientObserver aBearerUid.SecureId=0x%x", aBearerUid.iUid);
+    TInt err = KErrNone;
+    // Add this to our list of bearers interested in the default addressed player
+    TClientObserver* clientObserver = new TClientObserver(aBearerUid);
+
+    if(!clientObserver)
+        {
+        err = KErrNoMemory; 
+        }
+
+    // If this is our first interested bearer kick off the trigger events watcher.
+    // This will let us know if any event occurs that should trigger us to re-evaluate
+    // our addressing rules
+    if(!iTriggerEventsWatcher && err == KErrNone)
+        {
+        TRAP(err, iTriggerEventsWatcher = CTspTriggerEventsWatcher::NewL(*this));
+        if(err != KErrNone)
+            {
+            // If we couldn't create the events watcher the client Observer is not needed either.
+            delete clientObserver;
+            }
+        }
+
+    if(err == KErrNone)
+        {
+        // Finally add the observer to the queue if it's not there yet. 
+        TSglQueIter<TClientObserver> iter(iClientObservers);
+        TClientObserver* obsInQueue;
+        while((obsInQueue = iter++) != NULL)
+            {
+            if(obsInQueue->iBearerUid == aBearerUid)
+                {
+                err = KErrAlreadyExists; 
+                break;
+                }
+            }
+
+        if(!obsInQueue)
+            {
+            iClientObservers.AddLast(*clientObserver);
+            MtrtoEvaluateRoutingRules();
+            }
+        }
+
+    return err;
+    }
+
+// -----------------------------------------------------------------------------
+// CRemConTspController::UnregisterLocalAddressedClientObserver
+// The bearer is no longer interested in observering default client changes.
+// -----------------------------------------------------------------------------
+TInt CRemConTspController::UnregisterLocalAddressedClientObserver(const TUid& aBearerUid)
+    {
+    COM_TRACE_1("[REMCONTSPCONTROLLER] CRemConTspController::UnregisterLocalAddressedClientObserver aBearerUid.SecureId=0x%x", aBearerUid.iUid);
+    // Remove this from our list of bearers interested in the default addressed player.
+    // If there are no interested bearers left then we can stop watching for rules
+    // triggers.
+    TSglQueIter<TClientObserver> iter(iClientObservers);
+    TClientObserver* clientObserver;
+    while((clientObserver = iter++) != NULL)
+        {
+        if(clientObserver->iBearerUid == aBearerUid)
+            {
+            iClientObservers.Remove(*clientObserver);
+	    delete clientObserver;
+            break;
+            }
+        }
+    
+    if(iClientObservers.IsEmpty())
+        {
+        delete iTriggerEventsWatcher;
+        iTriggerEventsWatcher = NULL;
+        }
+    
+    return KErrNone;
+    }
+
+// -----------------------------------------------------------------------------
 // CRemConTspController::GetCorrectClientL
 // Defines remote targets to which command will be sent.
 // (other items were commented in a header).
@@ -405,10 +657,12 @@
 void CRemConTspController::GetCorrectClientL(
     TUid aInterfaceUid,
 	TUint aKeyEvent,
-	TSglQue<TClientInfo>& aClients )
+	TSglQue<TClientInfo>& aClients,
+	TBool aLaunchingNewApplicationAllowed)
 	{
 	COM_TRACE_1( "[REMCONTSPCONTROLLER] CRemConTspController::GetCorrectClientL() Start aInterfaceUid %d", aInterfaceUid );
 	COM_TRACE_1( "[REMCONTSPCONTROLLER] CRemConTspController::GetCorrectClientL() Start aKeyEvent %d", aKeyEvent );
+
     TInt numOfTables = iArrayOfTables.Count();
     RArray<TInt> rulesArray;
     CleanupClosePushL( rulesArray );
@@ -513,6 +767,7 @@
             	    TProcessId processId = target->ProcessId();
             	    if( iProcessIdForeground == processId )
             	        {
+                        COM_TRACE_( "[REMCONTSPCONTROLLER] CRemConTspController::GetCorrectClientL() Foreground client found" );
             	        aClients.Reset();
             	        aClients.AddFirst( *target );
             	        found = ETrue;
@@ -613,7 +868,7 @@
             case CRemConEventTable::ELaunchDefaultApp:
                 {
                 COM_TRACE_( "[REMCONTSPCONTROLLER] CRemConTspController::GetCorrectClientL() Launch default application" );                
-                if ( !DeviceLocked() )
+                if ( !DeviceLocked() && aLaunchingNewApplicationAllowed )
                     {
                     TUid defaultLaunchAppUid;
                     
@@ -648,6 +903,9 @@
         else if( rulesArray.Count() - 1 == i )
             {
             COM_TRACE_( "[REMCONTSPCONTROLLER] CRemConTspController::GetCorrectClientL() No client found");
+            // Reset the list to reflect the fact that no clients were found. 
+            // The possible transparent clients will be added still. 
+            aClients.Reset();
             }
         }
 
@@ -657,7 +915,8 @@
         TClientInfo* target = transparentClients[ i ];
         if ( !FindRemconConnection( target->SecureId(), aClients ) ) // Add client only if not already found
             {
-            aClients.AddFirst( *target );
+            // Add to the end of the list, any other client should take priority over the transparent clients. 
+            aClients.AddLast( *target );  
             COM_TRACE_1( "[REMCONTSPCONTROLLER] CRemConTspController::GetCorrectClientL() transparent client 0x%x added", target->SecureId().iId );
             }
         }
@@ -1059,6 +1318,40 @@
     }
 
 // -----------------------------------------------------------------------------
+// CRemConTspController::MtrtoEvaluateRoutingRules
+// Evaluates the TSP's routing rules to determine if the local addressed player
+// has changed, and if so informs interested bearers
+// -----------------------------------------------------------------------------
+void CRemConTspController::MtrtoEvaluateRoutingRules()
+    {
+    COM_TRACE_( "[REMCONTSPCONTROLLER] CRemConTspController::MtrtoEvaluateRoutingRules() - Enter" ); 
+    TClientInfo* localAddressedClient = GetLocalAddressedClient();
+
+    if(!localAddressedClient)
+        {
+        // If there's no suitable client, then there's nothing to do here.   
+        COM_TRACE_( "[REMCONTSPCONTROLLER] CRemConTspController::MtrtoEvaluateRoutingRules() No local addressed client found" ); 
+        return; 
+        }
+
+    if(!iLocalAddressedClient || (localAddressedClient->SecureId() != iLocalAddressedClient->SecureId()))
+        {
+        // Local addressed player has changed (or wasn't set before).  
+        iLocalAddressedClient = localAddressedClient;
+        COM_TRACE_( "[REMCONTSPCONTROLLER] CRemConTspController::MtrtoEvaluateRoutingRules() Local addressed client has changed" ); 
+        TSglQueIter<TClientObserver> iter(iClientObservers);
+        TClientObserver* clientObserver;
+        while((clientObserver = iter++) != NULL)
+            {
+            COM_TRACE_( "[REMCONTSPCONTROLLER] CRemConTspController::MtrtoEvaluateRoutingRules() - informing observer" ); 
+            Observer().SetLocalAddressedClient(clientObserver->iBearerUid, *iLocalAddressedClient);
+            }
+        }
+    COM_TRACE_1( "[REMCONTSPCONTROLLER] CRemConTspController::MtrtoEvaluateRoutingRules() Local addressed client SID = 0x%x",  iLocalAddressedClient->SecureId().iId);
+    COM_TRACE_( "[REMCONTSPCONTROLLER] CRemConTspController::MtrtoEvaluateRoutingRules() - Return" ); 
+    }
+
+// -----------------------------------------------------------------------------
 // CRemConTspController::CreateAfterIdleL
 // Define the contexts when idle state has been loaded.
 // (other items were commented in a header).
@@ -1247,6 +1540,8 @@
             CApaCommandLine* apaCommandLine = CApaCommandLine::NewLC();
             apaCommandLine->SetExecutableNameL( appInfo.iFullName );
             apaCommandLine->SetCommandL( EApaCommandRun );            
+            _LIT8(Kparam, "play");
+            apaCommandLine->SetTailEndL( Kparam );
             apaLsSession.StartApp( *apaCommandLine );
             CleanupStack::PopAndDestroy( apaCommandLine );
             }
@@ -1485,4 +1780,50 @@
     return EFalse;
     }
 
+//----------------------------------------------------------------------------------
+// CRemConTspController::GetLocalAddressedClient
+// Uses TSP rules to determine what local addressed client should be.
+//-----------------------------------------------------------------------------------
+TClientInfo* CRemConTspController::GetLocalAddressedClient()
+    {
+    COM_TRACE_( "[REMCONTSPCONTROLLER] CRemConTspController::GetLocalAddressedClient() Entry");
+    // Create list of available clients to allow re-use of existing rule 
+    // evaluation function, GetCorrectClientL
+    iTargetsForAddressing.Reset();
+    TSglQueIter<TClientInfo> iter(iAvailableTargets);
+    TClientInfo* clientInfo;
+    while((clientInfo = iter++) != NULL)
+        {
+        iTargetsForAddressing.AddLast(*clientInfo);
+        }
+    
+#ifdef _DEBUG   
+    TraceRemconTargets( iTargetsForAddressing );
+#endif
+    
+    TRAPD(err, GetCorrectClientL(TUid::Uid(KRemConCoreApiUid), ERemConCoreApiPlay, iTargetsForAddressing, EFalse));
+    if(iTargetsForAddressing.IsEmpty() || err)
+        {
+        clientInfo = NULL;
+        COM_TRACE_( "[REMCONTSPCONTROLLER] CRemConTspController::GetLocalAddressedClient() No target Found");
+        }
+    else
+        {
+        // We don't want to set the phone application or voice command handler as local addressed client. 
+        // So choose the first item that is neither of those. The clientInfo may be NULL in the end. 
+        TSglQueIter<TClientInfo> localAddressedIter(iTargetsForAddressing);
+        while((clientInfo = localAddressedIter++) != NULL)
+            {
+            if( clientInfo->SecureId() != TSecureId(KUid3PhoneApp) || 
+                clientInfo->SecureId() != TSecureId(KUid3VoiceCmdApp) )
+                {
+                COM_TRACE_1( "[REMCONTSPCONTROLLER] CRemConTspController::GetLocalAddressedClient() Local addressed client SID = %08x",  clientInfo->SecureId().iId);
+                break;
+                }
+            }
+        }
+
+    return clientInfo;
+    }
+
 // End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/advancedtspcontroller/src/tsptriggerevents.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,212 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Observes changes in the default player that should be used for a bearer
+*/
+
+#include <AudioClientsListPSKeys.h>
+#include "tsptriggerevents.h"
+#include "RemConDebug.h"
+//-----------------------------------------------------------------------
+// CTspTriggerEventsWatcher
+//-----------------------------------------------------------------------
+CTspTriggerEventsWatcher* CTspTriggerEventsWatcher::NewL(MTspRulesTriggerObserver& aObserver)
+    {
+    CTspTriggerEventsWatcher* self = new(ELeave)CTspTriggerEventsWatcher(aObserver);
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    CleanupStack::Pop(self);
+    return self;
+    }
+
+CTspTriggerEventsWatcher::CTspTriggerEventsWatcher(MTspRulesTriggerObserver& aObserver)
+    : iObserver(aObserver)
+    {
+    }
+
+void CTspTriggerEventsWatcher::ConstructL()
+    {
+    // Create WServ event watcher
+    iWsEventsObserver = CWsEventsObserver::NewL(iObserver);
+    
+    // Create observer for audio routing
+    iAudioClientObserver = CActiveAudioClientObserver::NewL(iObserver);
+    
+    // Create observer for TSP client mapper
+    iClientMapperObserver = CTspClientMapperObserver::NewL(iObserver);
+    }
+
+CTspTriggerEventsWatcher::~CTspTriggerEventsWatcher()
+    {
+    delete iAudioClientObserver;
+    delete iWsEventsObserver;
+    delete iClientMapperObserver;
+    }
+
+//-----------------------------------------------------------------------
+// CWsEventsObserver
+//-----------------------------------------------------------------------
+CWsEventsObserver* CWsEventsObserver::NewL(MTspRulesTriggerObserver& aObserver)
+    {
+    CWsEventsObserver* self = new(ELeave)CWsEventsObserver(aObserver);
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    CleanupStack::Pop(self);
+    return self;
+    }
+
+CWsEventsObserver::~CWsEventsObserver()
+    {
+    Cancel(); 
+    iWindowGroup.Close(); 
+    iWsSession.Close();
+    }
+
+CWsEventsObserver::CWsEventsObserver(MTspRulesTriggerObserver& aObserver)
+    : CActive(CActive::EPriorityStandard), iObserver(aObserver), iWsSession(), iWindowGroup(iWsSession)
+    {
+    }
+
+void CWsEventsObserver::ConstructL()
+    {
+    // Register to recieve WServ events
+    CActiveScheduler::Add(this);    
+    User::LeaveIfError(iWsSession.Connect());
+    iWindowGroup = RWindowGroup(iWsSession); 
+    User::LeaveIfError(iWindowGroup.Construct(reinterpret_cast<TUint32>(this), EFalse));
+    iWindowGroup.SetOrdinalPosition(-1); 
+    iWindowGroup.DefaultOwningWindow(); 
+    iWindowGroup.EnableReceiptOfFocus(EFalse);    
+    iWindowGroup.EnableGroupListChangeEvents(); // For changes in z-order 
+    iWsSession.EventReady(&iStatus);
+    SetActive(); 
+    }
+
+
+void CWsEventsObserver::RunL()
+    {
+    COM_TRACE_( "[REMCONTSPCONTROLLER] CWsEventsObserver::RunL" );
+    TWsEvent event;
+    iWsSession.GetEvent(event);
+    iWsSession.EventReady(&iStatus);
+    SetActive(); 
+    if(event.Type() == EEventWindowGroupListChanged)
+        {
+        COM_TRACE_( "[REMCONTSPCONTROLLER] CWsEventsObserver::RunL - EEventWindowGroupListChanged" );
+        iObserver.MtrtoEvaluateRoutingRules();
+        }
+    }
+
+void CWsEventsObserver::DoCancel()
+    {
+    iWsSession.EventReadyCancel();
+    }
+
+//-----------------------------------------------------------------------
+// CActiveAudioClientObserver
+//-----------------------------------------------------------------------
+CActiveAudioClientObserver* CActiveAudioClientObserver::NewL(MTspRulesTriggerObserver& aObserver)
+    {
+    CActiveAudioClientObserver* self = new(ELeave)CActiveAudioClientObserver(aObserver);
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    CleanupStack::Pop(self);
+    return self;
+    }
+
+CActiveAudioClientObserver::~CActiveAudioClientObserver()
+    {
+    Cancel(); 
+    iAudioApplication.Close();
+    }
+
+CActiveAudioClientObserver::CActiveAudioClientObserver(MTspRulesTriggerObserver& aObserver)
+    : CActive(CActive::EPriorityStandard), iObserver(aObserver)
+    {
+    }
+
+void CActiveAudioClientObserver::ConstructL()
+    {
+    User::LeaveIfError(iAudioApplication.Attach(KPSUidMMFAudioServer, KAudioPolicyApplicationAudioStatePlaying));
+    CActiveScheduler::Add(this);    
+    iAudioApplication.Subscribe(iStatus);
+    SetActive(); 
+    }
+
+
+void CActiveAudioClientObserver::RunL()
+    {
+    // Doesn't matter what the value is - that'll be checked when evaluation
+    // the TSP target rules.  Inform the TSP of the value change and 
+    // re-subscribe.
+    COM_TRACE_( "[REMCONTSPCONTROLLER] CWsEventsObserver::RunL" );
+    iAudioApplication.Subscribe(iStatus);
+    SetActive(); 
+    iObserver.MtrtoEvaluateRoutingRules();
+    }
+
+void CActiveAudioClientObserver::DoCancel()
+    {
+    iAudioApplication.Cancel();
+    }
+
+//-----------------------------------------------------------------------
+// CTspClientMapperObserver
+//-----------------------------------------------------------------------
+CTspClientMapperObserver* CTspClientMapperObserver::NewL(MTspRulesTriggerObserver& aObserver)
+    {
+    CTspClientMapperObserver* self = new(ELeave)CTspClientMapperObserver(aObserver);
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    CleanupStack::Pop(self);
+    return self;
+    }
+
+CTspClientMapperObserver::~CTspClientMapperObserver()
+    {
+    Cancel(); 
+    }
+
+CTspClientMapperObserver::CTspClientMapperObserver(MTspRulesTriggerObserver& aObserver)
+    : CActive(CActive::EPriorityStandard), iObserver(aObserver)
+    {
+    }
+
+void CTspClientMapperObserver::ConstructL()
+    {
+    const TUid KTspClientMapperProperty = { 0x10200C70 };
+    const TUint32 KTspClientMapperKeyPlaying = 0x00000001;
+    User::LeaveIfError(iPlayingClients.Attach(KTspClientMapperProperty, KTspClientMapperKeyPlaying));
+    CActiveScheduler::Add(this);    
+    iPlayingClients.Subscribe(iStatus);
+    SetActive(); 
+    }
+
+
+void CTspClientMapperObserver::RunL()
+    {
+    // Doesn't matter what the value is - that'll be checked when evaluating
+    // the TSP target rules.  Inform the TSP of the value change and 
+    // re-subscribe.
+    COM_TRACE_( "[REMCONTSPCONTROLLER] CWsEventsObserver::RunL" );
+    iPlayingClients.Subscribe(iStatus);
+    SetActive(); 
+    iObserver.MtrtoEvaluateRoutingRules();
+    }
+
+void CTspClientMapperObserver::DoCancel()
+    {
+    iPlayingClients.Cancel();
+    }
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/devicepowermenuplugin.pro	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,63 @@
+#
+#############################################################################
+##
+## Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## This component and the accompanying materials are made available
+## under the terms of "Eclipse Public License v1.0"
+## which accompanies this distribution, and is available
+## at the URL "http://www.eclipse.org/legal/epl-v10.html".
+##
+## Initial Contributors:
+## Nokia Corporation - initial contribution.
+##
+## Contributors:
+##
+## Description:
+##
+#############################################################################
+#
+
+TEMPLATE = lib
+TARGET = DevicePowerMenuPlugin
+CONFIG += hb plugin
+
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE	
+
+# Input
+HEADERS += 	.\inc\hbdevicepowermenuplugin_p.h 	\
+			.\inc\hbdevicepowermenupluginerrors_p.h 	\
+			.\inc\hbdevicepowermenuwidegt_p.h	
+
+			
+SOURCES += 	.\src\hbdevicepowermenuplugin.cpp \
+			.\src\hbdevicepowermenuwidegt.cpp
+			
+RESOURCES += hbdevicepowermenu.qrc
+
+MOC_DIR = ./tmp
+
+TRANSLATIONS	+=	power_menu.ts
+
+symbian:
+{
+TARGET.UID3 = 0x2002F375
+TARGET.CAPABILITY = ALL -TCB
+TARGET.EPOCALLOWDLLDATA = 1
+
+pluginstub.sources = DevicePowerMenuPlugin.dll
+pluginstub.path = /resource/plugins/devicedialogs
+DEPLOYMENT += pluginstub
+}
+
+symbian:
+{ 
+BLD_INF_RULES.prj_exports += \
+  "$${LITERAL_HASH}include <platform_paths.hrh>" \
+  "qmakepluginstubs/DevicePowerMenuPlugin.qtplugin   		/epoc32/data/z/pluginstub/DevicePowerMenuPlugin.qtplugin" \
+  ".\rom\devicepowermenuplugin.iby             				CORE_MW_LAYER_IBY_EXPORT_PATH(devicepowermenuplugin.iby)" \
+  ".\rom\devicepowermenu_resources.iby 						LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(devicepowermenu_resources.iby)"
+}
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/docml/powermenu.docml	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument context="pwr_grid" version="1.1">
+    <widget name="maindialog" type="HbDialog">
+        <point name="pos" x="1.19403un" y="0.44776un"/>
+        <widget name="container_1" role="HbDialog:contentWidget" type="HbWidget">
+            <widget name="Silence" type="HbPushButton">
+                <real name="z" value="2"/>
+                <string locid="txt_pm_button_silence" name="text" value="Silence"/>
+                <bool name="visible" value="TRUE"/>
+                <string name="state" value="normal"/>
+                <sizepolicy horizontalPolicy="MinimumExpanding" />
+            </widget>
+            <widget name="label" type="HbLabel">
+                <real name="z" value="4"/>
+                <string locid="txt_pm_setlabel_ringing_volume" name="plainText" value="Ringing volume"/>
+                <sizepolicy horizontalPolicy="MinimumExpanding" />
+            </widget>
+            <widget name="Volume" type="HbSlider">
+                <integer name="majorTickInterval" value="5"/>
+                <real name="z" value="3"/>
+                <enums name="orientation" value="Horizontal"/>
+                <integer name="minorTickInterval" value="2"/>
+                <integer name="value" value="30"/>
+                <sizepolicy horizontalPolicy="MinimumExpanding" />
+            </widget>
+            <widget name="Vibrate" type="HbCheckBox">
+                <string locid="txt_pm_list_vibrate" name="text" value="Vibrate"/>
+                <sizepolicy horizontalPolicy="MinimumExpanding" />
+            </widget>
+            <widget name="Offline" type="HbCheckBox">
+                <string locid="txt_pm_list_offline_airplane_mode" name="text" value="Offline (Airplane Mode)"/>
+                <sizepolicy horizontalPolicy="MinimumExpanding" />
+            </widget>
+            <widget name="PowerOff" type="HbPushButton">
+                <string locid="txt_pm_button_power_off" name="text" value="Power Off"/>
+                <string name="state" value="normal"/>
+                <sizepolicy horizontalPolicy="MinimumExpanding" />
+            </widget>
+            <real name="z" value="0"/>
+            <layout type="anchor">
+                <anchoritem dst="" dstEdge="LEFT" spacing="-0un" src="Silence" srcEdge="LEFT"/>
+                <anchoritem dst="" dstEdge="RIGHT" spacing="0un" src="Silence" srcEdge="RIGHT"/>
+                <anchoritem dst="" dstEdge="TOP" spacing="0un" src="Silence" srcEdge="TOP"/>
+                
+                <anchoritem dst="" dstEdge="LEFT" spacing="-0un" src="label" srcEdge="LEFT"/>
+                <anchoritem dst="" dstEdge="RIGHT" spacing="0un" src="label" srcEdge="RIGHT"/>
+                <anchoritem dst="Silence" dstEdge="BOTTOM" spacing="-1un" src="label" srcEdge="TOP"/>
+
+
+                <anchoritem dst="" dstEdge="LEFT" spacing="-0un" src="Volume" srcEdge="LEFT"/>
+                <anchoritem dst="" dstEdge="RIGHT" spacing="0un" src="Volume" srcEdge="RIGHT"/>
+                <anchoritem dst="label" dstEdge="BOTTOM" spacing="-1un" src="Volume" srcEdge="TOP"/>
+
+                <anchoritem dst="" dstEdge="LEFT" spacing="-0un" src="Vibrate" srcEdge="LEFT"/>
+                <anchoritem dst="" dstEdge="RIGHT" spacing="0un" src="Vibrate" srcEdge="RIGHT"/>
+                <anchoritem dst="Volume" dstEdge="BOTTOM" spacing="-0un" src="Vibrate" srcEdge="TOP"/>
+
+                <anchoritem dst="" dstEdge="LEFT" spacing="-0un" src="Offline" srcEdge="LEFT"/>
+                <anchoritem dst="" dstEdge="RIGHT" spacing="0un" src="Offline" srcEdge="RIGHT"/>
+                <anchoritem dst="Vibrate" dstEdge="BOTTOM" spacing="-0un" src="Offline" srcEdge="TOP"/>
+
+                <anchoritem dst="" dstEdge="LEFT" spacing="-0un" src="PowerOff" srcEdge="LEFT"/>
+                <anchoritem dst="" dstEdge="RIGHT" spacing="0un" src="PowerOff" srcEdge="RIGHT"/>
+                <anchoritem dst="Offline" dstEdge="BOTTOM" spacing="-1un" src="PowerOff" srcEdge="TOP"/>
+
+                <anchoritem dst="" dstEdge="BOTTOM" spacing="0un" src="PowerOff" srcEdge="BOTTOM"/>
+                                
+            </layout>
+        </widget>
+    </widget>
+    <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
+        <uistate name="Common ui state" sections="#common"/>
+    </metadata>
+</hbdocument>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/hbdevicepowermenu.qrc	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,11 @@
+<RCC>
+    <qresource prefix="/xml" >
+        <file alias="powermenu.docml" >docml/powermenu.docml</file>
+    </qresource>
+    <qresource prefix="/images" >
+        <file alias="decrement.svg" >images/decrement.svg</file>
+        <file alias="increment.svg" >images/increment.svg</file>
+        <file alias="muted.svg" >images/muted.svg</file>
+        <file alias="unmuted.svg" >images/unmuted.svg</file>
+    </qresource>
+</RCC>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/images/decrement.svg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<polygon points="33.999,26 10,26 10,17.998 33.999,17.998 "/>
+<rect fill="#FFFFFF" height="4" width="20" x="12" y="20"/>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/images/increment.svg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<polygon points="26.001,33.999 18,33.999 18,26.001 10,26.001 10,18 18,18 18,9.999 26.001,9.999 26.001,18 33.999,18   33.999,26.001 26.001,26.001 "/>
+<polygon fill="#FFFFFF" points="31.999,20 23.999,20 23.999,12 20,12 20,20 12,20 12,23.999 20,23.999 20,31.999 23.999,31.999   23.999,23.999 31.999,23.999 "/>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/images/muted.svg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="M25.824,21.015V8.411h-9.979l-1.025,1.6L8.354,3.545L3.651,8.242l6.797,6.795H4.931v15.818h6.671l4.24,6.625h9.982v-7.067  l7.902,7.905l4.697-4.703L25.824,21.015z M19.179,30.336L15.26,24.21h-3.682v-2.524h3.682l0.715-1.121l3.204,3.203V30.336z"/>
+<rect fill="#FFFFFF" height="2.648" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 21.1169 50.6082)" width="38.533" x="1.773" y="19.607"/>
+<polygon fill="#FFFFFF" points="21.179,32.835 18.403,32.835 14.166,26.209 9.578,26.209 9.578,19.685 14.166,19.685 14.463,19.219   12.279,17.037 6.931,17.037 6.931,28.855 12.695,28.855 16.937,35.48 23.824,35.48 23.824,28.579 21.179,25.936 "/>
+<polygon fill="#FFFFFF" points="18.403,13.06 21.179,13.06 21.179,16.202 23.824,18.847 23.824,10.412 16.937,10.412 16.332,11.355   18.259,13.284 "/>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/images/unmuted.svg	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="M34.951,38.12l-5.054-4.302l1.282-1.521c0.877-1.04,8.324-10.39,0.111-18.605l-1.414-1.413l4.697-4.701l1.413,1.415  c12.695,12.699,0.386,27.46,0.259,27.606L34.951,38.12L34.951,38.12z"/>
+<path d="M30.761,14.545l-1.414-1.412l-3.521,3.521V8.411h-9.981l-4.24,6.624H4.93v15.82h6.674l4.24,6.625h9.981v-8.201l3.855,3.287  l1.298-1.521C33.574,28.005,36.864,20.643,30.761,14.545z M19.18,30.335l-3.921-6.128h-3.682v-2.522h3.682l3.921-6.128V30.335z   M25.918,26.742l-0.094,0.109v-7.844l0.237,0.236C29.324,22.505,26.277,26.318,25.918,26.742z"/>
+<path d="M27.476,17.83c4.622,4.622,0.158,9.979-0.031,10.203l2.014,1.714c2.181-2.554,4.957-8.725-0.11-13.788  L27.476,17.83z" fill="#FFFFFF"/>
+<path d="M34.576,10.406l-1.873,1.871c9.664,9.663,0.404,20.838,0.006,21.309l2.017,1.717  C34.838,35.17,45.974,21.811,34.576,10.406z" fill="#FFFFFF"/>
+<path d="M16.937,10.411l-4.242,6.625H6.931v11.819h5.764l4.242,6.625h6.887V10.411H16.937z M21.179,32.834h-2.776  l-4.237-6.626H9.578v-6.524h4.588l4.237-6.625h2.776V32.834z" fill="#FFFFFF"/>
+</svg>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/inc/hbdevicepowermenuplugin_p.h	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#ifndef HBDEVICEPOWERMENUPLUGIN_P_H
+#define HBDEVICEPOWERMENUPLUGIN_P_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include <hbdevicedialogplugin.h>
+
+//fwd Declaration
+class HbDevicePowerMenuPluginPrivate;
+
+class HbDevicePowerMenuPlugin : public HbDeviceDialogPlugin
+{
+    Q_OBJECT
+
+public:
+    friend class HbDevicePowerMenuPluginPrivate;
+
+    HbDevicePowerMenuPlugin();
+    ~HbDevicePowerMenuPlugin();
+
+    //Pure Virtual method of class HbDeviceDialogPluginInterface
+    HbDeviceDialogInterface *createDeviceDialog(const QString &deviceDialogType, const QVariantMap &parameters);
+    //Pure Virtual Mehods of class HbDeviceDialogPlugin
+    bool accessAllowed(const QString &deviceDialogType, const QVariantMap &parameters, const QVariantMap &securityInfo) const;
+    bool deviceDialogInfo(const QString &deviceDialogType, const QVariantMap &parameters, DeviceDialogInfo *info) const;
+    QStringList deviceDialogTypes() const;
+    PluginFlags pluginFlags() const;
+    int error() const;
+
+private:
+    Q_DISABLE_COPY(HbDevicePowerMenuPlugin)
+    HbDevicePowerMenuPluginPrivate *d;
+};
+
+#endif // HBDEVICEPOWERMENUPLUGIN_P_H
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/inc/hbdevicepowermenupluginerrors_p.h	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#ifndef HBDEVICEPOWERMENUPLUGINERRORS_P_H
+#define HBDEVICEPOWERMENUPLUGINERRORS_P_H
+
+#include <hbdevicedialog.h>
+#include <e32debug.h>
+#ifdef _DEBUG
+
+    #define TRACES( x ) x
+
+#else
+
+    #define TRACES( x )
+
+#endif
+
+
+// No error
+const int NoError = 0;
+// Illegal parameter error
+const int ParameterError = HbDeviceDialog::PluginErrors + 1;
+// Unknown device dialog error
+const int UnknownDeviceDialogError = HbDeviceDialog::PluginErrors + 2;
+
+#endif // HBDEVICEPOWERMENUPLUGINERRORS_P_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/inc/hbdevicepowermenuwidegt_p.h	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#ifndef HBDEVICEPOWERMENUWIDEGT_P_H
+#define HBDEVICEPOWERMENUWIDEGT_P_H
+
+
+#include <QObject>
+#include <QVariantMap>
+#include <hbdevicedialoginterface.h>
+#include <hbdevicedialog.h>
+#include <hbdialog.h>
+#include <hbdocumentloader.h>
+#include <HbTranslator.h>
+//For widgets used
+#include <hbpushbutton.h>
+#include <hbslider.h>
+#include <hbcheckBox.h>
+#include <hbinstance.h>
+
+class HbDevicePowerMenuWidget : public QObject, public HbDeviceDialogInterface
+{
+    Q_OBJECT
+    
+public:
+    HbDevicePowerMenuWidget(const QVariantMap &parameters);
+    ~HbDevicePowerMenuWidget();
+
+public:    
+	//HbDeviceDialogInterface methods to be implemented
+    bool setDeviceDialogParameters(const QVariantMap &parameters);
+    int deviceDialogError() const;
+    void closeDeviceDialog(bool byClient);
+    HbPopup *deviceDialogWidget() const;
+    virtual QObject *signalSender() const;
+    
+
+private:    
+    bool preConstructDialog();
+    void constructDialog(const QVariantMap &parameters);
+    void cleanupMemory();
+    
+private:
+    void customizeVolumeSlider();
+    void setSpeakerIcon();
+    bool IsValidHandles();
+
+private slots:    
+    void handleVolumeChanged(int aVolume);
+    void handleSilenceMode(bool aState);
+    void handleVibrationToggled(int aVibrationToggel);
+    void handleOfflineToggled(int aOfflineToggel);
+    void handlePowerOff(bool aState);
+    void closedialog();
+    
+signals:
+    void deviceDialogClosed();
+    void deviceDialogData(QVariantMap data);
+
+private:
+    Q_DISABLE_COPY(HbDevicePowerMenuWidget)
+
+    int 				mDeviceDialogError;             //DeviceDialogError
+    int                 mVolumeLevel;                   //shows current Volume Level
+    bool 				mShowVolume;                   //used to Enable or Disbale Volume                   
+    bool 				mVibrationChecked;             //Vibration enabled or Disabled
+    bool 				mOfflineChecked;               //offline enabled or Disabled
+    bool				mSilencelatched;                //SilenceMode Enabled or Disabled 
+    bool				mCypherOff;                     //Shows Encryption/Decryption ON/OFF
+    
+    HbDialog*			mDialogWidget;                  //Handle for Powermenu Dialog
+    HbPushButton*		mSilenceButton;                  //Handle for Silence button
+    HbSlider*			mVolumeSlider;                  //Handle for Slider
+    HbCheckBox*			mVibarte;                         //Handle for Vibration check Box
+    HbCheckBox*			mOffline;                         //Handle for Offline CheckBox
+    HbPushButton *		mPowerOffButton;                //Handle for PowerOff Button
+    HbDocumentLoader* 	mLoader;                         //Hnadle for Documnet Loader to load docml 
+    HbTranslator*       mHbTranslator;                  //Translator used for localization; loads translation files
+};
+
+#endif // HBDEVICEPOWERMENUWIDEGT_P_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/rom/devicepowermenu_resources.iby	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+ 
+#ifndef __DEVICEPOWERMENU_RESOURCES_IBY__
+#define __DEVICEPOWERMENU_RESOURCES_IBY__
+
+//this iby is required for language specific things to be exported to Language iby layer
+#include <data_caging_paths_for_iby.hrh>
+
+data=DATAZ_\QT_TRANSLATIONS_DIR\power_menu.qm	QT_TRANSLATIONS_DIR\power_menu.qm
+
+
+#endif //__DEVICEPOWERMENU_RESOURCES_IBY__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/rom/devicepowermenuplugin.iby	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+ 
+#ifndef __DEVICEPOWERMENUPLUGIN_IBY__
+#define __DEVICEPOWERMENUPLUGIN_IBY__
+
+file = \epoc32\release\armv5\urel\DevicePowerMenuPlugin.dll  \sys\bin\DevicePowerMenuPlugin.dll UNPAGED
+data=\epoc32\data\z\pluginstub\DevicePowerMenuPlugin.qtplugin \resource\plugins\devicedialogs\DevicePowerMenuPlugin.qtplugin
+
+#endif //__DEVICEPOWERMENUPLUGIN_IBY__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/src/hbdevicepowermenuplugin.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+//System includes
+#include <QtPlugin>
+#include <hbdevicedialog.h>
+
+//user includes
+#include "hbdevicepowermenuplugin_p.h"
+#include "hbdevicepowermenuwidegt_p.h"
+#include "hbdevicepowermenupluginerrors_p.h"
+
+//SysAp's Secure UID
+const quint32 KSecureUid = 0x100058F3;
+
+Q_EXPORT_PLUGIN2(devicepowermenuplugin, HbDevicePowerMenuPlugin)
+
+// This plugin implements a device dialog type
+static const struct 
+	{
+    const char *mTypeString;
+	} dialogInfos[] = {{"com.nokia.hb.devicepowermenu/1.0"}};
+
+class HbDevicePowerMenuPluginPrivate
+	{
+public:
+    HbDevicePowerMenuPluginPrivate() {mError = NoError;}
+    int mError;
+	};
+
+/**
+ * Constructor
+ */
+HbDevicePowerMenuPlugin::HbDevicePowerMenuPlugin()
+	{
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::Constructor:Begin") ) );
+    d = new HbDevicePowerMenuPluginPrivate;
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::Constructor:End") ) );
+	}
+
+/**
+ * Destructor
+ */
+HbDevicePowerMenuPlugin::~HbDevicePowerMenuPlugin()
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::Destructor:Begin") ) );
+    delete d;
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::Destructor:End") ) );
+	}
+
+/**
+ * This method is Pure Virtual in HbDeviceDialogPlugin 
+ * Checks if client is allowed to use device dialog widget
+ * Its a customized widget for Sysap, and allows only Sysap to use this plugin
+ */
+bool HbDevicePowerMenuPlugin::accessAllowed(const QString &deviceDialogType, const QVariantMap &parameters, const QVariantMap &securityInfo) const
+    {
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::accessAllowed:Begin") ) );
+    Q_UNUSED(deviceDialogType)
+    Q_UNUSED(parameters)
+    TBool secured(false);
+    quint32 secUid = static_cast<quint32>(securityInfo.value("sym-secureId").toInt());
+    if (secUid == KSecureUid )
+	    {
+        secured = true;
+	    }
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::accessAllowed:End") ) );
+    return secured;
+    }
+
+/**
+ * Creates device dialog widget
+ */
+HbDeviceDialogInterface *HbDevicePowerMenuPlugin::createDeviceDialog(const QString &deviceDialogType, const QVariantMap &parameters)
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::createDeviceDialog:Begin") ) );
+    d->mError = NoError;
+
+    HbDeviceDialogInterface *ret(NULL);
+    if (dialogInfos[0].mTypeString == deviceDialogType) 
+		{
+		 QVariantMap params = parameters;
+		 HbDevicePowerMenuWidget *powMenu = new HbDevicePowerMenuWidget(params);
+		 d->mError = powMenu->deviceDialogError();
+		 if (d->mError != NoError) 
+			 {
+			 delete powMenu;
+			 powMenu = NULL;
+			 }
+		 ret = powMenu;
+		} 
+    else 
+		{
+		 d->mError = UnknownDeviceDialogError;
+		 ret = NULL;
+		}
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::createDeviceDialog:End") ) );
+    return ret;
+	}
+
+/**
+ * Return information of device dialog the plugin creates
+ */
+bool HbDevicePowerMenuPlugin::deviceDialogInfo(const QString &deviceDialogType, const QVariantMap &parameters, DeviceDialogInfo *info) const
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::deviceDialogInfo:Begin") ) );
+    Q_UNUSED(parameters)
+    Q_UNUSED(deviceDialogType)
+
+    info->group = GenericDeviceDialogGroup;
+    info->flags = SecurityCheck;
+    info->priority = DefaultPriority;
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::deviceDialogInfo:End") ) );
+    return true;
+	}
+
+/**
+ * Return device dialog types this plugin implements
+ */
+QStringList HbDevicePowerMenuPlugin::deviceDialogTypes() const
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::deviceDialogTypes:Begin") ) );
+	QStringList types;
+	const int numTypes = sizeof(dialogInfos) / sizeof(dialogInfos[0]);
+	for(int i = 0; i < numTypes; i++) 
+		{
+		types.append(dialogInfos[i].mTypeString);
+		}
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::deviceDialogTypes:End") ) );
+	return types;
+	}
+
+/**
+ * Return plugin flags
+ */
+HbDeviceDialogPlugin::PluginFlags HbDevicePowerMenuPlugin::pluginFlags() const
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::pluginFlags:Begin") ) );
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::pluginFlags:End") ) );
+	return NoPluginFlags;
+	}
+
+/**
+ * Return last error
+ */
+int HbDevicePowerMenuPlugin::error() const
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::error:Begin") ) );
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::error:End") ) );
+	return d->mError;
+	}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/src/hbdevicepowermenuwidegt.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,438 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+
+#include "hbdevicepowermenuwidegt_p.h"
+#include "hbdevicepowermenupluginerrors_p.h"
+#include <HbInstance.h>
+
+//resuorces
+QString POWER_MENU_DOCML(":/xml/powermenu.docml");
+QString VOLUME_DECREASE_ICON(":/images/decrement.svg");
+QString VOLUME_INCREASE_ICON(":/images/increment.svg");
+QString VOLUME_UNMUTE_ICON(":/images/unmuted.svg");
+QString VOLUME_MUTE_ICON(":/images/muted.svg");
+//For Localization
+QString LOCALE_PATH("/resource/qt/translations/"); 
+QString TS_FILE("power_menu");
+
+//Widget names
+QString MAIN_DLG("maindialog");
+QString PWR_SILENCE("Silence");
+QString PWR_VOLUME("Volume");
+QString PWR_VIBARTE("Vibrate");
+QString PWR_OFFLINE("Offline");
+QString PWR_POWEROFF("PowerOff");
+QString PWR_CONTAINER("container_1");
+
+//DO not modify these strings
+QString KVolumeLevel("VolumeLevel");
+QString KSilenceLatchOn("SilenceLatchOn");            //Used to latch silencebutton	
+QString KVibrationEnable("VibrationEnable");
+QString KOfflineEnable("OfflineEnable");
+QString KCypherOff("CypherOff");            //used to poweroffButtonEnabled/Disabled 		
+QString KShutDown("ShutDown");
+
+//Used for Orientation of PowerMenu
+qreal KVerticalX = 175;
+//width of PowerMenu
+qreal KPMWidth = 360;
+
+/**
+ * Constructor
+ */
+HbDevicePowerMenuWidget::HbDevicePowerMenuWidget(const QVariantMap &parameters)
+	:mDeviceDialogError(NoError), 
+	 mVolumeLevel(0),
+	 mShowVolume(false), 
+	 mVibrationChecked(true),
+	 mOfflineChecked(true),
+	 mSilencelatched(true), 
+	 mCypherOff(true),
+	 mDialogWidget(NULL),
+	 mSilenceButton(NULL),
+	 mVolumeSlider(NULL), 
+	 mVibarte(NULL),
+	 mOffline(NULL),
+	 mPowerOffButton(NULL),
+	 mLoader(NULL), 
+	 mHbTranslator(NULL)
+    {
+    // mMainWindow(NULL),
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::Constructor:Begin") ) );
+    if (preConstructDialog())
+        {
+        //Translator loaded succesfully then olny construct widgets
+        constructDialog(parameters);
+        }
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::Constructor:End") ) );
+    }
+    
+/**
+ * Destructor
+ */
+HbDevicePowerMenuWidget::~HbDevicePowerMenuWidget()
+    {
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::Destructor()") ) );
+    cleanupMemory();
+    }
+
+/**
+ * Implementation of HbDeviceDialogInterface method
+ * sets parameters of custom widget
+ */
+bool HbDevicePowerMenuWidget::setDeviceDialogParameters(const QVariantMap &parameters)
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::setDeviceDialogParameters:Begin") ) );
+ 	if(parameters.contains(KVolumeLevel))
+		{
+		mVolumeLevel = parameters.value(KVolumeLevel).toInt();
+		}
+	if(parameters.contains(KSilenceLatchOn))
+		{
+		mSilencelatched = parameters.value(KSilenceLatchOn).toBool();
+		//If SilenceMode is Enabled then MasterVolume control is Disabled 
+		mShowVolume = mSilencelatched? false:true;
+		}
+	if(parameters.contains(KVibrationEnable))
+		{
+		mVibrationChecked = parameters.value(KVibrationEnable).toBool();
+		}
+	if(parameters.contains(KOfflineEnable))
+		{
+		mOfflineChecked = parameters.value(KOfflineEnable).toBool();
+		}
+	if(parameters.contains(KCypherOff))
+		{
+		mCypherOff = parameters.value(KCypherOff).toBool();
+		}
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::setDeviceDialogParameters:End") ) );
+	return true;
+	}
+
+/**
+ * Returns error code
+ */
+int HbDevicePowerMenuWidget::deviceDialogError() const
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::deviceDialogError") ) );
+	return mDeviceDialogError;
+	}
+
+/**
+ * Close DeviceDialog
+ */
+void HbDevicePowerMenuWidget::closeDeviceDialog(bool byClient)
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::closeDeviceDialog:Begin") ) );
+    Q_UNUSED(byClient);
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::closeDeviceDialog:End") ) );
+    mDialogWidget->close();
+	}
+
+/**
+ * Implementation of HbDeviceDialogInterface method
+ */
+HbPopup* HbDevicePowerMenuWidget::deviceDialogWidget() const
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::deviceDialogWidget") ) );
+	return mDialogWidget;
+	}
+
+/**
+ * Implementation of HbDeviceDialogInterface method
+ * to get signals from action events
+ */
+QObject* HbDevicePowerMenuWidget::signalSender() const
+    {
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::signalSender") ) );
+    return const_cast<HbDevicePowerMenuWidget*>(this);
+    }
+
+/**
+ * Before loading docml and widgets Translator must be loaded
+ */
+bool HbDevicePowerMenuWidget::preConstructDialog()
+    {
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::preConstructDialog:Begin") ) );
+    //Translator
+    mHbTranslator = new HbTranslator(LOCALE_PATH,TS_FILE);
+    if(!mHbTranslator)
+        {
+        //Translator is failed to create
+        mDeviceDialogError = UnknownDeviceDialogError;
+        TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::preConstructDialog:MemoryAllocation Failed") ) );
+        return false;
+        }
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::preConstructDialog:End") ) );
+    return true;
+    }
+
+/**
+ * Constrcuts customized widget dialog by loading the UI from docml and
+ * initializes all parameters and attributes.
+ * Throws bad-memory on Un-succesful memory allocations
+ */
+void HbDevicePowerMenuWidget::constructDialog(const QVariantMap &parameters)
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::constructDialog:Begin") ) );
+	bool dialogLoaded(false);
+	//Docml loader
+	mLoader = new HbDocumentLoader();
+	if(!mLoader)
+	    {
+        //Document Loader failed to create
+        mDeviceDialogError = UnknownDeviceDialogError;
+        cleanupMemory();
+        TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::constructDialog:mLoader::MemoryAllocation Failed") ) );        
+        return;
+	    }
+	mLoader->load(POWER_MENU_DOCML, &dialogLoaded);
+	Q_ASSERT_X(dialogLoaded, "HbDevicePowerMenuWidget", "Invalid xml file");
+	//Widgets
+	if (dialogLoaded)
+		{
+        //Dialog loaded succesfully from docml
+		TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::constructDialog:dialogLoaded:Begin") ) );
+        
+		//Initialize Parameters received
+        setDeviceDialogParameters(parameters);
+		mDialogWidget = qobject_cast <HbDialog *>(mLoader->findWidget(MAIN_DLG));
+		//Find the handles for all widget items
+		mSilenceButton = qobject_cast <HbPushButton *>(mLoader->findWidget(PWR_SILENCE));
+		mVolumeSlider = qobject_cast <HbSlider *>(mLoader->findWidget(PWR_VOLUME));
+		mVibarte = qobject_cast <HbCheckBox *>(mLoader->findWidget(PWR_VIBARTE));
+		mOffline = qobject_cast <HbCheckBox *>(mLoader->findWidget(PWR_OFFLINE));
+		mPowerOffButton = qobject_cast <HbPushButton *>(mLoader->findWidget(PWR_POWEROFF));	
+		QGraphicsWidget *widget(NULL);
+		widget = mLoader->findWidget(PWR_CONTAINER);
+		if (!(IsValidHandles()&&(widget)))
+		    {
+            //Atleast, One of the Handles are not allocated memory
+            mDeviceDialogError = UnknownDeviceDialogError;
+            cleanupMemory();
+            TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::constructDialog:Widgets::MemoryAllocation Failed") ) );            
+            return;
+		    }
+		//Sets Speaker icon
+        setSpeakerIcon();
+		//Customize slider to VolumeSlider
+		customizeVolumeSlider();
+		mDialogWidget->setContentWidget(widget);
+		//SetWidget Attributes
+		//1. Volume 
+	    mVolumeSlider->setSliderPosition(mVolumeLevel);
+	    mVolumeSlider->setEnabled(mShowVolume);
+	    //This will avoid IPC calls while dragging the Slider
+	    mVolumeSlider->setTracking(false);
+	    bool ok = connect(mVolumeSlider,SIGNAL(valueChanged(int)) , this , SLOT(handleVolumeChanged(int)));
+        Q_ASSERT_X(ok, "VolumeSlider", "Invalid IncrementDecrement Change");
+
+		//2.Silence Mode
+		mSilenceButton->setDown(mSilencelatched);
+		ok = connect(mSilenceButton,SIGNAL(clicked(bool)) , this , SLOT(handleSilenceMode(bool)));
+	    Q_ASSERT_X(ok, "SilenceButton", "Invalid Clicked");
+
+	    //3.Master Vibration
+	    mVibarte->setChecked(mVibrationChecked);
+	    ok = connect(mVibarte,SIGNAL(stateChanged(int)) , this , SLOT(handleVibrationToggled(int)));
+		Q_ASSERT_X(ok, "Vibrator", "Invalid Vibrator Toggeld");
+		
+		//4.Offline
+	    mOffline->setChecked(mOfflineChecked);
+	    ok = connect(mOffline,SIGNAL(stateChanged(int)) , this , SLOT(handleOfflineToggled(int)));
+		Q_ASSERT_X(ok, "Vibrator", "Invalid Offline Toggeld");  
+		
+		//5.Power off
+		mPowerOffButton->setEnabled(mCypherOff);
+		ok = connect(mPowerOffButton,SIGNAL(clicked(bool)) , this , SLOT(handlePowerOff(bool)));
+	    Q_ASSERT_X(ok, "PowerOffButton", "Invalid Clicked");	  
+	    
+        //Dialog dismiss only with Tap outside
+        mDialogWidget->setTimeout(HbPopup::NoTimeout);
+        mDialogWidget->setDismissPolicy(HbPopup::TapOutside);
+        mDialogWidget->setPreferredWidth(KPMWidth);
+        
+        connect(mDialogWidget,SIGNAL(aboutToClose()),this, SLOT(closedialog()));
+	    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::constructDialog:dialogLoaded:End") ) );
+		}
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::constructDialog:End") ) );
+	}
+
+/**
+ * Checks whether all Hadles for widgets DialogWidget, 
+ * SilenceButton, Vibrate, Offline and Poweroff Button allocated memory.
+ * Returns True, if all Handles allocated memory.
+ * Flase, atleast one of them NOT allocated memory.
+ */
+bool HbDevicePowerMenuWidget::IsValidHandles()
+    {
+    if((!mDialogWidget) || (!mSilenceButton) || (!mVolumeSlider)||(!mVibarte) || (!mOffline) || (!mPowerOffButton))
+        {
+        return false;
+        }
+    else{
+        //All handles are allocated memory
+        return true;
+        }
+    }
+
+/**
+ * Sets Mute/Unmute icon for Volume slider
+ * Mute/Unmute icon to display the current status of Silence Mode.
+ * Mute icon dispalyed when Device in Silence mode.
+ * Unmute icon dispalyed when Device Non-Silence mode. 
+ */
+void HbDevicePowerMenuWidget::setSpeakerIcon()
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::setSpeakerIcon:Begin") ) );
+	QString speakerIcon= ( mSilencelatched )? VOLUME_MUTE_ICON : VOLUME_UNMUTE_ICON ;
+	mVolumeSlider->setElementIcon(HbSlider:: IconElement,HbIcon(speakerIcon));
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::setSpeakerIcon:End") ) );
+	}
+
+
+/**
+ * Customizes the slider to Vloume Slider 
+ */
+void HbDevicePowerMenuWidget::customizeVolumeSlider()
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::customizeVolumeSlider:Begin") ) );
+	//Construct Volume Slider from the HbSlider
+	mVolumeSlider->setSliderElements(QList<QVariant>()
+                                        << HbSlider::DecreaseElement 
+                                        << HbSlider::TrackElement
+                                        << HbSlider::IncreaseElement
+                                        << HbSlider::IconElement     );
+	
+	// To set DecreaseIcon and IncreseIcon
+	mVolumeSlider->setElementIcon(HbSlider::DecreaseElement, HbIcon(VOLUME_DECREASE_ICON));
+	mVolumeSlider->setElementIcon(HbSlider:: IncreaseElement, HbIcon(VOLUME_INCREASE_ICON));
+    //set Range of volume
+	mVolumeSlider->setRange(1,10);
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::customizeVolumeSlider:End") ) );
+	}
+
+/**
+ * Slot
+ * Widget is about to Close. 
+ */
+void HbDevicePowerMenuWidget::closedialog()
+    {
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::closedialog:Begin") ) );
+    emit deviceDialogClosed();
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::closedialog:Begin") ) );
+    }
+
+/**
+ * Slot
+ */
+void HbDevicePowerMenuWidget::handleVolumeChanged(int aVolume)
+    {
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handleVolumeChanged:Begin") ) );
+    mVolumeLevel = aVolume;
+    //inform the client may be through data changed etc.
+    QVariantMap mDataToSend;
+    QVariant volume(mVolumeLevel);
+    mDataToSend.insert(KVolumeLevel, volume);
+    emit deviceDialogData(mDataToSend);
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handleVolumeChanged:Begin") ) );
+    }
+
+/**
+ * Slot
+ * Switch between the states to latch down and latch up.
+ * In case of Silence mode, The Silence button id latched down and Disables Volume control.
+ * In case of Non-Silence mode, The Silence button id latched Up and enables Volume control.
+ */
+void HbDevicePowerMenuWidget::handleSilenceMode(bool aState)
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handleSilenceMode:Begin") ) );
+	Q_UNUSED(aState);
+	mShowVolume = !(mShowVolume);
+	mSilencelatched = !(mSilencelatched);
+	mSilenceButton->setDown(mSilencelatched);
+	mVolumeSlider->setEnabled(mShowVolume);	
+    setSpeakerIcon();
+	//inform the client may be through data changed etc.
+    QVariantMap mDataToSend;
+    QVariant silence(mSilencelatched);
+    mDataToSend.insert(KSilenceLatchOn, silence);
+    emit deviceDialogData(mDataToSend);
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handleSilenceMode:End") ) );
+	}
+
+/**
+ * Slot
+ */
+void HbDevicePowerMenuWidget::handlePowerOff(bool aState)
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handlePowerOff:Begin") ) );
+	Q_UNUSED(aState);
+    QVariantMap mDataToSend;
+    QVariant shutdown(true);
+    mDataToSend.insert(KShutDown, shutdown);
+    emit deviceDialogData(mDataToSend);
+    emit deviceDialogClosed();
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handlePowerOff:End") ) );
+	}
+
+/**
+ * Slot
+ */
+void HbDevicePowerMenuWidget::handleOfflineToggled(int aOfflineToggel)
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handleOfflineToggled:Begin") ) );
+	mOfflineChecked = aOfflineToggel;
+    QVariantMap mDataToSend;
+    QVariant offline(mOfflineChecked);
+    mDataToSend.insert(KOfflineEnable, offline);
+    emit deviceDialogData(mDataToSend);
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handleOfflineToggled:End") ) );
+	}
+
+/**
+ * Slot
+ */
+void HbDevicePowerMenuWidget::handleVibrationToggled(int aVibrationToggel)
+	{
+	TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handleVibrationToggled:Begin") ) );
+	mVibrationChecked = aVibrationToggel;
+    QVariantMap mDataToSend;
+    QVariant vibration(mVibrationChecked);
+    mDataToSend.insert(KVibrationEnable, vibration);
+    emit deviceDialogData(mDataToSend);
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handleVibrationToggled:End") ) );
+	}
+
+/**
+ * Cleans up memory allocations
+ */
+void HbDevicePowerMenuWidget::cleanupMemory()
+    {
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::cleanupMemory:Begin") ) );
+    if(mLoader)
+        {
+        delete mLoader;
+        }
+    if(mHbTranslator)
+        {
+        delete mHbTranslator;    
+        }
+    TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::cleanupMemory:End") ) );
+    }
+
--- a/filehandling/fileconverterfw/Design/CONARC.MDL	Fri Jun 11 13:48:03 2010 +0300
+++ b/filehandling/fileconverterfw/Design/CONARC.MDL	Tue Jun 29 10:40:11 2010 +0300
@@ -1,3037 +1,3037 @@
-
-(object Petal
-    version    	40)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    file_name  	"G:\\convert\\design\\conarc.mdl"
-    quid       	"3546F2EF0234"
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	31
-	gridY      	31
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	3
-	showClassOfObject 	TRUE
-	notation   	"Booch")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"34D59F870246"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"34D59F870263"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"34D59F870245"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"34D59F870247"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "ConArc"
-		quid       	"34D5A61E0131"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class_Category "Converter Framework - Loading"
-			quid       	"34D5A6FD0308"
-			exportControl 	"Public"
-			logical_models 	(list unit_reference_list
-			    (object Class "CConverterBase"
-				quid       	"34D5A7A00321"
-				used_nodes 	(list uses_relationship_list
-				    (object Uses_Relationship
-					quid       	"34DB3F7B00BA"
-					supplier   	"MConversionObserver"
-					quidu      	"34DB3E9001D5"))
-				abstract   	TRUE
-				operations 	(list Operations
-				    (object Operation "ConvertL(TFileName&, TFileName&, MConversionObserver*)"
-					quid       	"34D5A7F002B8"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "ConvertObjectL(RReadStream&, RWriteStream&,MConversionObserver*)"
-					quid       	"34DB3DD5019A"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "ConverterUid"
-					quid       	"34D5A8160032"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)))
-			    (object Class "CConverterLibrary"
-				quid       	"34D5A859004C"
-				fields     	(list has_relationship_list
-				    (object Has_Relationship
-					quid       	"34D5A89803DC"
-					supplier   	"CConverterBase"
-					quidu      	"34D5A7A00321"
-					supplier_cardinality 	(value cardinality "1..n")))
-				operations 	(list Operations
-				    (object Operation "Converter"
-					quid       	"34D5A8BD038F"
-					result     	"CConverterBase"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)))
-			    (object Class "CCnaConverter"
-				quid       	"34D5AA37025C"
-				fields     	(list has_relationship_list
-				    (object Has_Relationship
-					quid       	"34D5AA950026"
-					supplier   	"TMimeType"
-					quidu      	"34D5AA8600D9"
-					supplier_cardinality 	(value cardinality "2..n")))
-				operations 	(list Operations
-				    (object Operation "AddMimeFromL"
-					quid       	"34D5AA5201A7"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "AddMimeToL"
-					quid       	"34D5AA580259"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "SetUid"
-					quid       	"34D5AA69033A"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "MimeFrom"
-					quid       	"35169F000051"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "MimeTo"
-					quid       	"35169F0903E4"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)))
-			    (object Class "TMimeType"
-				quid       	"34D5AA8600D9")
-			    (object Class "CCnaConverterFinder"
-				quid       	"34D5AB30032C"
-				abstract   	TRUE
-				operations 	(list Operations
-				    (object Operation "FindAllConvL"
-					quid       	"34D5AB540392"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "NextL"
-					quid       	"34D5AB5A02DD"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)))
-			    (object Class "CCnaScanningConverterFinder"
-				quid       	"34D5AB940019"
-				superclasses 	(list inheritance_relationship_list
-				    (object Inheritance_Relationship
-					quid       	"34D5ABA00369"
-					supplier   	"CCnaConverterFinder"
-					quidu      	"34D5AB30032C"))
-				used_nodes 	(list uses_relationship_list
-				    (object Uses_Relationship
-					quid       	"3516A04A0132"
-					supplier   	"CCnaScanningCnfFinder"
-					quidu      	"3516A02B020A")))
-			    (object Class "CCnaConverterList"
-				quid       	"34D5ABD902C1"
-				fields     	(list has_relationship_list
-				    (object Has_Relationship
-					quid       	"35169EDE000C"
-					supplier   	"CCnaFoundConverter"
-					quidu      	"34D5ABFB0216"
-					supplier_cardinality 	(value cardinality "1..n")))
-				used_nodes 	(list uses_relationship_list
-				    (object Uses_Relationship
-					quid       	"35169EA402BC"
-					supplier   	"CCnaScanningConverterFinder"
-					quidu      	"34D5AB940019"))
-				operations 	(list Operations
-				    (object Operation "UpdateL"
-					quid       	"3516680F0147"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "Converter"
-					quid       	"351668280175"
-					parameters 	(list Parameters
-					    (object Parameter "TUid aUid"))
-					result     	"CConverterBase*"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "Release"
-					quid       	"35166846015A"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)))
-			    (object Class "CCnaFoundConverter"
-				quid       	"34D5ABFB0216"
-				superclasses 	(list inheritance_relationship_list
-				    (object Inheritance_Relationship
-					quid       	"35169DE202C7"
-					supplier   	"CCnaConverter"
-					quidu      	"34D5AA37025C"))
-				used_nodes 	(list uses_relationship_list
-				    (object Uses_Relationship
-					quid       	"34D5AC54017E"
-					supplier   	"CConverterLibrary"
-					quidu      	"34D5A859004C"))
-				class_attributes 	(list class_attribute_list
-				    (object ClassAttribute "iConEntry"
-					quid       	"35169FDB038B"
-					exportControl 	"Public")))
-			    (object Class "CCnaConvInfoFile"
-				quid       	"34D5ACFE02CD"
-				fields     	(list has_relationship_list
-				    (object Has_Relationship
-					quid       	"34D5AD2502DD"
-					supplier   	"CCnaConverter"
-					quidu      	"34D5AA37025C"
-					supplier_cardinality 	(value cardinality "1..n"))
-				    (object Has_Relationship
-					quid       	"34D5AE7A0391"
-					supplier   	"CPersistentStore"
-					quidu      	"34D5ADB303C7"
-					exportControl 	"Protected")))
-			    (object Class "CPersistentStore"
-				quid       	"34D5ADB303C7"
-				exportControl 	"Implementation"
-				abstract   	TRUE
-				space      	"CCnaConvInfoFile")
-			    (object Class "CCnaInfoFileWriter"
-				quid       	"34D5AEB5009D"
-				superclasses 	(list inheritance_relationship_list
-				    (object Inheritance_Relationship
-					quid       	"34D5AECD0387"
-					supplier   	"CCnaConvInfoFile"
-					quidu      	"34D5ACFE02CD"))
-				operations 	(list Operations
-				    (object Operation "AddConverterL"
-					quid       	"35169F8602F3"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)))
-			    (object Class "CCnaInfoFileReader"
-				quid       	"34D5AEB60379"
-				superclasses 	(list inheritance_relationship_list
-				    (object Inheritance_Relationship
-					quid       	"34D5AED001C8"
-					supplier   	"CCnaConvInfoFile"
-					quidu      	"34D5ACFE02CD"))
-				operations 	(list Operations
-				    (object Operation "AtL"
-					quid       	"35169F6500D9"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)))
-			    (object Class "MConversionObserver"
-				quid       	"34DB3E9001D5"
-				operations 	(list Operations
-				    (object Operation "EmbeddedObject(TMimeType&)"
-					quid       	"34DB3EAA01A0"
-					result     	"CConverterBase"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "MaxSteps"
-					quid       	"34DB3EF503E3"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "Progress"
-					quid       	"34DB3F0400B9"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "Result"
-					quid       	"34DB3F110248"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)))
-			    (object Class "CCnaScanningCnfFinder"
-				quid       	"3516A02B020A"
-				superclasses 	(list inheritance_relationship_list
-				    (object Inheritance_Relationship
-					quid       	"3516A0440152"
-					supplier   	"CCnaConverterFinder"
-					quidu      	"34D5AB30032C"))))
-			logical_presentations 	(list unit_reference_list
-			    (object ClassDiagram "Main"
-				quid       	"34D5A793021E"
-				title      	"Main"
-				zoom       	80
-				max_height 	28350
-				max_width  	21600
-				origin_x   	0
-				origin_y   	0
-				items      	(list diagram_item_list
-				    (object ClassView "Class" "CConverterBase" @1
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(1147, 2387)
-					label      	(object ItemLabel
-					    Parent_View 	@1
-					    location   	(573, 2260)
-					    nlines     	2
-					    max_width  	1388
-					    justify    	0
-					    label      	"CConverterBase")
-					quidu      	"34D5A7A00321"
-					width      	2012
-					height     	376
-					annotation 	8
-					autoResize 	TRUE)
-				    (object ClassView "Class" "CConverterLibrary" @2
-					IncludeOperation 	TRUE
-					location   	(1178, 1488)
-					label      	(object ItemLabel
-					    Parent_View 	@2
-					    location   	(1064, 1404)
-					    nlines     	2
-					    max_width  	266
-					    justify    	0
-					    label      	"CConverterLibrary")
-					quidu      	"34D5A859004C"
-					width      	386
-					annotation 	8
-					autoResize 	TRUE)
-				    (object HasView "" @3
-					quidu      	"34D5A89803DC"
-					client     	@2
-					supplier   	@1
-					line_style 	0)
-				    (object ClassView "Class" "TMimeType" @4
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(2914, 2325)
-					label      	(object ItemLabel
-					    Parent_View 	@4
-					    location   	(2810, 2241)
-					    nlines     	2
-					    max_width  	240
-					    justify    	0
-					    label      	"TMimeType")
-					quidu      	"34D5AA8600D9"
-					annotation 	8
-					autoResize 	TRUE)
-				    (object ClassView "Class" "CCnaConverterFinder" @5
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(992, 310)
-					label      	(object ItemLabel
-					    Parent_View 	@5
-					    location   	(836, 205)
-					    nlines     	2
-					    max_width  	369
-					    justify    	0
-					    label      	"CCnaConverterFinder")
-					quidu      	"34D5AB30032C"
-					width      	536
-					height     	314
-					annotation 	8
-					autoResize 	TRUE)
-				    (object ClassView "Class" "CCnaScanningConverterFinder" @6
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(1116, 744)
-					label      	(object ItemLabel
-					    Parent_View 	@6
-					    location   	(986, 660)
-					    nlines     	2
-					    max_width  	304
-					    justify    	0
-					    label      	"CCnaScanningConverterFinder")
-					quidu      	"34D5AB940019"
-					width      	442
-					annotation 	8
-					autoResize 	TRUE)
-				    (object InheritView "" @7
-					quidu      	"34D5ABA00369"
-					client     	@6
-					supplier   	@5
-					line_style 	0)
-				    (object ClassView "Class" "CCnaConverterList" @8
-					IncludeOperation 	TRUE
-					location   	(1798, 589)
-					label      	(object ItemLabel
-					    Parent_View 	@8
-					    location   	(1618, 421)
-					    nlines     	2
-					    max_width  	426
-					    justify    	0
-					    label      	"CCnaConverterList")
-					quidu      	"34D5ABD902C1"
-					width      	618
-					height     	492
-					annotation 	8
-					autoResize 	TRUE)
-				    (object ClassView "Class" "CCnaFoundConverter" @9
-					IncludeOperation 	TRUE
-					location   	(1798, 1147)
-					label      	(object ItemLabel
-					    Parent_View 	@9
-					    location   	(1690, 1063)
-					    nlines     	2
-					    max_width  	251
-					    justify    	0
-					    label      	"CCnaFoundConverter")
-					quidu      	"34D5ABFB0216"
-					compartment 	(object Compartment
-					    Parent_View 	@9
-					    location   	(1666, 1181)
-					    anchor     	2
-					    nlines     	1
-					    max_width  	297
-					    justify    	0
-					    compartmentItems 	(list Compartment
-						"iConEntry"))
-					width      	364
-					annotation 	8
-					autoResize 	TRUE)
-				    (object UsesView "" @10
-					quidu      	"34D5AC54017E"
-					client     	@9
-					supplier   	@2
-					line_style 	0)
-				    (object ClassView "Class" "CCnaConvInfoFile" @11
-					IncludeOperation 	TRUE
-					location   	(2356, 2759)
-					label      	(object ItemLabel
-					    Parent_View 	@11
-					    location   	(2252, 2675)
-					    nlines     	2
-					    max_width  	240
-					    justify    	0
-					    label      	"CCnaConvInfoFile")
-					quidu      	"34D5ACFE02CD"
-					annotation 	8
-					autoResize 	TRUE)
-				    (object ClassView "Class" "CPersistentStore" @12
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(2852, 2945)
-					label      	(object ItemLabel
-					    Parent_View 	@12
-					    location   	(2748, 2861)
-					    nlines     	2
-					    max_width  	240
-					    justify    	0
-					    label      	"CPersistentStore")
-					quidu      	"34D5ADB303C7"
-					annotation 	8
-					autoResize 	TRUE)
-				    (object HasView "" @13
-					quidu      	"34D5AE7A0391"
-					client     	@11
-					supplier   	@12
-					line_style 	0)
-				    (object ClassView "Class" "CCnaInfoFileWriter" @14
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(2015, 3255)
-					label      	(object ItemLabel
-					    Parent_View 	@14
-					    location   	(1857, 3171)
-					    nlines     	2
-					    max_width  	373
-					    justify    	0
-					    label      	"CCnaInfoFileWriter")
-					quidu      	"34D5AEB5009D"
-					width      	542
-					annotation 	8
-					autoResize 	TRUE)
-				    (object ClassView "Class" "CCnaInfoFileReader" @15
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(2604, 3255)
-					label      	(object ItemLabel
-					    Parent_View 	@15
-					    location   	(2500, 3171)
-					    nlines     	2
-					    max_width  	240
-					    justify    	0
-					    label      	"CCnaInfoFileReader")
-					quidu      	"34D5AEB60379"
-					annotation 	8
-					autoResize 	TRUE)
-				    (object InheritView "" @16
-					quidu      	"34D5AECD0387"
-					client     	@14
-					supplier   	@11
-					line_style 	0)
-				    (object InheritView "" @17
-					quidu      	"34D5AED001C8"
-					client     	@15
-					supplier   	@11
-					line_style 	0)
-				    (object ClassView "Class" "MConversionObserver" @18
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(930, 3007)
-					label      	(object ItemLabel
-					    Parent_View 	@18
-					    location   	(651, 2875)
-					    nlines     	2
-					    max_width  	669
-					    justify    	0
-					    label      	"MConversionObserver")
-					quidu      	"34DB3E9001D5"
-					width      	970
-					height     	390
-					annotation 	8
-					autoResize 	TRUE)
-				    (object UsesView "" @19
-					quidu      	"34DB3F7B00BA"
-					client     	@1
-					supplier   	@18
-					line_style 	0)
-				    (object UsesView "" @20
-					quidu      	"35169EA402BC"
-					client     	@8
-					supplier   	@6
-					line_style 	0)
-				    (object HasView "" @21
-					quidu      	"35169EDE000C"
-					client     	@8
-					supplier   	@9
-					line_style 	0)
-				    (object ClassView "Class" "CCnaConverter" @22
-					IncludeOperation 	TRUE
-					location   	(2480, 1798)
-					label      	(object ItemLabel
-					    Parent_View 	@22
-					    location   	(2267, 1606)
-					    nlines     	2
-					    max_width  	506
-					    justify    	0
-					    label      	"CCnaConverter")
-					quidu      	"34D5AA37025C"
-					width      	734
-					height     	562
-					annotation 	8
-					autoResize 	TRUE)
-				    (object HasView "" @23
-					quidu      	"34D5AA950026"
-					client     	@22
-					supplier   	@4
-					line_style 	0)
-				    (object HasView "" @24
-					quidu      	"34D5AD2502DD"
-					client     	@11
-					supplier   	@22
-					line_style 	0)
-				    (object InheritView "" @25
-					quidu      	"35169DE202C7"
-					client     	@9
-					supplier   	@22
-					line_style 	0)
-				    (object ClassView "Class" "CCnaScanningCnfFinder" @26
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(465, 682)
-					label      	(object ItemLabel
-					    Parent_View 	@26
-					    location   	(338, 598)
-					    nlines     	2
-					    max_width  	296
-					    justify    	0
-					    label      	"CCnaScanningCnfFinder")
-					quidu      	"3516A02B020A"
-					width      	430
-					annotation 	8
-					autoResize 	TRUE)
-				    (object InheritView "" @27
-					quidu      	"3516A0440152"
-					client     	@26
-					supplier   	@5
-					line_style 	0)
-				    (object UsesView "" @28
-					quidu      	"3516A04A0132"
-					client     	@6
-					supplier   	@26
-					line_style 	0))))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "Main"
-			quid       	"34D5A63B0287"
-			title      	"Main"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object CategoryView "Converter Framework - Loading" @29
-				location   	(1116, 341)
-				label      	(object ItemLabel
-				    Parent_View 	@29
-				    location   	(719, 107)
-				    nlines     	2
-				    max_width  	794
-				    justify    	0
-				    label      	"Converter Framework - Loading")
-				quidu      	"34D5A6FD0308"
-				compartment 	(object Compartment
-				    Parent_View 	@29
-				    location   	(793, 173)
-				    anchor     	2
-				    nlines     	4
-				    max_width  	644
-				    compartmentItems 	(list Compartment
-					"CCnaScanningConverterFinder"
-					"CCnaConverterList"
-					"CCnaFoundConverter"
-					"CCnaConvInfoFile"))
-				width      	807
-				height     	481)))))
-	    (object Class_Category "Converters"
-		quid       	"3528DEDA013D"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class_Category "OLE 2.0 Store"
-			quid       	"3528DF900081"
-			exportControl 	"Public"
-			logical_models 	(list unit_reference_list
-			    (object Class "COleFile"
-				quid       	"3528F76D01BB"
-				fields     	(list has_relationship_list
-				    (object Has_Relationship
-					quid       	"3528F7CB003A"
-					supplier   	"COleFileBigBlockDir"
-					quidu      	"3528F783036C")
-				    (object Has_Relationship
-					quid       	"3528F7D103BE"
-					supplier   	"COleFileSmallBlockDir"
-					quidu      	"3528F78F0387")
-				    (object Has_Relationship
-					quid       	"352A224803A2"
-					supplier   	"COleFilePropertySetDir"
-					quidu      	"3528F79C0014"))
-				superclasses 	(list inheritance_relationship_list
-				    (object Inheritance_Relationship
-					quid       	"352A1F1F0060"
-					supplier   	"MOleFile"
-					quidu      	"352A1EF4039D")
-				    (object Inheritance_Relationship
-					quid       	"352B59EC0337"
-					supplier   	"COleStore"
-					quidu      	"352B59E50084")))
-			    (object Class "COleFileBigBlockDir"
-				quid       	"3528F783036C"
-				superclasses 	(list inheritance_relationship_list
-				    (object Inheritance_Relationship
-					quid       	"352A4B7B01C7"
-					supplier   	"MOleBlockReader"
-					quidu      	"352A4B5A001B"))
-				used_nodes 	(list uses_relationship_list
-				    (object Uses_Relationship
-					quid       	"352A2137033B"
-					supplier   	"MOleFile"
-					quidu      	"352A1EF4039D")))
-			    (object Class "COleFileSmallBlockDir"
-				quid       	"3528F78F0387"
-				superclasses 	(list inheritance_relationship_list
-				    (object Inheritance_Relationship
-					quid       	"352A4B780368"
-					supplier   	"MOleBlockReader"
-					quidu      	"352A4B5A001B"))
-				used_nodes 	(list uses_relationship_list
-				    (object Uses_Relationship
-					quid       	"352A4CF40378"
-					supplier   	"COleFileBigBlockDir"
-					quidu      	"3528F783036C")))
-			    (object Class "COleFilePropertySetDir"
-				quid       	"3528F79C0014"
-				superclasses 	(list inheritance_relationship_list
-				    (object Inheritance_Relationship
-					quid       	"352B50CF016F"
-					supplier   	"MStreamBuf"
-					quidu      	"352B50C5020B"))
-				used_nodes 	(list uses_relationship_list
-				    (object Uses_Relationship
-					quid       	"352A4D050110"
-					supplier   	"COleFileBigBlockDir"
-					quidu      	"3528F783036C")
-				    (object Uses_Relationship
-					quid       	"352B3F9C0128"
-					supplier   	"COleFileSmallBlockDir"
-					quidu      	"3528F78F0387"))
-				operations 	(list Operations
-				    (object Operation "AddBlockL"
-					quid       	"352B3E4500CB"
-					parameters 	(list Parameters
-					    (object Parameter "TInt aOffset"))
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "EntryAtL"
-					quid       	"352B3E45011B"
-					result     	"COlePropertySet"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "TInt BlocksInDir()"
-					quid       	"352B3E450175"
-					concurrency 	"Sequential"
-					opExportControl 	"Protected"
-					uid        	0)))
-			    (object Class "COleFilePropertySet"
-				quid       	"3528F7A80076")
-			    (object Class "COleFileDir"
-				quid       	"3529FEAC0015"
-				abstract   	TRUE
-				operations 	(list Operations
-				    (object Operation "AddBlockL"
-					quid       	"352A01A202B4"
-					parameters 	(list Parameters
-					    (object Parameter "TInt aOffset"))
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "EntryAtL"
-					quid       	"352A01CB032B"
-					result     	"COleFileObject"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "TInt BlocksInDir()"
-					quid       	"352A041F013D"
-					concurrency 	"Sequential"
-					opExportControl 	"Protected"
-					uid        	0)
-				    (object Operation "RFile& OleFile()"
-					quid       	"352A043301D2"
-					concurrency 	"Sequential"
-					opExportControl 	"Protected"
-					uid        	0)))
-			    (object Class "MOleFile"
-				quid       	"352A1EF4039D"
-				abstract   	TRUE
-				operations 	(list Operations
-				    (object Operation "RFile& OleFile()"
-					quid       	"352A1F000386"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)))
-			    (object Class "COleFileObject"
-				quid       	"352A236B002F"
-				abstract   	TRUE
-				operations 	(list Operations
-				    (object Operation "TInt Next()"
-					quid       	"352A27A000F6"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "TInt Prev()"
-					quid       	"352A27BC002E"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "TInt Index()"
-					quid       	"352A27C7028D"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "TUint Size()"
-					quid       	"352A27D6031B"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)))
-			    (object Class "MOleBlockReader"
-				quid       	"352A4B5A001B"
-				abstract   	TRUE)
-			    (object Class "MStreamBuf"
-				quid       	"352B50C5020B"
-				abstract   	TRUE)
-			    (object Class "RReadStream"
-				quid       	"352B51A50254"
-				abstract   	TRUE
-				operations 	(list Operations
-				    (object Operation "ReadL"
-					quid       	"352B51A50255"
-					parameters 	(list Parameters
-					    (object Parameter "aDes"
-						type       	"TDes8"))
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "ReadL"
-					quid       	"352B51A50257"
-					parameters 	(list Parameters
-					    (object Parameter "aDes"
-						type       	"TDes8")
-					    (object Parameter "aLength"
-						type       	"TInt"))
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "ReadL"
-					quid       	"352B51A5025A"
-					parameters 	(list Parameters
-					    (object Parameter "aPtr"
-						type       	"TAny*")
-					    (object Parameter "aLength"
-						type       	"TInt"))
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "ReadInt8L"
-					quid       	"352B51A5025E"
-					result     	"TInt8"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "ReadUint8L"
-					quid       	"352B51A5025F"
-					result     	"TUint8"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "ReadInt16L"
-					quid       	"352B51A50260"
-					result     	"TInt16"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "ReadUint16L"
-					quid       	"352B51A50261"
-					result     	"TUint16"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "ReadInt32L"
-					quid       	"352B51A50262"
-					result     	"TInt32"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "ReadUint32L"
-					quid       	"352B51A50263"
-					result     	"TUint32"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "ReadReal32L"
-					quid       	"352B51A50264"
-					result     	"TReal32"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "ReadReal64L"
-					quid       	"352B51A50265"
-					result     	"TReal64"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "Close"
-					quid       	"352B51A50266"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "SourceOf"
-					quid       	"352B51A50267"
-					parameters 	(list Parameters
-					    (object Parameter "aStream"
-						type       	"RReadStream"))
-					result     	"CStreamBuf"
-					concurrency 	"Sequential"
-					opExportControl 	"Protected"
-					uid        	0)
-				    (object Operation "Chan"
-					quid       	"352B51A50269"
-					result     	"TStreamSource"
-					concurrency 	"Sequential"
-					opExportControl 	"Private"
-					uid        	0)
-				    (object Operation "ReadRefL"
-					quid       	"352B51A5026A"
-					result     	"TUint32"
-					concurrency 	"Sequential"
-					opExportControl 	"Private"
-					uid        	0)
-				    (object Operation "ReadL"
-					quid       	"352B51A5026B"
-					parameters 	(list Parameters
-					    (object Parameter "aStream"
-						type       	"RWriteStream"))
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "ReadL"
-					quid       	"352B51A5026D"
-					parameters 	(list Parameters
-					    (object Parameter "aStream"
-						type       	"RWriteStream")
-					    (object Parameter "aLength"
-						type       	"TInt"))
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)))
-			    (object Class "COleStore"
-				quid       	"352B59E50084")
-			    (object Class "HOlePropertyBuf"
-				quid       	"3540C12F0105"
-				superclasses 	(list inheritance_relationship_list
-				    (object Inheritance_Relationship
-					quid       	"3540C15B00A4"
-					supplier   	"TStreamBuf"
-					quidu      	"3540C152012E"))
-				used_nodes 	(list uses_relationship_list
-				    (object Uses_Relationship
-					quid       	"3540C171013C"
-					supplier   	"COleFilePropertySetDir"
-					quidu      	"3528F79C0014")))
-			    (object Class "TStreamBuf"
-				quid       	"3540C152012E")
-			    (object Class "HOleSmallBuf"
-				quid       	"3540C17F00C4"
-				superclasses 	(list inheritance_relationship_list
-				    (object Inheritance_Relationship
-					quid       	"3540C1E10346"
-					supplier   	"HOlePropertyBuf"
-					quidu      	"3540C12F0105")))
-			    (object Class "HOleBigBuf"
-				quid       	"3540C18003BF"
-				superclasses 	(list inheritance_relationship_list
-				    (object Inheritance_Relationship
-					quid       	"3540C1E801F2"
-					supplier   	"HOlePropertyBuf"
-					quidu      	"3540C12F0105"))))
-			logical_presentations 	(list unit_reference_list
-			    (object ClassDiagram "Main"
-				quid       	"3528DFA8008F"
-				title      	"Main"
-				zoom       	90
-				max_height 	28350
-				max_width  	21600
-				origin_x   	101
-				origin_y   	1642
-				items      	(list diagram_item_list
-				    (object ClassView "Class" "COleFile" @30
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(1147, 217)
-					label      	(object ItemLabel
-					    Parent_View 	@30
-					    location   	(933, 113)
-					    nlines     	2
-					    max_width  	511
-					    justify    	0
-					    label      	"COleFile")
-					quidu      	"3528F76D01BB"
-					compartment 	(object Compartment
-					    Parent_View 	@30
-					    location   	(899, 174)
-					    anchor     	2
-					    nlines     	3
-					    max_width  	576
-					    justify    	0)
-					width      	742
-					height     	310
-					annotation 	8
-					autoResize 	TRUE)
-				    (object ClassView "Class" "COleFileBigBlockDir" @31
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(2294, 1054)
-					label      	(object ItemLabel
-					    Parent_View 	@31
-					    location   	(2190, 970)
-					    nlines     	2
-					    max_width  	240
-					    justify    	0
-					    label      	"COleFileBigBlockDir")
-					quidu      	"3528F783036C"
-					annotation 	8
-					autoResize 	TRUE)
-				    (object ClassView "Class" "COleFileSmallBlockDir" @32
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(1302, 713)
-					label      	(object ItemLabel
-					    Parent_View 	@32
-					    location   	(1188, 629)
-					    nlines     	2
-					    max_width  	267
-					    justify    	0
-					    label      	"COleFileSmallBlockDir")
-					quidu      	"3528F78F0387"
-					width      	388
-					annotation 	8
-					autoResize 	TRUE)
-				    (object ClassView "Class" "MOleFile" @33
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(2294, 155)
-					label      	(object ItemLabel
-					    Parent_View 	@33
-					    location   	(2150, 71)
-					    nlines     	2
-					    max_width  	339
-					    justify    	0
-					    label      	"MOleFile")
-					quidu      	"352A1EF4039D"
-					compartment 	(object Compartment
-					    Parent_View 	@33
-					    location   	(2126, 132)
-					    anchor     	2
-					    nlines     	1
-					    max_width  	385
-					    justify    	0)
-					width      	492
-					annotation 	8
-					autoResize 	TRUE)
-				    (object InheritView "" @34
-					quidu      	"352A1F1F0060"
-					client     	@30
-					supplier   	@33
-					line_style 	0)
-				    (object UsesView "" @35
-					quidu      	"352A2137033B"
-					client     	@31
-					supplier   	@33
-					line_style 	0)
-				    (object ClassView "Class" "COleFilePropertySetDir" @36
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(713, 1364)
-					label      	(object ItemLabel
-					    Parent_View 	@36
-					    location   	(463, 1213)
-					    nlines     	2
-					    max_width  	595
-					    justify    	0
-					    label      	"COleFilePropertySetDir")
-					quidu      	"3528F79C0014"
-					compartment 	(object Compartment
-					    Parent_View 	@36
-					    location   	(511, 1274)
-					    anchor     	2
-					    nlines     	3
-					    max_width  	497
-					    justify    	0)
-					width      	863
-					height     	444
-					annotation 	8
-					autoResize 	TRUE)
-				    (object HasView "" @37
-					quidu      	"3528F7CB003A"
-					client     	@30
-					supplier   	@31
-					line_style 	0)
-				    (object HasView "" @38
-					quidu      	"3528F7D103BE"
-					client     	@30
-					supplier   	@32
-					line_style 	0)
-				    (object HasView "" @39
-					quidu      	"352A224803A2"
-					client     	@30
-					supplier   	@36
-					line_style 	0)
-				    (object ClassView "Class" "MOleBlockReader" @40
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(1302, 1054)
-					label      	(object ItemLabel
-					    Parent_View 	@40
-					    location   	(1198, 970)
-					    nlines     	2
-					    max_width  	240
-					    justify    	0
-					    label      	"MOleBlockReader")
-					quidu      	"352A4B5A001B"
-					annotation 	8
-					autoResize 	TRUE)
-				    (object InheritView "" @41
-					quidu      	"352A4B780368"
-					client     	@32
-					supplier   	@40
-					line_style 	0)
-				    (object InheritView "" @42
-					quidu      	"352A4B7B01C7"
-					client     	@31
-					supplier   	@40
-					line_style 	0)
-				    (object UsesView "" @43
-					quidu      	"352A4CF40378"
-					client     	@32
-					supplier   	@31
-					line_style 	0)
-				    (object UsesView "" @44
-					quidu      	"352A4D050110"
-					client     	@36
-					supplier   	@31
-					line_style 	0)
-				    (object ClassView "Class" "ROleReadPropertySet" @45
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(1457, 2697)
-					label      	(object ItemLabel
-					    Parent_View 	@45
-					    location   	(1282, 2547)
-					    nlines     	2
-					    max_width  	415
-					    justify    	0
-					    label      	"ROleReadPropertySet")
-					quidu      	"352A27560014"
-					compartment 	(object Compartment
-					    Parent_View 	@45
-					    location   	(1282, 2608)
-					    anchor     	2
-					    nlines     	6
-					    max_width  	413
-					    justify    	0)
-					width      	602
-					height     	440
-					annotation 	8
-					autoResize 	TRUE)
-				    (object NoteView @46
-					location   	(2449, 1395)
-					label      	(object ItemLabel
-					    Parent_View 	@46
-					    location   	(2172, 1220)
-					    nlines     	7
-					    max_width  	578
-					    label      	
-|All RFile access is provided by COleFileBigBlockDir
-|Access to underlying objects are provided through the MOleBlockReader interface
-					    )
-					width      	638
-					height     	363)
-				    (object UsesView "" @47
-					quidu      	"352B3F9C0128"
-					client     	@36
-					supplier   	@32
-					line_style 	0)
-				    (object ClassView "Class" "RReadStream" @48
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(2480, 2976)
-					label      	(object ItemLabel
-					    Parent_View 	@48
-					    location   	(2340, 2511)
-					    nlines     	2
-					    max_width  	329
-					    justify    	0
-					    label      	"RReadStream")
-					quidu      	"352B51A50254"
-					compartment 	(object Compartment
-					    Parent_View 	@48
-					    location   	(2316, 2572)
-					    anchor     	2
-					    nlines     	17
-					    max_width  	375
-					    justify    	0)
-					width      	478
-					height     	1340
-					annotation 	8
-					autoResize 	TRUE)
-				    (object InheritView "" @49
-					quidu      	"352B50E8036A"
-					client     	@45
-					supplier   	@48
-					line_style 	0)
-				    (object NoteView @50
-					location   	(465, 1829)
-					label      	(object ItemLabel
-					    Parent_View 	@50
-					    location   	(179, 1654)
-					    nlines     	7
-					    max_width  	596
-					    label      	
-|Not fully abstracted from the COleFilePropertySetDir
-|
-|This should be done if an OLE2.0 framework is to be incorporated into store
-					    )
-					width      	656
-					height     	363)
-				    (object ClassView "Class" "HOlePropertyBuf" @51
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(1426, 1860)
-					label      	(object ItemLabel
-					    Parent_View 	@51
-					    location   	(1322, 1776)
-					    nlines     	2
-					    max_width  	240
-					    justify    	0
-					    label      	"HOlePropertyBuf")
-					quidu      	"3540C12F0105"
-					annotation 	8
-					autoResize 	TRUE)
-				    (object ClassView "Class" "TStreamBuf" @52
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(1736, 1550)
-					label      	(object ItemLabel
-					    Parent_View 	@52
-					    location   	(1632, 1466)
-					    nlines     	2
-					    max_width  	240
-					    justify    	0
-					    label      	"TStreamBuf")
-					quidu      	"3540C152012E"
-					annotation 	8
-					autoResize 	TRUE)
-				    (object InheritView "" @53
-					quidu      	"3540C15B00A4"
-					client     	@51
-					supplier   	@52
-					line_style 	0)
-				    (object UsesView "" @54
-					quidu      	"3540C171013C"
-					client     	@51
-					supplier   	@36
-					line_style 	0)
-				    (object ClassView "Class" "HOleSmallBuf" @55
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(1054, 2170)
-					label      	(object ItemLabel
-					    Parent_View 	@55
-					    location   	(950, 2086)
-					    nlines     	2
-					    max_width  	240
-					    justify    	0
-					    label      	"HOleSmallBuf")
-					quidu      	"3540C17F00C4"
-					annotation 	8
-					autoResize 	TRUE)
-				    (object ClassView "Class" "HOleBigBuf" @56
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(1860, 2170)
-					label      	(object ItemLabel
-					    Parent_View 	@56
-					    location   	(1756, 2086)
-					    nlines     	2
-					    max_width  	240
-					    justify    	0
-					    label      	"HOleBigBuf")
-					quidu      	"3540C18003BF"
-					annotation 	8
-					autoResize 	TRUE)
-				    (object InheritView "" @57
-					quidu      	"3540C1E10346"
-					client     	@55
-					supplier   	@51
-					line_style 	0)
-				    (object InheritView "" @58
-					quidu      	"3540C1E801F2"
-					client     	@56
-					supplier   	@51
-					line_style 	0)
-				    (object HasView "" @59
-					quidu      	"3546F317020A"
-					client     	@45
-					supplier   	@55
-					line_style 	0)
-				    (object HasView "" @60
-					quidu      	"3546F3240168"
-					client     	@45
-					supplier   	@56
-					line_style 	0)))))
-		    (object Class_Category "OLE 2.0 stream"
-			quid       	"352A27010061"
-			visible_categories 	(list visibility_relationship_list
-			    (object Visibility_Relationship
-				quid       	"352B3F02027B"
-				supplier   	"OLE 2.0 Store"
-				quidu      	"3528DF900081"))
-			exportControl 	"Public"
-			logical_models 	(list unit_reference_list
-			    (object Class "ROleReadPropertySet"
-				quid       	"352A27560014"
-				fields     	(list has_relationship_list
-				    (object Has_Relationship
-					quid       	"3546F317020A"
-					supplier   	"HOleSmallBuf"
-					quidu      	"3540C17F00C4")
-				    (object Has_Relationship
-					quid       	"3546F3240168"
-					supplier   	"HOleBigBuf"
-					quidu      	"3540C18003BF"))
-				superclasses 	(list inheritance_relationship_list
-				    (object Inheritance_Relationship
-					quid       	"352A276C014C"
-					supplier   	"COleFileObject"
-					quidu      	"352A236B002F")
-				    (object Inheritance_Relationship
-					quid       	"352B50E8036A"
-					supplier   	"RReadStream"
-					quidu      	"352B51A50254"))
-				operations 	(list Operations
-				    (object Operation "TUint8 Type()"
-					quid       	"352A285E02DA"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "TDesC16& Name()"
-					quid       	"352A286E03A5"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0)
-				    (object Operation "TUint PropertySize()"
-					quid       	"352A28D60160"
-					concurrency 	"Sequential"
-					opExportControl 	"Public"
-					uid        	0))))
-			logical_presentations 	(list unit_reference_list
-			    (object ClassDiagram "Main"
-				quid       	"352A27190297"
-				title      	"Main"
-				zoom       	100
-				max_height 	28350
-				max_width  	21600
-				origin_x   	0
-				origin_y   	0
-				items      	(list diagram_item_list
-				    (object ClassView "Class" "ROleReadPropertySet" @61
-					IncludeAttribute 	TRUE
-					IncludeOperation 	TRUE
-					location   	(1178, 310)
-					label      	(object ItemLabel
-					    Parent_View 	@61
-					    location   	(911, 185)
-					    nlines     	2
-					    max_width  	640
-					    justify    	0
-					    label      	"ROleReadPropertySet")
-					quidu      	"352A27560014"
-					compartment 	(object Compartment
-					    Parent_View 	@61
-					    location   	(1230, 313)
-					    anchor     	2
-					    nlines     	5
-					    max_width  	0
-					    justify    	0)
-					width      	928
-					height     	370
-					annotation 	8
-					autoResize 	TRUE))))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "Main"
-			quid       	"34D59F87024E"
-			title      	"Main"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object CategoryView "OLE 2.0 Store" @62
-				location   	(1240, 403)
-				label      	(object ItemLabel
-				    Parent_View 	@62
-				    location   	(878, 187)
-				    nlines     	2
-				    max_width  	724
-				    justify    	0
-				    label      	"OLE 2.0 Store")
-				quidu      	"3528DF900081"
-				compartment 	(object Compartment
-				    Parent_View 	@62
-				    location   	(945, 253)
-				    anchor     	2
-				    nlines     	7
-				    max_width  	588
-				    compartmentItems 	(list Compartment
-					"COleFile"
-					"COleFileBigBlockDir"
-					"COleFileSmallBlockDir"
-					"COleFilePropertySetDir"
-					"COleFilePropertySet"
-					"COleFileDir"
-					"MOleFile"))
-				width      	737
-				height     	444)
-			    (object CategoryView "OLE 2.0 stream" @63
-				location   	(1240, 1085)
-				label      	(object ItemLabel
-				    Parent_View 	@63
-				    location   	(874, 872)
-				    nlines     	2
-				    max_width  	732
-				    justify    	0
-				    label      	"OLE 2.0 stream")
-				quidu      	"352A27010061"
-				compartment 	(object Compartment
-				    Parent_View 	@63
-				    location   	(942, 944)
-				    anchor     	2
-				    nlines     	1
-				    max_width  	595
-				    compartmentItems 	(list Compartment
-					"ROleReadPropertySet"))
-				width      	744
-				height     	438)
-			    (object ImportView "" @64
-				quidu      	"352B3F02027B"
-				client     	@63
-				supplier   	@62
-				line_style 	0))))))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"3529FE790300"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"34D59F870247"
-	physical_models 	(list unit_reference_list
-	    (object module "Body" "SubType" "Body"
-		quid       	"34D5A0FB02C1"))
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"34D59F870262"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"34D59F870248"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"34D59F870264"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"cg"
-		name       	"roseId"
-		value      	"753117540")
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"compiler2.1__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue(sizeof($targetClass),$limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue(sizeof($targetClass),$limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference($limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference($limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue(sizeof($qualtype), sizeof($qualcont)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue(sizeof($qualtype), sizeof($qualcont)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference(sizeof($qualtype), sizeof($qualcont)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference(sizeof($qualtype), sizeof($qualcont)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"compiler3.0__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IDLElement"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IDLSpecificationType"
-			value      	("IDLSpecSet" 22))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IDLSpecSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Interface"
-				value      	22)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Typedef"
-				value      	54)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Enumeration"
-				value      	8)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	71)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Exception"
-				value      	61)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Struct"
-				value      	51)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Union"
-				value      	81)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIDLModule"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBase"
-			value      	("DataBaseSet" 800))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"DDL"
-				name       	"ANSI"
-				value      	800)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Oracle"
-				value      	801)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"SQLServer"
-				value      	802)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Sybase"
-				value      	803)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Watcom"
-				value      	804)))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnName"
-			value      	"Id")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5)")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ViewName"
-			value      	"V_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"TableName"
-			value      	"T_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"InheritSuffix"
-			value      	"_V")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"BaseViews"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ColumnType"
-			value      	"VARCHAR")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"NullsOK"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Unique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIDLModule"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ModuleName"
-			value      	(value Text "")))))
-	quid       	"34D59F870249"))
+
+(object Petal
+    version    	40)
+
+(object Design "Logical View"
+    is_unit    	TRUE
+    is_loaded  	TRUE
+    file_name  	"G:\\convert\\design\\conarc.mdl"
+    quid       	"3546F2EF0234"
+    defaults   	(object defaults
+	rightMargin 	0.250000
+	leftMargin 	0.250000
+	topMargin  	0.250000
+	bottomMargin 	0.500000
+	pageOverlap 	0.250000
+	clipIconLabels 	TRUE
+	autoResize 	TRUE
+	snapToGrid 	TRUE
+	gridX      	31
+	gridY      	31
+	defaultFont 	(object Font
+	    size       	10
+	    face       	"arial"
+	    bold       	FALSE
+	    italics    	FALSE
+	    underline  	FALSE
+	    strike     	FALSE
+	    color      	0
+	    default_color 	TRUE)
+	showMessageNum 	3
+	showClassOfObject 	TRUE
+	notation   	"Booch")
+    root_usecase_package 	(object Class_Category "Use Case View"
+	quid       	"34D59F870246"
+	exportControl 	"Public"
+	global     	TRUE
+	logical_models 	(list unit_reference_list)
+	logical_presentations 	(list unit_reference_list
+	    (object UseCaseDiagram "Main"
+		quid       	"34D59F870263"
+		title      	"Main"
+		zoom       	100
+		max_height 	28350
+		max_width  	21600
+		origin_x   	0
+		origin_y   	0
+		items      	(list diagram_item_list))))
+    root_category 	(object Class_Category "Logical View"
+	quid       	"34D59F870245"
+	exportControl 	"Public"
+	global     	TRUE
+	subsystem  	"Component View"
+	quidu      	"34D59F870247"
+	logical_models 	(list unit_reference_list
+	    (object Class_Category "ConArc"
+		quid       	"34D5A61E0131"
+		exportControl 	"Public"
+		logical_models 	(list unit_reference_list
+		    (object Class_Category "Converter Framework - Loading"
+			quid       	"34D5A6FD0308"
+			exportControl 	"Public"
+			logical_models 	(list unit_reference_list
+			    (object Class "CConverterBase"
+				quid       	"34D5A7A00321"
+				used_nodes 	(list uses_relationship_list
+				    (object Uses_Relationship
+					quid       	"34DB3F7B00BA"
+					supplier   	"MConversionObserver"
+					quidu      	"34DB3E9001D5"))
+				abstract   	TRUE
+				operations 	(list Operations
+				    (object Operation "ConvertL(TFileName&, TFileName&, MConversionObserver*)"
+					quid       	"34D5A7F002B8"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "ConvertObjectL(RReadStream&, RWriteStream&,MConversionObserver*)"
+					quid       	"34DB3DD5019A"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "ConverterUid"
+					quid       	"34D5A8160032"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)))
+			    (object Class "CConverterLibrary"
+				quid       	"34D5A859004C"
+				fields     	(list has_relationship_list
+				    (object Has_Relationship
+					quid       	"34D5A89803DC"
+					supplier   	"CConverterBase"
+					quidu      	"34D5A7A00321"
+					supplier_cardinality 	(value cardinality "1..n")))
+				operations 	(list Operations
+				    (object Operation "Converter"
+					quid       	"34D5A8BD038F"
+					result     	"CConverterBase"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)))
+			    (object Class "CCnaConverter"
+				quid       	"34D5AA37025C"
+				fields     	(list has_relationship_list
+				    (object Has_Relationship
+					quid       	"34D5AA950026"
+					supplier   	"TMimeType"
+					quidu      	"34D5AA8600D9"
+					supplier_cardinality 	(value cardinality "2..n")))
+				operations 	(list Operations
+				    (object Operation "AddMimeFromL"
+					quid       	"34D5AA5201A7"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "AddMimeToL"
+					quid       	"34D5AA580259"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "SetUid"
+					quid       	"34D5AA69033A"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "MimeFrom"
+					quid       	"35169F000051"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "MimeTo"
+					quid       	"35169F0903E4"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)))
+			    (object Class "TMimeType"
+				quid       	"34D5AA8600D9")
+			    (object Class "CCnaConverterFinder"
+				quid       	"34D5AB30032C"
+				abstract   	TRUE
+				operations 	(list Operations
+				    (object Operation "FindAllConvL"
+					quid       	"34D5AB540392"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "NextL"
+					quid       	"34D5AB5A02DD"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)))
+			    (object Class "CCnaScanningConverterFinder"
+				quid       	"34D5AB940019"
+				superclasses 	(list inheritance_relationship_list
+				    (object Inheritance_Relationship
+					quid       	"34D5ABA00369"
+					supplier   	"CCnaConverterFinder"
+					quidu      	"34D5AB30032C"))
+				used_nodes 	(list uses_relationship_list
+				    (object Uses_Relationship
+					quid       	"3516A04A0132"
+					supplier   	"CCnaScanningCnfFinder"
+					quidu      	"3516A02B020A")))
+			    (object Class "CCnaConverterList"
+				quid       	"34D5ABD902C1"
+				fields     	(list has_relationship_list
+				    (object Has_Relationship
+					quid       	"35169EDE000C"
+					supplier   	"CCnaFoundConverter"
+					quidu      	"34D5ABFB0216"
+					supplier_cardinality 	(value cardinality "1..n")))
+				used_nodes 	(list uses_relationship_list
+				    (object Uses_Relationship
+					quid       	"35169EA402BC"
+					supplier   	"CCnaScanningConverterFinder"
+					quidu      	"34D5AB940019"))
+				operations 	(list Operations
+				    (object Operation "UpdateL"
+					quid       	"3516680F0147"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "Converter"
+					quid       	"351668280175"
+					parameters 	(list Parameters
+					    (object Parameter "TUid aUid"))
+					result     	"CConverterBase*"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "Release"
+					quid       	"35166846015A"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)))
+			    (object Class "CCnaFoundConverter"
+				quid       	"34D5ABFB0216"
+				superclasses 	(list inheritance_relationship_list
+				    (object Inheritance_Relationship
+					quid       	"35169DE202C7"
+					supplier   	"CCnaConverter"
+					quidu      	"34D5AA37025C"))
+				used_nodes 	(list uses_relationship_list
+				    (object Uses_Relationship
+					quid       	"34D5AC54017E"
+					supplier   	"CConverterLibrary"
+					quidu      	"34D5A859004C"))
+				class_attributes 	(list class_attribute_list
+				    (object ClassAttribute "iConEntry"
+					quid       	"35169FDB038B"
+					exportControl 	"Public")))
+			    (object Class "CCnaConvInfoFile"
+				quid       	"34D5ACFE02CD"
+				fields     	(list has_relationship_list
+				    (object Has_Relationship
+					quid       	"34D5AD2502DD"
+					supplier   	"CCnaConverter"
+					quidu      	"34D5AA37025C"
+					supplier_cardinality 	(value cardinality "1..n"))
+				    (object Has_Relationship
+					quid       	"34D5AE7A0391"
+					supplier   	"CPersistentStore"
+					quidu      	"34D5ADB303C7"
+					exportControl 	"Protected")))
+			    (object Class "CPersistentStore"
+				quid       	"34D5ADB303C7"
+				exportControl 	"Implementation"
+				abstract   	TRUE
+				space      	"CCnaConvInfoFile")
+			    (object Class "CCnaInfoFileWriter"
+				quid       	"34D5AEB5009D"
+				superclasses 	(list inheritance_relationship_list
+				    (object Inheritance_Relationship
+					quid       	"34D5AECD0387"
+					supplier   	"CCnaConvInfoFile"
+					quidu      	"34D5ACFE02CD"))
+				operations 	(list Operations
+				    (object Operation "AddConverterL"
+					quid       	"35169F8602F3"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)))
+			    (object Class "CCnaInfoFileReader"
+				quid       	"34D5AEB60379"
+				superclasses 	(list inheritance_relationship_list
+				    (object Inheritance_Relationship
+					quid       	"34D5AED001C8"
+					supplier   	"CCnaConvInfoFile"
+					quidu      	"34D5ACFE02CD"))
+				operations 	(list Operations
+				    (object Operation "AtL"
+					quid       	"35169F6500D9"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)))
+			    (object Class "MConversionObserver"
+				quid       	"34DB3E9001D5"
+				operations 	(list Operations
+				    (object Operation "EmbeddedObject(TMimeType&)"
+					quid       	"34DB3EAA01A0"
+					result     	"CConverterBase"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "MaxSteps"
+					quid       	"34DB3EF503E3"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "Progress"
+					quid       	"34DB3F0400B9"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "Result"
+					quid       	"34DB3F110248"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)))
+			    (object Class "CCnaScanningCnfFinder"
+				quid       	"3516A02B020A"
+				superclasses 	(list inheritance_relationship_list
+				    (object Inheritance_Relationship
+					quid       	"3516A0440152"
+					supplier   	"CCnaConverterFinder"
+					quidu      	"34D5AB30032C"))))
+			logical_presentations 	(list unit_reference_list
+			    (object ClassDiagram "Main"
+				quid       	"34D5A793021E"
+				title      	"Main"
+				zoom       	80
+				max_height 	28350
+				max_width  	21600
+				origin_x   	0
+				origin_y   	0
+				items      	(list diagram_item_list
+				    (object ClassView "Class" "CConverterBase" @1
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(1147, 2387)
+					label      	(object ItemLabel
+					    Parent_View 	@1
+					    location   	(573, 2260)
+					    nlines     	2
+					    max_width  	1388
+					    justify    	0
+					    label      	"CConverterBase")
+					quidu      	"34D5A7A00321"
+					width      	2012
+					height     	376
+					annotation 	8
+					autoResize 	TRUE)
+				    (object ClassView "Class" "CConverterLibrary" @2
+					IncludeOperation 	TRUE
+					location   	(1178, 1488)
+					label      	(object ItemLabel
+					    Parent_View 	@2
+					    location   	(1064, 1404)
+					    nlines     	2
+					    max_width  	266
+					    justify    	0
+					    label      	"CConverterLibrary")
+					quidu      	"34D5A859004C"
+					width      	386
+					annotation 	8
+					autoResize 	TRUE)
+				    (object HasView "" @3
+					quidu      	"34D5A89803DC"
+					client     	@2
+					supplier   	@1
+					line_style 	0)
+				    (object ClassView "Class" "TMimeType" @4
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(2914, 2325)
+					label      	(object ItemLabel
+					    Parent_View 	@4
+					    location   	(2810, 2241)
+					    nlines     	2
+					    max_width  	240
+					    justify    	0
+					    label      	"TMimeType")
+					quidu      	"34D5AA8600D9"
+					annotation 	8
+					autoResize 	TRUE)
+				    (object ClassView "Class" "CCnaConverterFinder" @5
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(992, 310)
+					label      	(object ItemLabel
+					    Parent_View 	@5
+					    location   	(836, 205)
+					    nlines     	2
+					    max_width  	369
+					    justify    	0
+					    label      	"CCnaConverterFinder")
+					quidu      	"34D5AB30032C"
+					width      	536
+					height     	314
+					annotation 	8
+					autoResize 	TRUE)
+				    (object ClassView "Class" "CCnaScanningConverterFinder" @6
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(1116, 744)
+					label      	(object ItemLabel
+					    Parent_View 	@6
+					    location   	(986, 660)
+					    nlines     	2
+					    max_width  	304
+					    justify    	0
+					    label      	"CCnaScanningConverterFinder")
+					quidu      	"34D5AB940019"
+					width      	442
+					annotation 	8
+					autoResize 	TRUE)
+				    (object InheritView "" @7
+					quidu      	"34D5ABA00369"
+					client     	@6
+					supplier   	@5
+					line_style 	0)
+				    (object ClassView "Class" "CCnaConverterList" @8
+					IncludeOperation 	TRUE
+					location   	(1798, 589)
+					label      	(object ItemLabel
+					    Parent_View 	@8
+					    location   	(1618, 421)
+					    nlines     	2
+					    max_width  	426
+					    justify    	0
+					    label      	"CCnaConverterList")
+					quidu      	"34D5ABD902C1"
+					width      	618
+					height     	492
+					annotation 	8
+					autoResize 	TRUE)
+				    (object ClassView "Class" "CCnaFoundConverter" @9
+					IncludeOperation 	TRUE
+					location   	(1798, 1147)
+					label      	(object ItemLabel
+					    Parent_View 	@9
+					    location   	(1690, 1063)
+					    nlines     	2
+					    max_width  	251
+					    justify    	0
+					    label      	"CCnaFoundConverter")
+					quidu      	"34D5ABFB0216"
+					compartment 	(object Compartment
+					    Parent_View 	@9
+					    location   	(1666, 1181)
+					    anchor     	2
+					    nlines     	1
+					    max_width  	297
+					    justify    	0
+					    compartmentItems 	(list Compartment
+						"iConEntry"))
+					width      	364
+					annotation 	8
+					autoResize 	TRUE)
+				    (object UsesView "" @10
+					quidu      	"34D5AC54017E"
+					client     	@9
+					supplier   	@2
+					line_style 	0)
+				    (object ClassView "Class" "CCnaConvInfoFile" @11
+					IncludeOperation 	TRUE
+					location   	(2356, 2759)
+					label      	(object ItemLabel
+					    Parent_View 	@11
+					    location   	(2252, 2675)
+					    nlines     	2
+					    max_width  	240
+					    justify    	0
+					    label      	"CCnaConvInfoFile")
+					quidu      	"34D5ACFE02CD"
+					annotation 	8
+					autoResize 	TRUE)
+				    (object ClassView "Class" "CPersistentStore" @12
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(2852, 2945)
+					label      	(object ItemLabel
+					    Parent_View 	@12
+					    location   	(2748, 2861)
+					    nlines     	2
+					    max_width  	240
+					    justify    	0
+					    label      	"CPersistentStore")
+					quidu      	"34D5ADB303C7"
+					annotation 	8
+					autoResize 	TRUE)
+				    (object HasView "" @13
+					quidu      	"34D5AE7A0391"
+					client     	@11
+					supplier   	@12
+					line_style 	0)
+				    (object ClassView "Class" "CCnaInfoFileWriter" @14
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(2015, 3255)
+					label      	(object ItemLabel
+					    Parent_View 	@14
+					    location   	(1857, 3171)
+					    nlines     	2
+					    max_width  	373
+					    justify    	0
+					    label      	"CCnaInfoFileWriter")
+					quidu      	"34D5AEB5009D"
+					width      	542
+					annotation 	8
+					autoResize 	TRUE)
+				    (object ClassView "Class" "CCnaInfoFileReader" @15
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(2604, 3255)
+					label      	(object ItemLabel
+					    Parent_View 	@15
+					    location   	(2500, 3171)
+					    nlines     	2
+					    max_width  	240
+					    justify    	0
+					    label      	"CCnaInfoFileReader")
+					quidu      	"34D5AEB60379"
+					annotation 	8
+					autoResize 	TRUE)
+				    (object InheritView "" @16
+					quidu      	"34D5AECD0387"
+					client     	@14
+					supplier   	@11
+					line_style 	0)
+				    (object InheritView "" @17
+					quidu      	"34D5AED001C8"
+					client     	@15
+					supplier   	@11
+					line_style 	0)
+				    (object ClassView "Class" "MConversionObserver" @18
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(930, 3007)
+					label      	(object ItemLabel
+					    Parent_View 	@18
+					    location   	(651, 2875)
+					    nlines     	2
+					    max_width  	669
+					    justify    	0
+					    label      	"MConversionObserver")
+					quidu      	"34DB3E9001D5"
+					width      	970
+					height     	390
+					annotation 	8
+					autoResize 	TRUE)
+				    (object UsesView "" @19
+					quidu      	"34DB3F7B00BA"
+					client     	@1
+					supplier   	@18
+					line_style 	0)
+				    (object UsesView "" @20
+					quidu      	"35169EA402BC"
+					client     	@8
+					supplier   	@6
+					line_style 	0)
+				    (object HasView "" @21
+					quidu      	"35169EDE000C"
+					client     	@8
+					supplier   	@9
+					line_style 	0)
+				    (object ClassView "Class" "CCnaConverter" @22
+					IncludeOperation 	TRUE
+					location   	(2480, 1798)
+					label      	(object ItemLabel
+					    Parent_View 	@22
+					    location   	(2267, 1606)
+					    nlines     	2
+					    max_width  	506
+					    justify    	0
+					    label      	"CCnaConverter")
+					quidu      	"34D5AA37025C"
+					width      	734
+					height     	562
+					annotation 	8
+					autoResize 	TRUE)
+				    (object HasView "" @23
+					quidu      	"34D5AA950026"
+					client     	@22
+					supplier   	@4
+					line_style 	0)
+				    (object HasView "" @24
+					quidu      	"34D5AD2502DD"
+					client     	@11
+					supplier   	@22
+					line_style 	0)
+				    (object InheritView "" @25
+					quidu      	"35169DE202C7"
+					client     	@9
+					supplier   	@22
+					line_style 	0)
+				    (object ClassView "Class" "CCnaScanningCnfFinder" @26
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(465, 682)
+					label      	(object ItemLabel
+					    Parent_View 	@26
+					    location   	(338, 598)
+					    nlines     	2
+					    max_width  	296
+					    justify    	0
+					    label      	"CCnaScanningCnfFinder")
+					quidu      	"3516A02B020A"
+					width      	430
+					annotation 	8
+					autoResize 	TRUE)
+				    (object InheritView "" @27
+					quidu      	"3516A0440152"
+					client     	@26
+					supplier   	@5
+					line_style 	0)
+				    (object UsesView "" @28
+					quidu      	"3516A04A0132"
+					client     	@6
+					supplier   	@26
+					line_style 	0))))))
+		logical_presentations 	(list unit_reference_list
+		    (object ClassDiagram "Main"
+			quid       	"34D5A63B0287"
+			title      	"Main"
+			zoom       	100
+			max_height 	28350
+			max_width  	21600
+			origin_x   	0
+			origin_y   	0
+			items      	(list diagram_item_list
+			    (object CategoryView "Converter Framework - Loading" @29
+				location   	(1116, 341)
+				label      	(object ItemLabel
+				    Parent_View 	@29
+				    location   	(719, 107)
+				    nlines     	2
+				    max_width  	794
+				    justify    	0
+				    label      	"Converter Framework - Loading")
+				quidu      	"34D5A6FD0308"
+				compartment 	(object Compartment
+				    Parent_View 	@29
+				    location   	(793, 173)
+				    anchor     	2
+				    nlines     	4
+				    max_width  	644
+				    compartmentItems 	(list Compartment
+					"CCnaScanningConverterFinder"
+					"CCnaConverterList"
+					"CCnaFoundConverter"
+					"CCnaConvInfoFile"))
+				width      	807
+				height     	481)))))
+	    (object Class_Category "Converters"
+		quid       	"3528DEDA013D"
+		exportControl 	"Public"
+		logical_models 	(list unit_reference_list
+		    (object Class_Category "OLE 2.0 Store"
+			quid       	"3528DF900081"
+			exportControl 	"Public"
+			logical_models 	(list unit_reference_list
+			    (object Class "COleFile"
+				quid       	"3528F76D01BB"
+				fields     	(list has_relationship_list
+				    (object Has_Relationship
+					quid       	"3528F7CB003A"
+					supplier   	"COleFileBigBlockDir"
+					quidu      	"3528F783036C")
+				    (object Has_Relationship
+					quid       	"3528F7D103BE"
+					supplier   	"COleFileSmallBlockDir"
+					quidu      	"3528F78F0387")
+				    (object Has_Relationship
+					quid       	"352A224803A2"
+					supplier   	"COleFilePropertySetDir"
+					quidu      	"3528F79C0014"))
+				superclasses 	(list inheritance_relationship_list
+				    (object Inheritance_Relationship
+					quid       	"352A1F1F0060"
+					supplier   	"MOleFile"
+					quidu      	"352A1EF4039D")
+				    (object Inheritance_Relationship
+					quid       	"352B59EC0337"
+					supplier   	"COleStore"
+					quidu      	"352B59E50084")))
+			    (object Class "COleFileBigBlockDir"
+				quid       	"3528F783036C"
+				superclasses 	(list inheritance_relationship_list
+				    (object Inheritance_Relationship
+					quid       	"352A4B7B01C7"
+					supplier   	"MOleBlockReader"
+					quidu      	"352A4B5A001B"))
+				used_nodes 	(list uses_relationship_list
+				    (object Uses_Relationship
+					quid       	"352A2137033B"
+					supplier   	"MOleFile"
+					quidu      	"352A1EF4039D")))
+			    (object Class "COleFileSmallBlockDir"
+				quid       	"3528F78F0387"
+				superclasses 	(list inheritance_relationship_list
+				    (object Inheritance_Relationship
+					quid       	"352A4B780368"
+					supplier   	"MOleBlockReader"
+					quidu      	"352A4B5A001B"))
+				used_nodes 	(list uses_relationship_list
+				    (object Uses_Relationship
+					quid       	"352A4CF40378"
+					supplier   	"COleFileBigBlockDir"
+					quidu      	"3528F783036C")))
+			    (object Class "COleFilePropertySetDir"
+				quid       	"3528F79C0014"
+				superclasses 	(list inheritance_relationship_list
+				    (object Inheritance_Relationship
+					quid       	"352B50CF016F"
+					supplier   	"MStreamBuf"
+					quidu      	"352B50C5020B"))
+				used_nodes 	(list uses_relationship_list
+				    (object Uses_Relationship
+					quid       	"352A4D050110"
+					supplier   	"COleFileBigBlockDir"
+					quidu      	"3528F783036C")
+				    (object Uses_Relationship
+					quid       	"352B3F9C0128"
+					supplier   	"COleFileSmallBlockDir"
+					quidu      	"3528F78F0387"))
+				operations 	(list Operations
+				    (object Operation "AddBlockL"
+					quid       	"352B3E4500CB"
+					parameters 	(list Parameters
+					    (object Parameter "TInt aOffset"))
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "EntryAtL"
+					quid       	"352B3E45011B"
+					result     	"COlePropertySet"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "TInt BlocksInDir()"
+					quid       	"352B3E450175"
+					concurrency 	"Sequential"
+					opExportControl 	"Protected"
+					uid        	0)))
+			    (object Class "COleFilePropertySet"
+				quid       	"3528F7A80076")
+			    (object Class "COleFileDir"
+				quid       	"3529FEAC0015"
+				abstract   	TRUE
+				operations 	(list Operations
+				    (object Operation "AddBlockL"
+					quid       	"352A01A202B4"
+					parameters 	(list Parameters
+					    (object Parameter "TInt aOffset"))
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "EntryAtL"
+					quid       	"352A01CB032B"
+					result     	"COleFileObject"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "TInt BlocksInDir()"
+					quid       	"352A041F013D"
+					concurrency 	"Sequential"
+					opExportControl 	"Protected"
+					uid        	0)
+				    (object Operation "RFile& OleFile()"
+					quid       	"352A043301D2"
+					concurrency 	"Sequential"
+					opExportControl 	"Protected"
+					uid        	0)))
+			    (object Class "MOleFile"
+				quid       	"352A1EF4039D"
+				abstract   	TRUE
+				operations 	(list Operations
+				    (object Operation "RFile& OleFile()"
+					quid       	"352A1F000386"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)))
+			    (object Class "COleFileObject"
+				quid       	"352A236B002F"
+				abstract   	TRUE
+				operations 	(list Operations
+				    (object Operation "TInt Next()"
+					quid       	"352A27A000F6"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "TInt Prev()"
+					quid       	"352A27BC002E"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "TInt Index()"
+					quid       	"352A27C7028D"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "TUint Size()"
+					quid       	"352A27D6031B"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)))
+			    (object Class "MOleBlockReader"
+				quid       	"352A4B5A001B"
+				abstract   	TRUE)
+			    (object Class "MStreamBuf"
+				quid       	"352B50C5020B"
+				abstract   	TRUE)
+			    (object Class "RReadStream"
+				quid       	"352B51A50254"
+				abstract   	TRUE
+				operations 	(list Operations
+				    (object Operation "ReadL"
+					quid       	"352B51A50255"
+					parameters 	(list Parameters
+					    (object Parameter "aDes"
+						type       	"TDes8"))
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "ReadL"
+					quid       	"352B51A50257"
+					parameters 	(list Parameters
+					    (object Parameter "aDes"
+						type       	"TDes8")
+					    (object Parameter "aLength"
+						type       	"TInt"))
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "ReadL"
+					quid       	"352B51A5025A"
+					parameters 	(list Parameters
+					    (object Parameter "aPtr"
+						type       	"TAny*")
+					    (object Parameter "aLength"
+						type       	"TInt"))
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "ReadInt8L"
+					quid       	"352B51A5025E"
+					result     	"TInt8"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "ReadUint8L"
+					quid       	"352B51A5025F"
+					result     	"TUint8"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "ReadInt16L"
+					quid       	"352B51A50260"
+					result     	"TInt16"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "ReadUint16L"
+					quid       	"352B51A50261"
+					result     	"TUint16"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "ReadInt32L"
+					quid       	"352B51A50262"
+					result     	"TInt32"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "ReadUint32L"
+					quid       	"352B51A50263"
+					result     	"TUint32"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "ReadReal32L"
+					quid       	"352B51A50264"
+					result     	"TReal32"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "ReadReal64L"
+					quid       	"352B51A50265"
+					result     	"TReal64"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "Close"
+					quid       	"352B51A50266"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "SourceOf"
+					quid       	"352B51A50267"
+					parameters 	(list Parameters
+					    (object Parameter "aStream"
+						type       	"RReadStream"))
+					result     	"CStreamBuf"
+					concurrency 	"Sequential"
+					opExportControl 	"Protected"
+					uid        	0)
+				    (object Operation "Chan"
+					quid       	"352B51A50269"
+					result     	"TStreamSource"
+					concurrency 	"Sequential"
+					opExportControl 	"Private"
+					uid        	0)
+				    (object Operation "ReadRefL"
+					quid       	"352B51A5026A"
+					result     	"TUint32"
+					concurrency 	"Sequential"
+					opExportControl 	"Private"
+					uid        	0)
+				    (object Operation "ReadL"
+					quid       	"352B51A5026B"
+					parameters 	(list Parameters
+					    (object Parameter "aStream"
+						type       	"RWriteStream"))
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "ReadL"
+					quid       	"352B51A5026D"
+					parameters 	(list Parameters
+					    (object Parameter "aStream"
+						type       	"RWriteStream")
+					    (object Parameter "aLength"
+						type       	"TInt"))
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)))
+			    (object Class "COleStore"
+				quid       	"352B59E50084")
+			    (object Class "HOlePropertyBuf"
+				quid       	"3540C12F0105"
+				superclasses 	(list inheritance_relationship_list
+				    (object Inheritance_Relationship
+					quid       	"3540C15B00A4"
+					supplier   	"TStreamBuf"
+					quidu      	"3540C152012E"))
+				used_nodes 	(list uses_relationship_list
+				    (object Uses_Relationship
+					quid       	"3540C171013C"
+					supplier   	"COleFilePropertySetDir"
+					quidu      	"3528F79C0014")))
+			    (object Class "TStreamBuf"
+				quid       	"3540C152012E")
+			    (object Class "HOleSmallBuf"
+				quid       	"3540C17F00C4"
+				superclasses 	(list inheritance_relationship_list
+				    (object Inheritance_Relationship
+					quid       	"3540C1E10346"
+					supplier   	"HOlePropertyBuf"
+					quidu      	"3540C12F0105")))
+			    (object Class "HOleBigBuf"
+				quid       	"3540C18003BF"
+				superclasses 	(list inheritance_relationship_list
+				    (object Inheritance_Relationship
+					quid       	"3540C1E801F2"
+					supplier   	"HOlePropertyBuf"
+					quidu      	"3540C12F0105"))))
+			logical_presentations 	(list unit_reference_list
+			    (object ClassDiagram "Main"
+				quid       	"3528DFA8008F"
+				title      	"Main"
+				zoom       	90
+				max_height 	28350
+				max_width  	21600
+				origin_x   	101
+				origin_y   	1642
+				items      	(list diagram_item_list
+				    (object ClassView "Class" "COleFile" @30
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(1147, 217)
+					label      	(object ItemLabel
+					    Parent_View 	@30
+					    location   	(933, 113)
+					    nlines     	2
+					    max_width  	511
+					    justify    	0
+					    label      	"COleFile")
+					quidu      	"3528F76D01BB"
+					compartment 	(object Compartment
+					    Parent_View 	@30
+					    location   	(899, 174)
+					    anchor     	2
+					    nlines     	3
+					    max_width  	576
+					    justify    	0)
+					width      	742
+					height     	310
+					annotation 	8
+					autoResize 	TRUE)
+				    (object ClassView "Class" "COleFileBigBlockDir" @31
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(2294, 1054)
+					label      	(object ItemLabel
+					    Parent_View 	@31
+					    location   	(2190, 970)
+					    nlines     	2
+					    max_width  	240
+					    justify    	0
+					    label      	"COleFileBigBlockDir")
+					quidu      	"3528F783036C"
+					annotation 	8
+					autoResize 	TRUE)
+				    (object ClassView "Class" "COleFileSmallBlockDir" @32
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(1302, 713)
+					label      	(object ItemLabel
+					    Parent_View 	@32
+					    location   	(1188, 629)
+					    nlines     	2
+					    max_width  	267
+					    justify    	0
+					    label      	"COleFileSmallBlockDir")
+					quidu      	"3528F78F0387"
+					width      	388
+					annotation 	8
+					autoResize 	TRUE)
+				    (object ClassView "Class" "MOleFile" @33
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(2294, 155)
+					label      	(object ItemLabel
+					    Parent_View 	@33
+					    location   	(2150, 71)
+					    nlines     	2
+					    max_width  	339
+					    justify    	0
+					    label      	"MOleFile")
+					quidu      	"352A1EF4039D"
+					compartment 	(object Compartment
+					    Parent_View 	@33
+					    location   	(2126, 132)
+					    anchor     	2
+					    nlines     	1
+					    max_width  	385
+					    justify    	0)
+					width      	492
+					annotation 	8
+					autoResize 	TRUE)
+				    (object InheritView "" @34
+					quidu      	"352A1F1F0060"
+					client     	@30
+					supplier   	@33
+					line_style 	0)
+				    (object UsesView "" @35
+					quidu      	"352A2137033B"
+					client     	@31
+					supplier   	@33
+					line_style 	0)
+				    (object ClassView "Class" "COleFilePropertySetDir" @36
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(713, 1364)
+					label      	(object ItemLabel
+					    Parent_View 	@36
+					    location   	(463, 1213)
+					    nlines     	2
+					    max_width  	595
+					    justify    	0
+					    label      	"COleFilePropertySetDir")
+					quidu      	"3528F79C0014"
+					compartment 	(object Compartment
+					    Parent_View 	@36
+					    location   	(511, 1274)
+					    anchor     	2
+					    nlines     	3
+					    max_width  	497
+					    justify    	0)
+					width      	863
+					height     	444
+					annotation 	8
+					autoResize 	TRUE)
+				    (object HasView "" @37
+					quidu      	"3528F7CB003A"
+					client     	@30
+					supplier   	@31
+					line_style 	0)
+				    (object HasView "" @38
+					quidu      	"3528F7D103BE"
+					client     	@30
+					supplier   	@32
+					line_style 	0)
+				    (object HasView "" @39
+					quidu      	"352A224803A2"
+					client     	@30
+					supplier   	@36
+					line_style 	0)
+				    (object ClassView "Class" "MOleBlockReader" @40
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(1302, 1054)
+					label      	(object ItemLabel
+					    Parent_View 	@40
+					    location   	(1198, 970)
+					    nlines     	2
+					    max_width  	240
+					    justify    	0
+					    label      	"MOleBlockReader")
+					quidu      	"352A4B5A001B"
+					annotation 	8
+					autoResize 	TRUE)
+				    (object InheritView "" @41
+					quidu      	"352A4B780368"
+					client     	@32
+					supplier   	@40
+					line_style 	0)
+				    (object InheritView "" @42
+					quidu      	"352A4B7B01C7"
+					client     	@31
+					supplier   	@40
+					line_style 	0)
+				    (object UsesView "" @43
+					quidu      	"352A4CF40378"
+					client     	@32
+					supplier   	@31
+					line_style 	0)
+				    (object UsesView "" @44
+					quidu      	"352A4D050110"
+					client     	@36
+					supplier   	@31
+					line_style 	0)
+				    (object ClassView "Class" "ROleReadPropertySet" @45
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(1457, 2697)
+					label      	(object ItemLabel
+					    Parent_View 	@45
+					    location   	(1282, 2547)
+					    nlines     	2
+					    max_width  	415
+					    justify    	0
+					    label      	"ROleReadPropertySet")
+					quidu      	"352A27560014"
+					compartment 	(object Compartment
+					    Parent_View 	@45
+					    location   	(1282, 2608)
+					    anchor     	2
+					    nlines     	6
+					    max_width  	413
+					    justify    	0)
+					width      	602
+					height     	440
+					annotation 	8
+					autoResize 	TRUE)
+				    (object NoteView @46
+					location   	(2449, 1395)
+					label      	(object ItemLabel
+					    Parent_View 	@46
+					    location   	(2172, 1220)
+					    nlines     	7
+					    max_width  	578
+					    label      	
+|All RFile access is provided by COleFileBigBlockDir
+|Access to underlying objects are provided through the MOleBlockReader interface
+					    )
+					width      	638
+					height     	363)
+				    (object UsesView "" @47
+					quidu      	"352B3F9C0128"
+					client     	@36
+					supplier   	@32
+					line_style 	0)
+				    (object ClassView "Class" "RReadStream" @48
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(2480, 2976)
+					label      	(object ItemLabel
+					    Parent_View 	@48
+					    location   	(2340, 2511)
+					    nlines     	2
+					    max_width  	329
+					    justify    	0
+					    label      	"RReadStream")
+					quidu      	"352B51A50254"
+					compartment 	(object Compartment
+					    Parent_View 	@48
+					    location   	(2316, 2572)
+					    anchor     	2
+					    nlines     	17
+					    max_width  	375
+					    justify    	0)
+					width      	478
+					height     	1340
+					annotation 	8
+					autoResize 	TRUE)
+				    (object InheritView "" @49
+					quidu      	"352B50E8036A"
+					client     	@45
+					supplier   	@48
+					line_style 	0)
+				    (object NoteView @50
+					location   	(465, 1829)
+					label      	(object ItemLabel
+					    Parent_View 	@50
+					    location   	(179, 1654)
+					    nlines     	7
+					    max_width  	596
+					    label      	
+|Not fully abstracted from the COleFilePropertySetDir
+|
+|This should be done if an OLE2.0 framework is to be incorporated into store
+					    )
+					width      	656
+					height     	363)
+				    (object ClassView "Class" "HOlePropertyBuf" @51
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(1426, 1860)
+					label      	(object ItemLabel
+					    Parent_View 	@51
+					    location   	(1322, 1776)
+					    nlines     	2
+					    max_width  	240
+					    justify    	0
+					    label      	"HOlePropertyBuf")
+					quidu      	"3540C12F0105"
+					annotation 	8
+					autoResize 	TRUE)
+				    (object ClassView "Class" "TStreamBuf" @52
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(1736, 1550)
+					label      	(object ItemLabel
+					    Parent_View 	@52
+					    location   	(1632, 1466)
+					    nlines     	2
+					    max_width  	240
+					    justify    	0
+					    label      	"TStreamBuf")
+					quidu      	"3540C152012E"
+					annotation 	8
+					autoResize 	TRUE)
+				    (object InheritView "" @53
+					quidu      	"3540C15B00A4"
+					client     	@51
+					supplier   	@52
+					line_style 	0)
+				    (object UsesView "" @54
+					quidu      	"3540C171013C"
+					client     	@51
+					supplier   	@36
+					line_style 	0)
+				    (object ClassView "Class" "HOleSmallBuf" @55
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(1054, 2170)
+					label      	(object ItemLabel
+					    Parent_View 	@55
+					    location   	(950, 2086)
+					    nlines     	2
+					    max_width  	240
+					    justify    	0
+					    label      	"HOleSmallBuf")
+					quidu      	"3540C17F00C4"
+					annotation 	8
+					autoResize 	TRUE)
+				    (object ClassView "Class" "HOleBigBuf" @56
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(1860, 2170)
+					label      	(object ItemLabel
+					    Parent_View 	@56
+					    location   	(1756, 2086)
+					    nlines     	2
+					    max_width  	240
+					    justify    	0
+					    label      	"HOleBigBuf")
+					quidu      	"3540C18003BF"
+					annotation 	8
+					autoResize 	TRUE)
+				    (object InheritView "" @57
+					quidu      	"3540C1E10346"
+					client     	@55
+					supplier   	@51
+					line_style 	0)
+				    (object InheritView "" @58
+					quidu      	"3540C1E801F2"
+					client     	@56
+					supplier   	@51
+					line_style 	0)
+				    (object HasView "" @59
+					quidu      	"3546F317020A"
+					client     	@45
+					supplier   	@55
+					line_style 	0)
+				    (object HasView "" @60
+					quidu      	"3546F3240168"
+					client     	@45
+					supplier   	@56
+					line_style 	0)))))
+		    (object Class_Category "OLE 2.0 stream"
+			quid       	"352A27010061"
+			visible_categories 	(list visibility_relationship_list
+			    (object Visibility_Relationship
+				quid       	"352B3F02027B"
+				supplier   	"OLE 2.0 Store"
+				quidu      	"3528DF900081"))
+			exportControl 	"Public"
+			logical_models 	(list unit_reference_list
+			    (object Class "ROleReadPropertySet"
+				quid       	"352A27560014"
+				fields     	(list has_relationship_list
+				    (object Has_Relationship
+					quid       	"3546F317020A"
+					supplier   	"HOleSmallBuf"
+					quidu      	"3540C17F00C4")
+				    (object Has_Relationship
+					quid       	"3546F3240168"
+					supplier   	"HOleBigBuf"
+					quidu      	"3540C18003BF"))
+				superclasses 	(list inheritance_relationship_list
+				    (object Inheritance_Relationship
+					quid       	"352A276C014C"
+					supplier   	"COleFileObject"
+					quidu      	"352A236B002F")
+				    (object Inheritance_Relationship
+					quid       	"352B50E8036A"
+					supplier   	"RReadStream"
+					quidu      	"352B51A50254"))
+				operations 	(list Operations
+				    (object Operation "TUint8 Type()"
+					quid       	"352A285E02DA"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "TDesC16& Name()"
+					quid       	"352A286E03A5"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0)
+				    (object Operation "TUint PropertySize()"
+					quid       	"352A28D60160"
+					concurrency 	"Sequential"
+					opExportControl 	"Public"
+					uid        	0))))
+			logical_presentations 	(list unit_reference_list
+			    (object ClassDiagram "Main"
+				quid       	"352A27190297"
+				title      	"Main"
+				zoom       	100
+				max_height 	28350
+				max_width  	21600
+				origin_x   	0
+				origin_y   	0
+				items      	(list diagram_item_list
+				    (object ClassView "Class" "ROleReadPropertySet" @61
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(1178, 310)
+					label      	(object ItemLabel
+					    Parent_View 	@61
+					    location   	(911, 185)
+					    nlines     	2
+					    max_width  	640
+					    justify    	0
+					    label      	"ROleReadPropertySet")
+					quidu      	"352A27560014"
+					compartment 	(object Compartment
+					    Parent_View 	@61
+					    location   	(1230, 313)
+					    anchor     	2
+					    nlines     	5
+					    max_width  	0
+					    justify    	0)
+					width      	928
+					height     	370
+					annotation 	8
+					autoResize 	TRUE))))))
+		logical_presentations 	(list unit_reference_list
+		    (object ClassDiagram "Main"
+			quid       	"34D59F87024E"
+			title      	"Main"
+			zoom       	100
+			max_height 	28350
+			max_width  	21600
+			origin_x   	0
+			origin_y   	0
+			items      	(list diagram_item_list
+			    (object CategoryView "OLE 2.0 Store" @62
+				location   	(1240, 403)
+				label      	(object ItemLabel
+				    Parent_View 	@62
+				    location   	(878, 187)
+				    nlines     	2
+				    max_width  	724
+				    justify    	0
+				    label      	"OLE 2.0 Store")
+				quidu      	"3528DF900081"
+				compartment 	(object Compartment
+				    Parent_View 	@62
+				    location   	(945, 253)
+				    anchor     	2
+				    nlines     	7
+				    max_width  	588
+				    compartmentItems 	(list Compartment
+					"COleFile"
+					"COleFileBigBlockDir"
+					"COleFileSmallBlockDir"
+					"COleFilePropertySetDir"
+					"COleFilePropertySet"
+					"COleFileDir"
+					"MOleFile"))
+				width      	737
+				height     	444)
+			    (object CategoryView "OLE 2.0 stream" @63
+				location   	(1240, 1085)
+				label      	(object ItemLabel
+				    Parent_View 	@63
+				    location   	(874, 872)
+				    nlines     	2
+				    max_width  	732
+				    justify    	0
+				    label      	"OLE 2.0 stream")
+				quidu      	"352A27010061"
+				compartment 	(object Compartment
+				    Parent_View 	@63
+				    location   	(942, 944)
+				    anchor     	2
+				    nlines     	1
+				    max_width  	595
+				    compartmentItems 	(list Compartment
+					"ROleReadPropertySet"))
+				width      	744
+				height     	438)
+			    (object ImportView "" @64
+				quidu      	"352B3F02027B"
+				client     	@63
+				supplier   	@62
+				line_style 	0))))))
+	logical_presentations 	(list unit_reference_list
+	    (object ClassDiagram "Main"
+		quid       	"3529FE790300"
+		title      	"Main"
+		zoom       	100
+		max_height 	28350
+		max_width  	21600
+		origin_x   	0
+		origin_y   	0
+		items      	(list diagram_item_list))))
+    root_subsystem 	(object SubSystem "Component View"
+	quid       	"34D59F870247"
+	physical_models 	(list unit_reference_list
+	    (object module "Body" "SubType" "Body"
+		quid       	"34D5A0FB02C1"))
+	physical_presentations 	(list unit_reference_list
+	    (object Module_Diagram "Main"
+		quid       	"34D59F870262"
+		title      	"Main"
+		zoom       	100
+		max_height 	28350
+		max_width  	21600
+		origin_x   	0
+		origin_y   	0
+		items      	(list diagram_item_list))))
+    process_structure 	(object Processes
+	quid       	"34D59F870248"
+	ProcsNDevs 	(list
+	    (object Process_Diagram "Deployment View"
+		quid       	"34D59F870264"
+		title      	"Deployment View"
+		zoom       	100
+		max_height 	28350
+		max_width  	21600
+		origin_x   	0
+		origin_y   	0
+		items      	(list diagram_item_list))))
+    properties 	(object Properties
+	attributes 	(list Attribute_Set
+	    (object Attribute
+		tool       	"cg"
+		name       	"roseId"
+		value      	"753117540")
+	    (object Attribute
+		tool       	"cg"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileExtension"
+			value      	"h")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileBackupExtension"
+			value      	"h~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileTemporaryExtension"
+			value      	"h#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileExtension"
+			value      	"cpp")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileBackupExtension"
+			value      	"cp~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileTemporaryExtension"
+			value      	"cp#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StopOnError"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ErrorLimit"
+			value      	30)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Directory"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"PathSeparator"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FileNameFormat"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BooleanType"
+			value      	"int")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowTemplates"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowProtectedInheritance"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByValueContainer"
+			value      	"$targetClass")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByValueContainer"
+			value      	"OptionalByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByValueContainer"
+			value      	"BoundedListByValue<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByValueContainer"
+			value      	"BoundedSetByValue<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByReferenceContainer"
+			value      	"BoundedListByReference<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByReferenceContainer"
+			value      	"BoundedSetByReference<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByValueContainer"
+			value      	"UnboundedListByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByValueContainer"
+			value      	"UnboundedSetByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByReferenceContainer"
+			value      	"UnboundedListByReference<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByReferenceContainer"
+			value      	"UnboundedSetByReference<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByValueContainer"
+			value      	"AssociationByValue<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByValueContainer"
+			value      	"DictionaryByValue<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByReferenceContainer"
+			value      	"AssociationByReference<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByReferenceContainer"
+			value      	"DictionaryByReference<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GeneratePreserveRegions"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"compiler2.1__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileExtension"
+			value      	"h")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileBackupExtension"
+			value      	"h~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileTemporaryExtension"
+			value      	"h#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileExtension"
+			value      	"cpp")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileBackupExtension"
+			value      	"cp~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileTemporaryExtension"
+			value      	"cp#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StopOnError"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ErrorLimit"
+			value      	30)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Directory"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BooleanType"
+			value      	"int")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowTemplates"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowProtectedInheritance"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByValueContainer"
+			value      	"$targetClass")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByValueContainer"
+			value      	"OptionalByValue(sizeof($targetClass))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByValueContainer"
+			value      	"BoundedListByValue(sizeof($targetClass),$limit)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByValueContainer"
+			value      	"BoundedSetByValue(sizeof($targetClass),$limit)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByReferenceContainer"
+			value      	"BoundedListByReference($limit)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByReferenceContainer"
+			value      	"BoundedSetByReference($limit)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByValueContainer"
+			value      	"UnboundedListByValue(sizeof($targetClass))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByValueContainer"
+			value      	"UnboundedSetByValue(sizeof($targetClass))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByReferenceContainer"
+			value      	"UnboundedListByReference")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByReferenceContainer"
+			value      	"UnboundedSetByReference")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByValueContainer"
+			value      	"AssociationByValue(sizeof($qualtype), sizeof($qualcont)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByValueContainer"
+			value      	"DictionaryByValue(sizeof($qualtype), sizeof($qualcont)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByReferenceContainer"
+			value      	"AssociationByReference(sizeof($qualtype), sizeof($qualcont)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByReferenceContainer"
+			value      	"DictionaryByReference(sizeof($qualtype), sizeof($qualcont)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GeneratePreserveRegions"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"compiler3.0__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileExtension"
+			value      	"h")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileBackupExtension"
+			value      	"h~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileTemporaryExtension"
+			value      	"h#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileExtension"
+			value      	"cpp")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileBackupExtension"
+			value      	"cp~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileTemporaryExtension"
+			value      	"cp#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StopOnError"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ErrorLimit"
+			value      	30)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Directory"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BooleanType"
+			value      	"int")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowTemplates"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowProtectedInheritance"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByValueContainer"
+			value      	"$targetClass")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByValueContainer"
+			value      	"OptionalByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByValueContainer"
+			value      	"BoundedListByValue<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByValueContainer"
+			value      	"BoundedSetByValue<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByReferenceContainer"
+			value      	"BoundedListByReference<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByReferenceContainer"
+			value      	"BoundedSetByReference<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByValueContainer"
+			value      	"UnboundedListByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByValueContainer"
+			value      	"UnboundedSetByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByReferenceContainer"
+			value      	"UnboundedListByReference<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByReferenceContainer"
+			value      	"UnboundedSetByReference<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByValueContainer"
+			value      	"AssociationByValue<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByValueContainer"
+			value      	"DictionaryByValue<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByReferenceContainer"
+			value      	"AssociationByReference<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByReferenceContainer"
+			value      	"DictionaryByReference<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GeneratePreserveRegions"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ImplementationType"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDefaultConstructor"
+			value      	("GenerateSet" 199))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DefaultConstructorVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineDefaultConstructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateCopyConstructor"
+			value      	("GenerateSet" 199))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CopyConstructorVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineCopyConstructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDestructor"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DestructorVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DestructorKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineDestructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAssignmentOperation"
+			value      	("GenerateSet" 199))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssignmentVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssignmentKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineAssignmentOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEqualityOperations"
+			value      	("GenerateSet" 199))
+		    (object Attribute
+			tool       	"cg"
+			name       	"EqualityVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"EqualityKind"
+			value      	("FriendKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineEqualityOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateRelationalOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"RelationalVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"RelationalKind"
+			value      	("FriendKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineRelationalOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateStorageMgmtOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StorageMgmtVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineStorageMgmtOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSubscriptOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"SubscriptVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"SubscriptKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"SubscriptResultType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineSubscriptOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDereferenceOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DereferenceVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DereferenceKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DereferenceResultType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineDereferenceOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateIndirectionOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IndirectionVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IndirectionKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IndirectionResultType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineIndirectionOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateStreamOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StreamVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineStreamOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ThreeKindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"KindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"FriendKindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"DeclareAndDefine"
+				value      	199)
+			    (object Attribute
+				tool       	"cg"
+				name       	"DeclareOnly"
+				value      	205)
+			    (object Attribute
+				tool       	"cg"
+				name       	"DoNotDeclare"
+				value      	206)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"VisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"ConstValue"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDefaultSpecifier"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DefaultSpecifier"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"IDLElement"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IDLSpecificationType"
+			value      	("IDLSpecSet" 22))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IDLSpecSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Interface"
+				value      	22)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Typedef"
+				value      	54)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Enumeration"
+				value      	8)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Const"
+				value      	71)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Exception"
+				value      	61)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Struct"
+				value      	51)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Union"
+				value      	81)))))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"FileName"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InclusionProtectionSymbol"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeBySimpleName"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InliningStyle"
+			value      	("InliningStyleSet" 207))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InliningStyleSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"InClassDeclaration"
+				value      	208)
+			    (object Attribute
+				tool       	"cg"
+				name       	"FollowingClassDeclaration"
+				value      	207)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateIDLModule"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Module-Body"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"FileName"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeBySimpleName"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InliningStyle"
+			value      	("InliningStyleSet" 207))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InliningStyleSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"InClassDeclaration"
+				value      	208)
+			    (object Attribute
+				tool       	"cg"
+				name       	"FollowingClassDeclaration"
+				value      	207)))))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationKind"
+			value      	("OperationKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationKindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationIsConst"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"EntryCode"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"ExitCode"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"Inline"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationIsOneWay"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Context"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"Raises"
+			value      	"")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Has"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"Ordered"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"NameIfUnlabeled"
+			value      	"the_$supplier")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibility"
+			value      	("DataMemberVisibilitySet" 14))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)
+			    (object Attribute
+				tool       	"cg"
+				name       	"AtRelationshipVisibility"
+				value      	210)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetName"
+			value      	"get_$relationship")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetName"
+			value      	"set_$relationship")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKinds"
+			value      	("GetSetKindsSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKindsSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"ContainerClass"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SelectorName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SelectorType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetByReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ForwardReferenceOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateForwardReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedHasRelType"
+			value      	("HasRelTypeSet" 47))
+		    (object Attribute
+			tool       	"cg"
+			name       	"HasRelTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Array"
+				value      	24)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Sequence"
+				value      	47)))))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Association"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"NameIfUnlabeled"
+			value      	"the_$targetClass")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ForwardReferenceOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"NameIfUnlabeled"
+			value      	"the_$targetClass")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberName"
+			value      	"$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibility"
+			value      	("DataMemberVisibilitySet" 14))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)
+			    (object Attribute
+				tool       	"cg"
+				name       	"AtRelationshipVisibility"
+				value      	210)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"ContainerClass"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedContainer"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassContainer"
+			value      	"$supplier *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKinds"
+			value      	("GetSetKindsSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKindsSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetByReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetName"
+			value      	"get_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetName"
+			value      	"set_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateQualifiedGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetName"
+			value      	"get_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineQualifiedGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateQualifiedSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedSetName"
+			value      	"set_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedSetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineQualifiedSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAssocClassDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassDataMemberName"
+			value      	"$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassDataMemberVisibility"
+			value      	("DataMemberVisibilitySet" 14))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)
+			    (object Attribute
+				tool       	"cg"
+				name       	"AtRelationshipVisibility"
+				value      	210)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassGetSetKinds"
+			value      	("GetSetKindsSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAssocClassGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassGetName"
+			value      	"get_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassGetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineAssocClassGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAssocClassSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassSetName"
+			value      	"set_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassSetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineAssocClassSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassForwardReferenceOnly"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateForwardReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedRoleType"
+			value      	("AssocTypeSet" 47))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Array"
+				value      	24)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Sequence"
+				value      	47)))))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberName"
+			value      	"$attribute")
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibility"
+			value      	("DataMemberVisibilitySet" 14))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)
+			    (object Attribute
+				tool       	"cg"
+				name       	"AtAttributeVisibility"
+				value      	211)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetName"
+			value      	"get_$attribute")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetName"
+			value      	"set_$attribute")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKinds"
+			value      	("GetSetKindsSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKindsSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetByReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CaseSpecifier"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"IsReadOnly"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Uses"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"ForwardReferenceOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateForwardReference"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Subsystem"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"Directory"
+			value      	"AUTO GENERATE")))
+	    (object Attribute
+		tool       	"DDL"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"DDL"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"DDL"
+			name       	"DataBase"
+			value      	("DataBaseSet" 800))
+		    (object Attribute
+			tool       	"DDL"
+			name       	"DataBaseSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"DDL"
+				name       	"ANSI"
+				value      	800)
+			    (object Attribute
+				tool       	"DDL"
+				name       	"Oracle"
+				value      	801)
+			    (object Attribute
+				tool       	"DDL"
+				name       	"SQLServer"
+				value      	802)
+			    (object Attribute
+				tool       	"DDL"
+				name       	"Sybase"
+				value      	803)
+			    (object Attribute
+				tool       	"DDL"
+				name       	"Watcom"
+				value      	804)))
+		    (object Attribute
+			tool       	"DDL"
+			name       	"PrimaryKeyColumnName"
+			value      	"Id")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"PrimaryKeyColumnType"
+			value      	"NUMBER(5)")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"ViewName"
+			value      	"V_")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"TableName"
+			value      	"T_")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"InheritSuffix"
+			value      	"_V")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"DropClause"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"BaseViews"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"DDLScriptFilename"
+			value      	"DDL1.SQL")))
+	    (object Attribute
+		tool       	"DDL"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"DDL"
+			name       	"ColumnType"
+			value      	"VARCHAR")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"Length"
+			value      	"")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"NullsOK"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"PrimaryKey"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"Unique"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"CompositeUnique"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"CheckConstraint"
+			value      	"")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Category"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateIDLModule"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ModuleName"
+			value      	(value Text "")))))
+	quid       	"34D59F870249"))
--- a/filehandling/fileconverterfw/group/BLD.INF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// File/data converter framework
-// 
-//
-
-/**
- @file
-*/
-
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-// specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-// If there's no destination then the source file will be copied
-// to the same name in /epoc32/include
-
-../INC/CONARC.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(conarc.h)	
-../INC/CONCNF.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(concnf.h)	
-../INC/CONFNDR.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(confndr.h)
-../INC/CONLIST.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(conlist.h)	
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../INC/CONSTD.H /epoc32/include/constd.h	
-#endif
-../INC/EXBUF.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(exbuf.h)		
-../INC/INBUF.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(inbuf.h)		
-../INC/CNFTOOL.RH SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(cnftool.rh)
-../INC/CONPLUGIN.RH SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(conplugin.rh)
-
-// We should use the new epoccnf.pl tool, if __CNF_FORMAT_V2__ is defined.
-// Otherwise we must use the old version as the version 2 code won't exist.
-../CNFTOOL/epoccnf.pl		/epoc32/tools/epoccnf.pl
-
-../group/conarc.iby	/epoc32/rom/include/conarc.iby
-
-PRJ_MMPFILES
-
-../group/CONARC.MMP
-
-PRJ_TESTMMPFILES
-
-
-../TSRC/TCON1_V2.MMP support
-../TSRC/TCON2_V2.MMP support
-../TSRC/TCON3_V2.MMP support
-../TSRC/t_conV2_V2.mmp
-../TSRC/t_convBadUid_V2.mmp
-
-../Tef/TConArcTestServer.mmp
-../TSRC/TTestEcomConverter.mmp
-
-
-
-PRJ_TESTEXPORTS
-../Tef/scripts/conarctest_run.bat              z:/conarctest/conarctest_run.bat
-../Tef/scripts/conarctest_run.bat              /epoc32/release/winscw/udeb/conarctest_run.bat
-../Tef/scripts/conarctest_run.bat              /epoc32/release/winscw/urel/conarctest_run.bat
-../Tef/scripts/conarctest_T_B64Cnv.script      z:/conarctest/conarctest_t_b64cnv.script
-../Tef/scripts/conarctest_T_Cnf.script         z:/conarctest/conarctest_t_cnf.script
-../Tef/scripts/conarctest_T_LoadEComCnv.script z:/conarctest/conarctest_t_loadecomcnv.script
-../group/ConarcTest.iby	                       /epoc32/rom/include/conarctest.iby
-
- // WINSCW UDEB
-../TSRC/w7allchr.doc.b64	/epoc32/release/winscw/udeb/z/resource/test/conarc/w7allchr.doc.b64
-../TSRC/w7allchr.doc.qp		/epoc32/release/winscw/udeb/z/resource/test/conarc/w7allchr.doc.qp
-../TSRC/w7allchrwosplchr.doc.qp	/epoc32/release/winscw/udeb/z/resource/test/conarc/w7allchrwosplchr.doc.qp
- 
-../TSRC/W7ALLCHR.DOC 		/epoc32/release/winscw/udeb/z/resource/test/conarc/w7allchr.doc
-../TSRC/RELEASE.TXT 		/epoc32/release/winscw/udeb/z/resource/test/conarc/release.txt
-../TSRC/release.txt.etext	/epoc32/release/winscw/udeb/z/resource/test/conarc/release.txt.etext
- 
-// WINSCW UREL
-../TSRC/w7allchr.doc.b64	/epoc32/release/winscw/urel/z/resource/test/conarc/w7allchr.doc.b64
-../TSRC/w7allchr.doc.qp		/epoc32/release/winscw/urel/z/resource/test/conarc/w7allchr.doc.qp
-../TSRC/w7allchrwosplchr.doc.qp		/epoc32/release/winscw/urel/z/resource/test/conarc/w7allchrwosplchr.doc.qp
-../TSRC/W7ALLCHR.DOC 		/epoc32/release/winscw/urel/z/resource/test/conarc/w7allchr.doc
-../TSRC/RELEASE.TXT 		/epoc32/release/winscw/urel/z/resource/test/conarc/release.txt
-../TSRC/release.txt.etext	/epoc32/release/winscw/urel/z/resource/test/conarc/release.txt.etext
-
-// for ROM-builds
-../TSRC/w7allchr.doc.b64	/epoc32/data/z/resource/test/conarc/w7allchr.doc.b64
-../TSRC/w7allchr.doc.qp		/epoc32/data/z/resource/test/conarc/w7allchr.doc.qp
-../TSRC/w7allchrwosplchr.doc.qp		/epoc32/data/z/resource/test/conarc/w7allchrwosplchr.doc.qp
-../TSRC/W7ALLCHR.DOC 		/epoc32/data/z/resource/test/conarc/w7allchr.doc
-../TSRC/RELEASE.TXT 		/epoc32/data/z/resource/test/conarc/release.txt
-../TSRC/release.txt.etext	/epoc32/data/z/resource/test/conarc/release.txt.etext
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/filehandling/fileconverterfw/group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,101 @@
+// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// File/data converter framework
+// 
+//
+
+/**
+ @file
+*/
+
+
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+// specify the source file followed by its destination here
+// copy will be used to copy the source file to its destination
+// If there's no destination then the source file will be copied
+// to the same name in /epoc32/include
+
+../INC/CONARC.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(conarc.h)	
+../INC/CONCNF.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(concnf.h)	
+../INC/CONFNDR.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(confndr.h)
+../INC/CONLIST.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(conlist.h)	
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../INC/CONSTD.H /epoc32/include/constd.h	
+#endif
+../INC/EXBUF.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(exbuf.h)		
+../INC/INBUF.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(inbuf.h)		
+../INC/CNFTOOL.RH SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(cnftool.rh)
+../INC/CONPLUGIN.RH SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(conplugin.rh)
+
+// We should use the new epoccnf.pl tool, if __CNF_FORMAT_V2__ is defined.
+// Otherwise we must use the old version as the version 2 code won't exist.
+../CNFTOOL/epoccnf.pl		/epoc32/tools/epoccnf.pl
+
+../group/conarc.iby	/epoc32/rom/include/conarc.iby
+
+PRJ_MMPFILES
+
+../group/CONARC.MMP
+
+PRJ_TESTMMPFILES
+
+
+../TSRC/TCON1_V2.MMP support
+../TSRC/TCON2_V2.MMP support
+../TSRC/TCON3_V2.MMP support
+../TSRC/t_conV2_V2.mmp
+../TSRC/t_convBadUid_V2.mmp
+
+../Tef/TConArcTestServer.mmp
+../TSRC/TTestEcomConverter.mmp
+
+
+
+PRJ_TESTEXPORTS
+../Tef/scripts/conarctest_run.bat              z:/conarctest/conarctest_run.bat
+../Tef/scripts/conarctest_run.bat              /epoc32/release/winscw/udeb/conarctest_run.bat
+../Tef/scripts/conarctest_run.bat              /epoc32/release/winscw/urel/conarctest_run.bat
+../Tef/scripts/conarctest_T_B64Cnv.script      z:/conarctest/conarctest_t_b64cnv.script
+../Tef/scripts/conarctest_T_Cnf.script         z:/conarctest/conarctest_t_cnf.script
+../Tef/scripts/conarctest_T_LoadEComCnv.script z:/conarctest/conarctest_t_loadecomcnv.script
+../group/ConarcTest.iby	                       /epoc32/rom/include/conarctest.iby
+
+ // WINSCW UDEB
+../TSRC/w7allchr.doc.b64	/epoc32/release/winscw/udeb/z/resource/test/conarc/w7allchr.doc.b64
+../TSRC/w7allchr.doc.qp		/epoc32/release/winscw/udeb/z/resource/test/conarc/w7allchr.doc.qp
+../TSRC/w7allchrwosplchr.doc.qp	/epoc32/release/winscw/udeb/z/resource/test/conarc/w7allchrwosplchr.doc.qp
+ 
+../TSRC/W7ALLCHR.DOC 		/epoc32/release/winscw/udeb/z/resource/test/conarc/w7allchr.doc
+../TSRC/RELEASE.TXT 		/epoc32/release/winscw/udeb/z/resource/test/conarc/release.txt
+../TSRC/release.txt.etext	/epoc32/release/winscw/udeb/z/resource/test/conarc/release.txt.etext
+ 
+// WINSCW UREL
+../TSRC/w7allchr.doc.b64	/epoc32/release/winscw/urel/z/resource/test/conarc/w7allchr.doc.b64
+../TSRC/w7allchr.doc.qp		/epoc32/release/winscw/urel/z/resource/test/conarc/w7allchr.doc.qp
+../TSRC/w7allchrwosplchr.doc.qp		/epoc32/release/winscw/urel/z/resource/test/conarc/w7allchrwosplchr.doc.qp
+../TSRC/W7ALLCHR.DOC 		/epoc32/release/winscw/urel/z/resource/test/conarc/w7allchr.doc
+../TSRC/RELEASE.TXT 		/epoc32/release/winscw/urel/z/resource/test/conarc/release.txt
+../TSRC/release.txt.etext	/epoc32/release/winscw/urel/z/resource/test/conarc/release.txt.etext
+
+// for ROM-builds
+../TSRC/w7allchr.doc.b64	/epoc32/data/z/resource/test/conarc/w7allchr.doc.b64
+../TSRC/w7allchr.doc.qp		/epoc32/data/z/resource/test/conarc/w7allchr.doc.qp
+../TSRC/w7allchrwosplchr.doc.qp		/epoc32/data/z/resource/test/conarc/w7allchrwosplchr.doc.qp
+../TSRC/W7ALLCHR.DOC 		/epoc32/data/z/resource/test/conarc/w7allchr.doc
+../TSRC/RELEASE.TXT 		/epoc32/data/z/resource/test/conarc/release.txt
+../TSRC/release.txt.etext	/epoc32/data/z/resource/test/conarc/release.txt.etext
Binary file filehandling/htmltorichtextconverter/doc_pub/CHTMLTOCRTCONVERTER test code.rtf has changed
--- a/filehandling/htmltorichtextconverter/group/Bld.inf	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Html to Symbian OS rich text converter
-// 
-//
-
-PRJ_PLATFORMS
-DEFAULT 
-
-
-PRJ_EXPORTS
-chtmltocrtconverter.iby	/epoc32/rom/include/chtmltocrtconverter.iby
-
-
-PRJ_MMPFILES
-CHtmlToCrtConverter.mmp
-
-
-#include "../test/group/bld.inf"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/filehandling/htmltorichtextconverter/group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,30 @@
+// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Html to Symbian OS rich text converter
+// 
+//
+
+PRJ_PLATFORMS
+DEFAULT 
+
+
+PRJ_EXPORTS
+chtmltocrtconverter.iby	/epoc32/rom/include/chtmltocrtconverter.iby
+
+
+PRJ_MMPFILES
+CHtmlToCrtConverter.mmp
+
+
+#include "../test/group/bld.inf"
--- a/filehandling/richtexttohtmlconverter/Group/BLD.INF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_PLATFORMS
-	DEFAULT
-
-PRJ_EXPORTS
-	./RichTextToHtmlConv.iby				/epoc32/rom/include/core/mw/richtexttohtmlconv.iby
-	./RichTextToHtmlConv.iby				/epoc32/rom/include/richtexttohtmlconv.iby
-
-PRJ_MMPFILES
-	./RT2HTMCV.MMP
-
-
-PRJ_TESTMMPFILES
-	../TSrc/cnvhtmltest.mmp
-
-PRJ_TESTEXPORTS
-	// Used by cnvhtmltest
-	./RichTextToHtmlConvTest.iby				/epoc32/rom/include/richtexttohtmlconvtest.iby
-	../Test/RT2HtmlConv.html /epoc32/data/z/test/rt2htmlconv.html
-	../Test/RT2HtmlConv.html /epoc32/release/wins/udeb/z/test/rt2htmlconv.html
-	../Test/RT2HtmlConv.html /epoc32/release/wins/urel/z/test/rt2htmlconv.html
-	../Test/RT2HtmlConv.html /epoc32/release/winscw/udeb/z/test/rt2htmlconv.html
-	../Test/RT2HtmlConv.html /epoc32/release/winscw/urel/z/test/rt2htmlconv.html
-	../Test/FmtdRT2HtmlConvExpectedFile.html /epoc32/data/z/test/fmtdrt2htmlconvexpectedfile.html
-	../Test/FmtdRT2HtmlConvExpectedFile.html /epoc32/release/wins/udeb/z/test/fmtdrt2htmlconvexpectedfile.html
-	../Test/FmtdRT2HtmlConvExpectedFile.html /epoc32/release/wins/urel/z/test/fmtdrt2htmlconvexpectedfile.html
-	../Test/FmtdRT2HtmlConvExpectedFile.html /epoc32/release/winscw/udeb/z/test/fmtdrt2htmlconvexpectedfile.html
-	../Test/FmtdRT2HtmlConvExpectedFile.html /epoc32/release/winscw/urel/z/test/fmtdrt2htmlconvexpectedfile.html
-	../Test/bulletconvexpectedfile1.html /epoc32/data/z/test/bulletconvexpectedfile1.html
-	../Test/bulletconvexpectedfile1.html /epoc32/release/wins/udeb/z/test/bulletconvexpectedfile1.html
-	../Test/bulletconvexpectedfile1.html /epoc32/release/wins/urel/z/test/bulletconvexpectedfile1.html
-	../Test/bulletconvexpectedfile1.html /epoc32/release/winscw/udeb/z/test/bulletconvexpectedfile1.html
-	../Test/bulletconvexpectedfile1.html /epoc32/release/winscw/urel/z/test/bulletconvexpectedfile1.html
-	../Test/translateconvexpectedfile1.html /epoc32/data/z/test/translateconvexpectedfile1.html
-	../Test/translateconvexpectedfile1.html /epoc32/release/wins/udeb/z/test/translateconvexpectedfile1.html
-	../Test/translateconvexpectedfile1.html /epoc32/release/wins/urel/z/test/translateconvexpectedfile1.html
-	../Test/translateconvexpectedfile1.html /epoc32/release/winscw/udeb/z/test/translateconvexpectedfile1.html
-	../Test/translateconvexpectedfile1.html /epoc32/release/winscw/urel/z/test/translateconvexpectedfile1.html
-	../Test/textstyleconvexpectedfile1.html /epoc32/data/z/test/textstyleconvexpectedfile1.html
-	../Test/textstyleconvexpectedfile1.html /epoc32/release/wins/udeb/z/test/textstyleconvexpectedfile1.html
-	../Test/textstyleconvexpectedfile1.html /epoc32/release/wins/urel/z/test/textstyleconvexpectedfile1.html
-	../Test/textstyleconvexpectedfile1.html /epoc32/release/winscw/udeb/z/test/textstyleconvexpectedfile1.html
-	../Test/textstyleconvexpectedfile1.html /epoc32/release/winscw/urel/z/test/textstyleconvexpectedfile1.html
-
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/filehandling/richtexttohtmlconverter/Group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,59 @@
+// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_PLATFORMS
+	DEFAULT
+
+PRJ_EXPORTS
+	./RichTextToHtmlConv.iby				/epoc32/rom/include/core/mw/richtexttohtmlconv.iby
+	./RichTextToHtmlConv.iby				/epoc32/rom/include/richtexttohtmlconv.iby
+
+PRJ_MMPFILES
+	./RT2HTMCV.MMP
+
+
+PRJ_TESTMMPFILES
+	../TSrc/cnvhtmltest.mmp
+
+PRJ_TESTEXPORTS
+	// Used by cnvhtmltest
+	./RichTextToHtmlConvTest.iby				/epoc32/rom/include/richtexttohtmlconvtest.iby
+	../Test/RT2HtmlConv.html /epoc32/data/z/test/rt2htmlconv.html
+	../Test/RT2HtmlConv.html /epoc32/release/wins/udeb/z/test/rt2htmlconv.html
+	../Test/RT2HtmlConv.html /epoc32/release/wins/urel/z/test/rt2htmlconv.html
+	../Test/RT2HtmlConv.html /epoc32/release/winscw/udeb/z/test/rt2htmlconv.html
+	../Test/RT2HtmlConv.html /epoc32/release/winscw/urel/z/test/rt2htmlconv.html
+	../Test/FmtdRT2HtmlConvExpectedFile.html /epoc32/data/z/test/fmtdrt2htmlconvexpectedfile.html
+	../Test/FmtdRT2HtmlConvExpectedFile.html /epoc32/release/wins/udeb/z/test/fmtdrt2htmlconvexpectedfile.html
+	../Test/FmtdRT2HtmlConvExpectedFile.html /epoc32/release/wins/urel/z/test/fmtdrt2htmlconvexpectedfile.html
+	../Test/FmtdRT2HtmlConvExpectedFile.html /epoc32/release/winscw/udeb/z/test/fmtdrt2htmlconvexpectedfile.html
+	../Test/FmtdRT2HtmlConvExpectedFile.html /epoc32/release/winscw/urel/z/test/fmtdrt2htmlconvexpectedfile.html
+	../Test/bulletconvexpectedfile1.html /epoc32/data/z/test/bulletconvexpectedfile1.html
+	../Test/bulletconvexpectedfile1.html /epoc32/release/wins/udeb/z/test/bulletconvexpectedfile1.html
+	../Test/bulletconvexpectedfile1.html /epoc32/release/wins/urel/z/test/bulletconvexpectedfile1.html
+	../Test/bulletconvexpectedfile1.html /epoc32/release/winscw/udeb/z/test/bulletconvexpectedfile1.html
+	../Test/bulletconvexpectedfile1.html /epoc32/release/winscw/urel/z/test/bulletconvexpectedfile1.html
+	../Test/translateconvexpectedfile1.html /epoc32/data/z/test/translateconvexpectedfile1.html
+	../Test/translateconvexpectedfile1.html /epoc32/release/wins/udeb/z/test/translateconvexpectedfile1.html
+	../Test/translateconvexpectedfile1.html /epoc32/release/wins/urel/z/test/translateconvexpectedfile1.html
+	../Test/translateconvexpectedfile1.html /epoc32/release/winscw/udeb/z/test/translateconvexpectedfile1.html
+	../Test/translateconvexpectedfile1.html /epoc32/release/winscw/urel/z/test/translateconvexpectedfile1.html
+	../Test/textstyleconvexpectedfile1.html /epoc32/data/z/test/textstyleconvexpectedfile1.html
+	../Test/textstyleconvexpectedfile1.html /epoc32/release/wins/udeb/z/test/textstyleconvexpectedfile1.html
+	../Test/textstyleconvexpectedfile1.html /epoc32/release/wins/urel/z/test/textstyleconvexpectedfile1.html
+	../Test/textstyleconvexpectedfile1.html /epoc32/release/winscw/udeb/z/test/textstyleconvexpectedfile1.html
+	../Test/textstyleconvexpectedfile1.html /epoc32/release/winscw/urel/z/test/textstyleconvexpectedfile1.html
+
+
--- a/layers.sysdef.xml	Fri Jun 11 13:48:03 2010 +0300
+++ b/layers.sysdef.xml	Tue Jun 29 10:40:11 2010 +0300
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_5_1.dtd" [
   <!ENTITY layer_real_source_path "sf/mw/appsupport" >
 ]>
 
-<SystemDefinition name="appsupport" schema="1.4.0">
+<SystemDefinition name="appsupport" schema="1.5.1">
   <systemModel>
     <layer name="mw_layer">
       <module name="appsupport">
-        <unit unitID="sydo.appsupport" name="appsupport" bldFile="&layer_real_source_path;/group" mrp="" />
+        <unit unitID="sydo.appsupport" name="appsupport" bldFile="&layer_real_source_path;" mrp="" proFile="appsupport.pro"/>
       </module>
       <module name="">
         <unit unitID="sydo.appsupport.appsupport_plat.flash_mmi_service_interface_custom_api" name="sydo_appsupport_appsupport_plat_flash_mmi_service_interface_custom_api" bldFile="&layer_real_source_path;/appsupport_plat/flash_mmi_service_interface_custom_api/group" mrp="" filter="!sf_build" />
--- a/package_definition.xml	Fri Jun 11 13:48:03 2010 +0300
+++ b/package_definition.xml	Tue Jun 29 10:40:11 2010 +0300
@@ -145,7 +145,7 @@
         <unit mrp="commonappservices/coreappstest/Group/app-services_CoreAppsTest.mrp" bldFile="commonappservices/coreappstest/Group"/>
       </component>
       <component id="appservicesdocs" name="Application Services Documentation" purpose="development" class="doc">
-        <unit mrp="commonappservices/appservicesdocs/app-services_documentation.mrp"/>
+        <unit mrp="commonappservices/doc_pub/app-services_documentation.mrp"/>
       </component>
       <component id="backuprestorenotification" name="Backup Restore Notification" introduced="8.1" purpose="optional">
         <unit bldFile="commonappservices/backuprestorenotification/group" mrp="commonappservices/backuprestorenotification/group/app-services_BackupRestoreNotification.mrp"/>
--- a/printingsupport/printinguisupport/group/BLD.INF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Printing services
-// This file basically provides the information required for building the whole of a component
-// C & C++ style comments are allowed in this file because it's passed through the C++ preprocessor
-// Examples are provided below of the kind of things we're expecting
-// 
-//
-
-/**
- @file
-*/
-
-
-PRJ_PLATFORMS
-
-DEFAULT WINC
-
-PRJ_EXPORTS
-// specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-// If there's no destination then the source file will be copied
-// to the same name in \epoc32\include
-
-../inc/PRNINF.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(prninf.h)
-../inc/PRNPREV.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(prnprev.h)
-../inc/PRNSETUP.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(prnsetup.h)
-../inc/prnpath.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(printinguisupport/prnpath.h)
-../inc/PRNUIDS.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(prnuids.h)
-
-../group/print.iby		          /epoc32/rom/include/print.iby
-
-PRJ_MMPFILES
-// specify the .mmp files required for building the important component releasables
-// note that you should specify any .mmp files for test programs further down the file.
-//
-// It's best if the .MMP files are specified in the order in which the components are
-// built, but that eventually shouldn't matter
-//
-// Use C++ style #defines to denote that a component is only built for a particular platform
-//
-// specify "tidy" if the component you need to build doesn't need to be released to
-// the rest of the company
-// specify "ignore" if the MMP file exists but should be ignored - William wants this!
-
-
-../group/PRINT.MMP
-#ifndef WINC
-../group/PREV.MMP
-#endif
-
-
-
-PRJ_TESTMMPFILES
-// specify the .mmp files required for building any test programs here
-//
-// you can specify "manual" to denote that a test should be listed in a generated
-// batch file for running a group of tests which require user input during testing.
-// you can specify "support" to denote that a file is a test support file and shouldn't
-// be listed in a batch file for running a group of tests
-// By default, each test will be listed in a batch file for running a group of tests
-// which can be left to run without requiring watching over by the person running the tests,
-// i.e. tests where no user input is required.  The default will apply if neither "manual"
-// or "support" is specified.
-
-../tef/TPrintTestServer.mmp
-
-PRJ_TESTEXPORTS
-
-../group/printtest.iby		          /epoc32/rom/include/printtest.iby
-../tef/scripts/printtest_run.bat          z:/printtest/printtest_run.bat
-../tef/scripts/printtest_run.bat          /epoc32/release/winscw/udeb/printtest_run.bat
-../tef/scripts/printtest_run.bat          /epoc32/release/winscw/urel/printtest_run.bat
-../tef/scripts/printtest_T_Fpr.script     z:/printtest/printtest_t_fpr.script
-../tef/scripts/printtest_T_Stream.script  z:/printtest/printtest_t_stream.script
-
-
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/printingsupport/printinguisupport/group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,89 @@
+// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Printing services
+// This file basically provides the information required for building the whole of a component
+// C & C++ style comments are allowed in this file because it's passed through the C++ preprocessor
+// Examples are provided below of the kind of things we're expecting
+// 
+//
+
+/**
+ @file
+*/
+
+
+PRJ_PLATFORMS
+
+DEFAULT WINC
+
+PRJ_EXPORTS
+// specify the source file followed by its destination here
+// copy will be used to copy the source file to its destination
+// If there's no destination then the source file will be copied
+// to the same name in /epoc32/include
+
+../inc/PRNINF.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(prninf.h)
+../inc/PRNPREV.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(prnprev.h)
+../inc/PRNSETUP.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(prnsetup.h)
+../inc/prnpath.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(printinguisupport/prnpath.h)
+../inc/PRNUIDS.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(prnuids.h)
+
+../group/print.iby		          /epoc32/rom/include/print.iby
+
+PRJ_MMPFILES
+// specify the .mmp files required for building the important component releasables
+// note that you should specify any .mmp files for test programs further down the file.
+//
+// It's best if the .MMP files are specified in the order in which the components are
+// built, but that eventually shouldn't matter
+//
+// Use C++ style #defines to denote that a component is only built for a particular platform
+//
+// specify "tidy" if the component you need to build doesn't need to be released to
+// the rest of the company
+// specify "ignore" if the MMP file exists but should be ignored - William wants this!
+
+
+../group/PRINT.MMP
+#ifndef WINC
+../group/PREV.MMP
+#endif
+
+
+
+PRJ_TESTMMPFILES
+// specify the .mmp files required for building any test programs here
+//
+// you can specify "manual" to denote that a test should be listed in a generated
+// batch file for running a group of tests which require user input during testing.
+// you can specify "support" to denote that a file is a test support file and shouldn't
+// be listed in a batch file for running a group of tests
+// By default, each test will be listed in a batch file for running a group of tests
+// which can be left to run without requiring watching over by the person running the tests,
+// i.e. tests where no user input is required.  The default will apply if neither "manual"
+// or "support" is specified.
+
+../tef/TPrintTestServer.mmp
+
+PRJ_TESTEXPORTS
+
+../group/printtest.iby		          /epoc32/rom/include/printtest.iby
+../tef/scripts/printtest_run.bat          z:/printtest/printtest_run.bat
+../tef/scripts/printtest_run.bat          /epoc32/release/winscw/udeb/printtest_run.bat
+../tef/scripts/printtest_run.bat          /epoc32/release/winscw/urel/printtest_run.bat
+../tef/scripts/printtest_T_Fpr.script     z:/printtest/printtest_t_fpr.script
+../tef/scripts/printtest_T_Stream.script  z:/printtest/printtest_t_stream.script
+
+
+
--- a/startupservices/Startup/MediatorPlugin/src/102750AF.rss	Fri Jun 11 13:48:03 2010 +0300
+++ b/startupservices/Startup/MediatorPlugin/src/102750AF.rss	Tue Jun 29 10:40:11 2010 +0300
@@ -1,62 +1,62 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Startup Cover UI Mediator plugin
-*
-*/
-
-
-// RESOURCE IDENTIFIER
-// n/a
-
-// INCLUDES
-#include <ecom/registryinfov2.rh>
-#include "MediatorUids.hrh"
-
-// CONSTANTS
-// None
-
-// MACROS
-// None
-
-// RESOURCE DEFINITIONS
-
-// -----------------------------------------------------------------------------
-// theInfo
-// ECom interface definition for the Startup Mediator Plugin.
-// -----------------------------------------------------------------------------
-RESOURCE REGISTRY_INFO theInfo
-    {
-    resource_format_version = RESOURCE_FORMAT_VERSION_2;
-    dll_uid = 0x102750AF;
-    interfaces =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid = KMediatorPluginInterfaceUid;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid = 0x102750B0;
-                    version_no         = 0;
-                    display_name       = "Startup Mediator Plugin";
-                    default_data       = "";
-                    opaque_data        = "";
-                    rom_only           = 1;
-                    }
-                };
-            }
-        };
-    }
-
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Startup Cover UI Mediator plugin
+*
+*/
+
+
+// RESOURCE IDENTIFIER
+// n/a
+
+// INCLUDES
+#include <ecom/registryinfov2.rh>
+#include "MediatorUids.hrh"
+
+// CONSTANTS
+// None
+
+// MACROS
+// None
+
+// RESOURCE DEFINITIONS
+
+// -----------------------------------------------------------------------------
+// theInfo
+// ECom interface definition for the Startup Mediator Plugin.
+// -----------------------------------------------------------------------------
+RESOURCE REGISTRY_INFO theInfo
+    {
+    resource_format_version = RESOURCE_FORMAT_VERSION_2;
+    dll_uid = 0x102750AF;
+    interfaces =
+        {
+        INTERFACE_INFO
+            {
+            interface_uid = KMediatorPluginInterfaceUid;
+            implementations =
+                {
+                IMPLEMENTATION_INFO
+                    {
+                    implementation_uid = 0x102750B0;
+                    version_no         = 0;
+                    display_name       = "Startup Mediator Plugin";
+                    default_data       = "";
+                    opaque_data        = "";
+                    rom_only           = 1;
+                    }
+                };
+            }
+        };
+    }
+
Binary file startupservices/Startup/conf/startup.confml has changed
Binary file startupservices/Startup/conf/startup_101F8763.crml has changed
--- a/startupservices/Startup/src/StartupAppUi.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/startupservices/Startup/src/StartupAppUi.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -30,6 +30,7 @@
 #include <starterclient.h>
 #include <hbdevicemessageboxsymbian.h>
 #include "sanimstartupctrl.h"
+#include <apgtask.h>
 
 // USER INCLUDES
 #include "StartupAppUi.h"
@@ -98,6 +99,9 @@
 // ---------------------------------------------------------------------------
 void CStartupAppUi::ConstructL()
     {
+    RThread thread; //increase the thread priority to smooth the animation
+    thread.SetPriority(EPriorityAbsoluteForeground);
+    thread.Close();
     TRACES("CStartupAppUi::ConstructL()");
     TInt flags = EStandardApp;
    BaseConstructL( flags );
@@ -609,12 +613,24 @@
     {
     TRACES("CStartupAppUi::DoStartupEndPart()");
     TRACES("CStartupAppUi::DoStartupEndPart(): STARTUP OK");
-
-
-
-  
-    UpdateStartupUiPhase( EStartupUiPhaseAllDone );
-
+    
+    TBool ftuenabled=EFalse;
+    TInt err=KErrNone;
+#ifndef __WINSCW__
+    TRAP(err,
+            TInt enabled=0;
+            //open cenrep;
+            CRepository *cenrep=CRepository::NewLC(KCRUidStartupConf);
+            //check if ftu is enabled or not
+            User::LeaveIfError(cenrep->Get(KFtuStartupEnabled,enabled));
+            ftuenabled=!!enabled; //make sure we only have a boolean value here
+            CleanupStack::PopAndDestroy(cenrep);
+            );
+#endif     
+    if(!ftuenabled)
+        {
+        UpdateStartupUiPhase( EStartupUiPhaseAllDone );
+        }
 
     TRACES("CStartupAppUi::DoStartupEndPart(): Exit application.");
     iExitTimer->Start( 100000, 100000, TCallBack( DoExitApplication, this ) );
@@ -1244,9 +1260,9 @@
             switch( toState )
                 {
                 case EStartupStartupOK:
-                    iInternalState = EStartupStartupOK;
-                    TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupStartupOK");
-                    DoStartupEndPart();
+                        iInternalState = EStartupStartupOK;
+                        TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupInvokeAndWaitForFtu");
+                        DoStartupEndPart();
                     break;
                 case EStartupSystemFatalError:
                     SystemFatalErrorL();
--- a/sysdef_1_4_0.dtd	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
- <!ELEMENT SystemDefinition (systemModel?, build?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (logicalset* | module*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  levels CDATA #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset name CDATA #REQUIRED>
- <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalsubset name CDATA #REQUIRED>
- <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
- <!ATTLIST module
-  name CDATA #REQUIRED
-  level CDATA #IMPLIED>
- <!ELEMENT component (unit* | package* | prebuilt*)*>
- <!ATTLIST component name CDATA #REQUIRED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  unitID ID #REQUIRED
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  bldFile CDATA #REQUIRED
-  priority CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT package EMPTY>
- <!ATTLIST package
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT prebuilt EMPTY>
- <!ATTLIST prebuilt
-  name CDATA #REQUIRED
-  version CDATA #REQUIRED
-  late (Y|N) #IMPLIED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
- <!ELEMENT unitList (unitRef+)>
- <!ATTLIST unitList
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT unitRef EMPTY>
- <!ATTLIST unitRef unit IDREF #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y | N | y | n) #REQUIRED>
- <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
- <!ELEMENT unitListRef EMPTY>
- <!ATTLIST unitListRef unitList IDREF #REQUIRED>
- <!ELEMENT layerRef EMPTY>
- <!ATTLIST layerRef layerName CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y | N | y | n) #REQUIRED
-  targetParallel (Y | N | y | n) #IMPLIED>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  command CDATA #REQUIRED>  
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sysdef_1_5_1.dtd	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,88 @@
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+  name CDATA #REQUIRED
+  level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  unitID ID #REQUIRED
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  bldFile CDATA #REQUIRED
+  priority CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  proFile CDATA #IMPLIED
+  qmakeArgs CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+  name CDATA #REQUIRED
+  version CDATA #REQUIRED
+  late (Y|N) #IMPLIED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y | N | y | n) #REQUIRED
+  targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  command CDATA #REQUIRED>  
--- a/sysresmonitoring/oodmonitor/oodmonitor2/resource/outofdiskmonitor.rss	Fri Jun 11 13:48:03 2010 +0300
+++ b/sysresmonitoring/oodmonitor/oodmonitor2/resource/outofdiskmonitor.rss	Tue Jun 29 10:40:11 2010 +0300
@@ -1,37 +1,37 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-#include <eikon.rh>
-#include "avkon.loc"
-
-RESOURCE LBUF r_qtn_memlo_device_memory_low 
-              {txt = qtn_memlo_device_memory_low;}
-RESOURCE LBUF r_qtn_memlo_memory_card_low_name 
-              {txt = qtn_memlo_memory_card_low_name;}
-RESOURCE LBUF r_qtn_memlo_memory_card_low_defaultname 
-              {txt = qtn_memlo_memory_card_low_defaultname;}
-RESOURCE LBUF r_qtn_memlo_mass_storage_memory_low 
-              {txt = qtn_memlo_mass_storage_memory_low;}
-RESOURCE LBUF r_qtn_memlo_device_memory_full 
-              {txt = qtn_memlo_device_memory_full;}
-RESOURCE LBUF r_qtn_memlo_memory_card_full_name
-              {txt = qtn_memlo_memory_card_full_name;}
-RESOURCE LBUF r_qtn_memlo_memory_card_full_defaultname 
-              {txt = qtn_memlo_memory_card_full_defaultname;}
-RESOURCE LBUF r_qtn_memlo_mass_storage_full 
-              {txt = qtn_memlo_mass_storage_full;}
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+#include <eikon.rh>
+#include "avkon.loc"
+
+RESOURCE LBUF r_qtn_memlo_device_memory_low 
+              {txt = qtn_memlo_device_memory_low;}
+RESOURCE LBUF r_qtn_memlo_memory_card_low_name 
+              {txt = qtn_memlo_memory_card_low_name;}
+RESOURCE LBUF r_qtn_memlo_memory_card_low_defaultname 
+              {txt = qtn_memlo_memory_card_low_defaultname;}
+RESOURCE LBUF r_qtn_memlo_mass_storage_memory_low 
+              {txt = qtn_memlo_mass_storage_memory_low;}
+RESOURCE LBUF r_qtn_memlo_device_memory_full 
+              {txt = qtn_memlo_device_memory_full;}
+RESOURCE LBUF r_qtn_memlo_memory_card_full_name
+              {txt = qtn_memlo_memory_card_full_name;}
+RESOURCE LBUF r_qtn_memlo_memory_card_full_defaultname 
+              {txt = qtn_memlo_memory_card_full_defaultname;}
+RESOURCE LBUF r_qtn_memlo_mass_storage_full 
+              {txt = qtn_memlo_mass_storage_full;}
--- a/sysresmonitoring/oommonitor/inc/oommemorymonitor.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oommemorymonitor.h	Tue Jun 29 10:40:11 2010 +0300
@@ -20,7 +20,7 @@
 #define OOMMEMORYMONITOR_H
 
 #include <e32property.h>
-#include <f32file.h>
+#include <e32svr.h>
 #include <w32std.h>
 #include "oomglobalconfig.h"
 #include "oomwindowgrouplist.h"
--- a/sysresmonitoring/oommonitor/inc/oommemorymonitorsession.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oommemorymonitorsession.h	Tue Jun 29 10:40:11 2010 +0300
@@ -31,6 +31,7 @@
     CMemoryMonitorSession();
 #ifndef CLIENT_REQUEST_QUEUE
     void CloseAppsFinished(TInt aBytesFree, TBool aMemoryGood);
+    TBool IsDataPaged(const RMessage2& aMessage);
 #endif
     
 private:
@@ -41,7 +42,6 @@
 #endif
     CMemoryMonitor& Monitor();
     void ServiceL(const RMessage2& aMessage);
-    TBool IsDataPaged(const RMessage2& aMessage);
 private:
     RMessagePtr2 iRequestFreeRam;
 #ifndef CLIENT_REQUEST_QUEUE
--- a/sysresmonitoring/oommonitor/src/oomlog.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomlog.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -22,6 +22,7 @@
 #include <hal.h>
 #include <w32std.h>
 #include <e32std.h>
+#include <e32hal.h>
 #include <apgwgnam.h>
 #include <flogger.h>
 
--- a/sysresmonitoring/oommonitor/src/oommemorymonitorsession.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oommemorymonitorsession.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -60,7 +60,7 @@
     return Server().Monitor();    
 #endif
     }
-
+#ifndef CLIENT_REQUEST_QUEUE
 TBool CMemoryMonitorSession::IsDataPaged(const RMessage2& aMessage)
     {
     RThread clientThread;
@@ -85,6 +85,7 @@
         }
     return dataPaged;            
     }
+#endif
 
 void CMemoryMonitorSession::ServiceL(const RMessage2& aMessage)
     {
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappAppUi.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappAppUi.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -23,7 +23,6 @@
 #include <aknmessagequerydialog.h>
 #include <aknnotewrappers.h>
 #include <stringloader.h>
-#include <f32file.h>
 #include <s32file.h>
 #include <hlplch.h>
 
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappappui.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappappui.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -23,7 +23,6 @@
 #include <aknquerydialog.h>
 #include <commondialogs.hrh>
 #include <akncommondialogsdynmem.h>
-#include <f32file.h>
 #include <t_oomtestapp.rsg>
 #include "t_oomtestappcmd.hrh"
 #include "t_oomtestappApplication.h"
--- a/systemsettings/accindicatorplugin/inc/accindicator.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/systemsettings/accindicatorplugin/inc/accindicator.h	Tue Jun 29 10:40:11 2010 +0300
@@ -48,8 +48,7 @@
 public:
     //from HbIndicatorPluginInterface
     QStringList indicatorTypes() const;
-    bool accessAllowed(const QString &indicatorType,
-                               const HbSecurityInfo *securityInfo) const;   
+    bool accessAllowed(const QString &indicatorType, const QVariantMap &securityInfo) const;   
     HbIndicatorInterface* createIndicator(const QString &indicatorType);
     int error() const;
 
--- a/systemsettings/accindicatorplugin/src/accindicator.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/systemsettings/accindicatorplugin/src/accindicator.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -27,7 +27,7 @@
 
 AccIndicatorPlugin::AccIndicatorPlugin() :
 HbIndicatorInterface(IndicatorType,
-        HbIndicatorInterface::GroupPriorityLow,
+        HbIndicatorInterface::SettingCategory,
         InteractionActivated)
     {
     mIndicatorTypes << "com.nokia.accessory.indicatorplugin/1.0";
@@ -75,8 +75,7 @@
 // this plugin it always returns true.
 // ----------------------------------------------------------------------------
 
-bool AccIndicatorPlugin::accessAllowed(const QString &indicatorType,
-    const HbSecurityInfo *securityInfo) const
+bool AccIndicatorPlugin::accessAllowed(const QString &indicatorType,const QVariantMap &securityInfo) const
     {
     Q_UNUSED(indicatorType)
     Q_UNUSED(securityInfo)
@@ -129,7 +128,7 @@
             return type;
             }
         //for displaying the icon in indicator.
-        case DecorationNameRole:
+        case MonoDecorationNameRole:
             {
             QString iconName;
             if(mAccType == KPCWired || mAccType == KPCUSB)
--- a/systemsettings/group/bld.inf	Fri Jun 11 13:48:03 2010 +0300
+++ b/systemsettings/group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -24,7 +24,6 @@
 PRJ_MMPFILES
 
 #include "../gssensorplugin/group/bld.inf"
-#include "../GSAccessoryPlugin/group/bld.inf"
 
 PRJ_TESTMMPFILES
 
--- a/tzpcside/tzcompiler/group/BLD.INF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// App-Services/TzCompiler (Time-zone Database Compiler)
-// 
-//
-
-PRJ_PLATFORMS
-
-// This component is built using Visual Studio 6 into a Windows Console Application (MSDOS)
-// it is a tool for building the Symbian Native Tz Database
-// The tool is required by licensees to build their replacement Database
-// The tool does not need to be regenerated with each OS build
-
-PRJ_EXPORTS
-
-// TZ Compiler, Configuration Files and Database
-../Release/TzCompiler.exe		/epoc32/tools/tz/tzcompiler.exe
-../Release/TzCompiler.ini		/epoc32/tools/tz/tzcompiler.ini
-../Release/TzIdentities.ini		/epoc32/tools/tz/tzidentities.ini
-
-// TzCompiler User Documentation
-"../documentation/SGL.GT0197.232 App-Services Tz  9.1 How-To Create the Tz Database.doc"	"/epoc32/tools/tz/sgl.gt0197.232 app-services tz  9.1 how-to create the tz database.doc"
-
-// Sample Olson's Tz Database Source Files
-../Release/Data/africa			/epoc32/tools/tz/data/africa
-../Release/Data/antarctica		/epoc32/tools/tz/data/antarctica
-../Release/Data/asia			/epoc32/tools/tz/data/asia
-../Release/Data/australasia		/epoc32/tools/tz/data/australasia
-../Release/Data/backward		/epoc32/tools/tz/data/backward
-../Release/Data/etcetera		/epoc32/tools/tz/data/etcetera
-../Release/Data/europe			/epoc32/tools/tz/data/europe
-../Release/Data/factory			/epoc32/tools/tz/data/factory
-../Release/Data/iso3166.tab		/epoc32/tools/tz/data/iso3166.tab
-../Release/Data/leapseconds		/epoc32/tools/tz/data/leapseconds
-../Release/Data/northamerica	/epoc32/tools/tz/data/northamerica
-../Release/Data/pacificnew		/epoc32/tools/tz/data/pacificnew
-../Release/Data/solar87			/epoc32/tools/tz/data/solar87
-../Release/Data/solar88			/epoc32/tools/tz/data/solar88
-../Release/Data/solar89			/epoc32/tools/tz/data/solar89
-../Release/Data/southamerica	/epoc32/tools/tz/data/southamerica
-../Release/Data/systemv			/epoc32/tools/tz/data/systemv
-../Release/Data/yearistype.sh	/epoc32/tools/tz/data/yearistype.sh
-../Release/Data/zone.tab		/epoc32/tools/tz/data/zone.tab
-
-PRJ_TESTMMPFILES
-// These are basically manual tests. Uncomment the makefile commands and build the tests
-// Extension makefile for creating the tool for testing TzCompiler.exe
-// makefile ../test/integration/TzCompilerTests/group/Testcallmak.mk   support
-
-// Extension makefile for invoking the tool with different ini files.
-// makefile ../test/integration/TzCompilerTests/group/testdata.mk	support
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tzpcside/tzcompiler/group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,63 @@
+// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// App-Services/TzCompiler (Time-zone Database Compiler)
+// 
+//
+
+PRJ_PLATFORMS
+
+// This component is built using Visual Studio 6 into a Windows Console Application (MSDOS)
+// it is a tool for building the Symbian Native Tz Database
+// The tool is required by licensees to build their replacement Database
+// The tool does not need to be regenerated with each OS build
+
+PRJ_EXPORTS
+
+// TZ Compiler, Configuration Files and Database
+../Release/TzCompiler.exe		/epoc32/tools/tz/tzcompiler.exe
+../Release/TzCompiler.ini		/epoc32/tools/tz/tzcompiler.ini
+../Release/TzIdentities.ini		/epoc32/tools/tz/tzidentities.ini
+
+// TzCompiler User Documentation
+"../doc_pub/SGL.GT0197.232 App-Services Tz  9.1 How-To Create the Tz Database.doc"	"/epoc32/tools/tz/sgl.gt0197.232 app-services tz  9.1 how-to create the tz database.doc"
+
+// Sample Olson's Tz Database Source Files
+../Release/Data/africa			/epoc32/tools/tz/data/africa
+../Release/Data/antarctica		/epoc32/tools/tz/data/antarctica
+../Release/Data/asia			/epoc32/tools/tz/data/asia
+../Release/Data/australasia		/epoc32/tools/tz/data/australasia
+../Release/Data/backward		/epoc32/tools/tz/data/backward
+../Release/Data/etcetera		/epoc32/tools/tz/data/etcetera
+../Release/Data/europe			/epoc32/tools/tz/data/europe
+../Release/Data/factory			/epoc32/tools/tz/data/factory
+../Release/Data/iso3166.tab		/epoc32/tools/tz/data/iso3166.tab
+../Release/Data/leapseconds		/epoc32/tools/tz/data/leapseconds
+../Release/Data/northamerica	/epoc32/tools/tz/data/northamerica
+../Release/Data/pacificnew		/epoc32/tools/tz/data/pacificnew
+../Release/Data/solar87			/epoc32/tools/tz/data/solar87
+../Release/Data/solar88			/epoc32/tools/tz/data/solar88
+../Release/Data/solar89			/epoc32/tools/tz/data/solar89
+../Release/Data/southamerica	/epoc32/tools/tz/data/southamerica
+../Release/Data/systemv			/epoc32/tools/tz/data/systemv
+../Release/Data/yearistype.sh	/epoc32/tools/tz/data/yearistype.sh
+../Release/Data/zone.tab		/epoc32/tools/tz/data/zone.tab
+
+PRJ_TESTMMPFILES
+// These are basically manual tests. Uncomment the makefile commands and build the tests
+// Extension makefile for creating the tool for testing TzCompiler.exe
+// makefile ../test/integration/TzCompilerTests/group/Testcallmak.mk   support
+
+// Extension makefile for invoking the tool with different ini files.
+// makefile ../test/integration/TzCompilerTests/group/testdata.mk	support
+
--- a/tzservices/tzdatabase/group/BLD.INF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// App-Services/TzDb (Time Zone DataBase)
-// 
-//
-
-PRJ_EXPORTS
-// specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-// If there's no destination then the source file will be copied
-// to the same name in /epoc32/include
-
-../data/tzdb.dbz	z:/private/1020383e/tzdb.dbz
-../data/tzdb.dbz	/epoc32/tools/tz/tzdb.dbz
-
-PRJ_EXTENSIONS
-start extension app-services/buildupgradesis
-	option SISNAME		timezone_upgrade
-	option SRCDIR		../data
-	option UID_DIR		1020383E
-end
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tzservices/tzdatabase/group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,32 @@
+// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// App-Services/TzDb (Time Zone DataBase)
+// 
+//
+
+PRJ_EXPORTS
+// specify the source file followed by its destination here
+// copy will be used to copy the source file to its destination
+// If there's no destination then the source file will be copied
+// to the same name in /epoc32/include
+
+../data/tzdb.dbz	z:/private/1020383e/tzdb.dbz
+../data/tzdb.dbz	/epoc32/tools/tz/tzdb.dbz
+
+PRJ_EXTENSIONS
+start extension app-services/buildupgradesis
+	option SISNAME		timezone_upgrade
+	option SRCDIR		../data
+	option UID_DIR		1020383E
+end
--- a/tzservices/tzloc/src/TzLocalizationDbAccessor.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/tzservices/tzloc/src/TzLocalizationDbAccessor.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -111,12 +111,15 @@
 		}
 	User::LeaveIfError(error);
 	// Check if both tables are created.
-	TRAP(error, iLocalizedTimeZoneDb.ColSetL(KCZTableName));
+	CDbColSet *colSet = NULL;
+	TRAP(error, colSet = iLocalizedTimeZoneDb.ColSetL(KCZTableName));
+	delete colSet;
 	if (error)
 		{
 		User::LeaveIfError(CreateFrequentlyUsedZoneTableL());
 		}
-	TRAP(error, iLocalizedTimeZoneDb.ColSetL(KUCTableName));
+	TRAP(error, colSet = iLocalizedTimeZoneDb.ColSetL(KUCTableName));
+	delete colSet;
 	if (error)
 	        {
 		User::LeaveIfError(CreateUserCityTableL());
--- a/tzservices/tzserver/Server/Source/timezonesession.cpp	Fri Jun 11 13:48:03 2010 +0300
+++ b/tzservices/tzserver/Server/Source/timezonesession.cpp	Tue Jun 29 10:40:11 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -698,19 +698,23 @@
  TInt CTzServerSession::doGetUserTimeZoneNamesL(const RMessage2& aMessage)
 	{
 	TInt size = iTzUserDataCache->SizeOfNames();
-	CBufFlat* buffer = CBufFlat::NewL(size);
-	CleanupStack::PushL(buffer);
-	buffer->ExpandL(0,size);
-	
-	RBufWriteStream writeStream;
-	CleanupClosePushL(writeStream);
-	writeStream.Open(*buffer);
-	const CTzUserNames& names = iTzUserDataCache->GetNames();
-	writeStream << names;
-	writeStream.CommitL();
-	aMessage.WriteL(0, buffer->Ptr(0));
-	CleanupStack::PopAndDestroy(2, buffer);
-	return KErrNone;
+	if ( size > 0 )
+		{
+		CBufFlat* buffer = CBufFlat::NewL(size);
+		CleanupStack::PushL(buffer);
+		buffer->ExpandL(0,size);
+		
+		RBufWriteStream writeStream;
+		CleanupClosePushL(writeStream);
+		writeStream.Open(*buffer);
+		const CTzUserNames& names = iTzUserDataCache->GetNames();
+		writeStream << names;
+		writeStream.CommitL();
+		aMessage.WriteL(0, buffer->Ptr(0));
+		CleanupStack::PopAndDestroy(2, buffer);
+		return KErrNone;
+		}
+	return KErrArgument;
 	}
 	
 /**
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tzservices/tzserver/analysis/DAYLIGHT SAVINGS ANALYSIS.mdl	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,6210 @@
+
+(object Petal
+    version    	43
+    _written   	"Rose 6.5.9232.10"
+    charSet    	0)
+
+(object Design "Logical View"
+    is_unit    	TRUE
+    is_loaded  	TRUE
+    quid       	"36D487460258"
+    defaults   	(object defaults
+	rightMargin 	0.250000
+	leftMargin 	0.250000
+	topMargin  	0.250000
+	bottomMargin 	0.500000
+	pageOverlap 	0.250000
+	clipIconLabels 	TRUE
+	autoResize 	TRUE
+	snapToGrid 	FALSE
+	gridX      	16
+	gridY      	16
+	defaultFont 	(object Font
+	    size       	9
+	    face       	"Arial"
+	    bold       	FALSE
+	    italics    	FALSE
+	    underline  	FALSE
+	    strike     	FALSE
+	    color      	0
+	    default_color 	TRUE)
+	showMessageNum 	1
+	showClassOfObject 	TRUE
+	notation   	"Unified")
+    root_usecase_package 	(object Class_Category "Use Case View"
+	quid       	"34DBB4830142"
+	documentation 	
+|The Use Case View organizes the Use-Case Model and the optional Business Use-Case Model.
+|
+	
+	exportControl 	"Public"
+	global     	TRUE
+	logical_models 	(list unit_reference_list
+	    (object Class_Category "Business Use-Case Model"
+		quid       	"35B677D701B8"
+		documentation 	
+|Optional Model:
+|The business modeling workflow in Rational Unified Process produces two models: the business use-case model, and the business object model. Both show the business 
+|processes, but different aspects of them. In the business use-case model each business use case represents a business process, described (text and/or activity diagrams) from an "external" view point without worrying about who does what to whom inside of the organization. 
+|In the business object model, you include realizations of each business use case to show how workers and entities collaborate to perform the process. You do that using class diagrams, activity diagrams with swimlanes, collaboration diagrams, and/or interaction diagrams.
+|
+|<Any additional description of the Business Use Case Model, such as modeling conventions that the reader/reviewer may need to understand the model, should be described here.>
+		
+		exportControl 	"Public"
+		logical_models 	(list unit_reference_list)
+		logical_presentations 	(list unit_reference_list
+		    (object UseCaseDiagram "Global View of Business Actors and Business Use Cases"
+			quid       	"35C0DFF50172"
+			title      	"Global View of Business Actors and Business Use Cases"
+			documentation 	"This is a global view of the system showing all Busines Use Cases and Business Actors.  It is intended to be an overview diagram, so if the diagram becomes too complex for easy comprehension, use several diagrams, each of which should focus on a different aspect of the system.  Usually, organizing use case diagrams around actors is a good approach."
+			zoom       	100
+			max_height 	28350
+			max_width  	21600
+			origin_x   	0
+			origin_y   	0
+			items      	(list diagram_item_list
+			    (object NoteView @1
+				location   	(464, 352)
+				label      	(object ItemLabel
+				    Parent_View 	@1
+				    location   	(42, 11)
+				    fill_color 	13434879
+				    nlines     	14
+				    max_width  	809
+				    label      	
+|Global View of Business Actors and BusinessUse Cases
+|
+|This diagram presents all Business Actors and all concrete Business Use Cases (those that are directly instantiable).
+|
+|Related Rational Unified Process Activities:
+|- Activity: Find Business Actors and Use Cases
+|- Activity: Structure the Business Use Case Model
+|
+|*Note: this note may be deleted once the diagram is created.
+				    )
+				line_color 	3342489
+				fill_color 	13434879
+				width      	869
+				height     	694)
+			    (object NoteView @2
+				location   	(1280, 160)
+				label      	(object ItemLabel
+				    Parent_View 	@2
+				    location   	(942, 29)
+				    fill_color 	13434879
+				    nlines     	5
+				    max_width  	640
+				    label      	
+|Created/modified by: <name>
+|Date: <creation/modification date>
+|
+|Approved by: <name>
+|Date: <approval date>
+				    )
+				line_color 	3342489
+				fill_color 	13434879
+				width      	700
+				height     	275)))))
+	    (object Class_Category "Use-Case Model"
+		is_unit    	TRUE
+		is_loaded  	FALSE
+		file_name  	"M:\\DST\\analysis\\UseCases.cat"
+		quid       	"35B677F4010E"))
+	logical_presentations 	(list unit_reference_list
+	    (object UseCaseDiagram "Main"
+		quid       	"35C6339B029F"
+		title      	"Main"
+		documentation 	
+|This diagram depicts the relationships between the packages (models) contained in the 'Use-Case View": the Use-Case Model (for the system) and the Business Use-Case Model (describing the business).
+		
+		zoom       	90
+		max_height 	28350
+		max_width  	21600
+		origin_x   	0
+		origin_y   	0
+		items      	(list diagram_item_list
+		    (object CategoryView "Use Case View::Use-Case Model" @3
+			location   	(400, 864)
+			font       	(object Font
+			    size       	10)
+			label      	(object ItemLabel
+			    Parent_View 	@3
+			    location   	(256, 780)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	288
+			    justify    	0
+			    label      	"Use-Case Model")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"35B677F4010E"
+			width      	300
+			height     	180)
+		    (object NoteView @4
+			location   	(1168, 592)
+			font       	(object Font
+			    size       	10)
+			label      	(object ItemLabel
+			    Parent_View 	@4
+			    location   	(941, 390)
+			    fill_color 	13434879
+			    nlines     	9
+			    max_width  	419
+			    label      	"The Use-Case Model is traceable to (and derives from) the Business Model.  The system (as described in the Use Case Model) provides behavior that supports the business.")
+			line_color 	3342489
+			fill_color 	13434879
+			width      	479
+			height     	416)
+		    (object CategoryView "Use Case View::Business Use-Case Model" @5
+			location   	(384, 320)
+			label      	(object ItemLabel
+			    Parent_View 	@5
+			    location   	(189, 229)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	390
+			    justify    	0
+			    label      	"Business Use-Case Model")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"35B677D701B8"
+			width      	403
+			height     	194)
+		    (object ImportView "" @6
+			stereotype 	TRUE
+			line_color 	3342489
+			quidu      	"35C633DA030C"
+			client     	@3
+			supplier   	@5
+			line_style 	0)
+		    (object AttachView "" @7
+			stereotype 	TRUE
+			line_color 	3342489
+			client     	@6
+			supplier   	@4
+			line_style 	0)))))
+    root_category 	(object Class_Category "Logical View"
+	quid       	"34DBB4830141"
+	documentation 	
+|Rational Unified Process uses the "Logical View in Rose" to organize the Design Model  and the Process View and the optional Business Object Model and Analysis Model.
+	
+	exportControl 	"Public"
+	global     	TRUE
+	subsystem  	"Component View"
+	quidu      	"34DBB4830143"
+	logical_models 	(list unit_reference_list
+	    (object Class_Category "Analysis Model"
+		quid       	"35B678170028"
+		documentation 	
+|This model is optional.
+|The Analysis Model contains a set of Analysis Classes, which describe an abstract realization of the use cases of the system.  The analysis classes evolve into associated design elements which are modeled in the Design Model.  
+		
+		exportControl 	"Public"
+		logical_models 	(list unit_reference_list
+		    (object Class_Category "Business Object Model"
+			is_unit    	TRUE
+			is_loaded  	FALSE
+			file_name  	"M:\\DST\\analysis\\LogicalBusinessObjects.cat"
+			quid       	"35B678080064")
+		    (object Class_Category "TZ Compiler"
+			is_unit    	TRUE
+			is_loaded  	FALSE
+			file_name  	"M:\\DST\\analysis\\TZCOMPILER.CAT"
+			quid       	"40E569BC024F")
+		    (object Class_Category "LTClasses"
+			is_unit    	TRUE
+			is_loaded  	FALSE
+			file_name  	"M:\\DST\\analysis\\Classes.cat"
+			quid       	"40A89DC203B0")
+		    (object Class_Category "Time Zone Database Management"
+			is_unit    	TRUE
+			is_loaded  	FALSE
+			file_name  	"M:\\DST\\analysis\\LogicalTZDBM.cat"
+			quid       	"40B1E4A6003A")
+		    (object Class_Category "Local Time Conversion"
+			is_unit    	TRUE
+			is_loaded  	FALSE
+			file_name  	"M:\\DST\\analysis\\LogicalLocaltimeConv.cat"
+			quid       	"40B1D43200B7")
+		    (object Class_Category "System Time Management"
+			is_unit    	TRUE
+			is_loaded  	FALSE
+			file_name  	"M:\\DST\\analysis\\LogicalSysTimeMngmt.cat"
+			quid       	"40B1D49203C5")
+		    (object Class_Category "TZClasses"
+			is_unit    	TRUE
+			is_loaded  	FALSE
+			file_name  	"M:\\DST\\analysis\\TZClasses.cat"
+			quid       	"40F3CEAF0324")
+		    (object Class_Category "BClasses"
+			is_unit    	TRUE
+			is_loaded  	FALSE
+			file_name  	"M:\\DST\\analysis\\BClasses.cat"
+			quid       	"40F3CFB10172"))
+		logical_presentations 	(list unit_reference_list))
+	    (object Class_Category "Design Model"
+		quid       	"35B6782302DA"
+		documentation 	
+|The Design Model in Rational Unified Process.
+|The design model is adapted to model the real implementation environment, and serves as an abstraction of the source code. It is a "blueprint" of how the source code is structured and written. 
+|
+|The design model is a hierarchy of packages (design subsystems and design-service  packages), with "leaves" that are classes. Subsystems are a design "view" of the components that are defined in the Implementation Model.
+|
+|The design model hierarchy consists of layers. 
+|
+|Classes represent abstractions of classes in the system's implementation. They define the objects, which in turn are abstractions of the objects in the system's implementation. The use cases are realized by the objects, and this is represented by use-case realizations in the Design Model.  Each use-case realization has a realize dependency to a use case in the Use-Case Model. 
+		
+		exportControl 	"Public"
+		logical_models 	(list unit_reference_list
+		    (object Class_Category "<Layer Name> Layer"
+			quid       	"34E3686A00F0"
+			documentation 	
+|The design model is normally organized in layers. The number of layers is not fixed, but varies from situation to situation. 
+|
+|During architectural analysis, focus is normally on the two high-level layers, that is, the application and business-specific layers;  this is what is meant by the "high-level organization of subsystems." The other lower-level layers are in focus during architectural design, refer to the activity Architectural Design for more information.
+|
+|Layers are identified using the naming conventions shown in the name of this package. 
+			
+			exportControl 	"Public"
+			logical_models 	(list unit_reference_list
+			    (object Class_Category "<package name>"
+				quid       	"34E36BB7017C"
+				documentation 	
+|<Enter a short description of the package here.  A package should be used in cases where a set of classes and/or other packages need to be grouped together for model organization purposes.  Though the contents of the package can have public visibility, which makes them visible to model elements outside the containing package, packages are primarily just grouping mechanisms.  
+|
+|If a set of classes is to be encapsulated and can be hidden behind a well-defined interface, a subsystem is a more appropriate container>
+				
+				exportControl 	"Public"
+				logical_models 	(list unit_reference_list)
+				logical_presentations 	(list unit_reference_list
+				    (object ClassDiagram "<package name> - Dependencies"
+					quid       	"37BC2256004D"
+					title      	"<package name> - Dependencies"
+					documentation 	"This diagram shows the package itself and the packages that it is dependent of. That is useful to know for instance when the package is a separate unit that can be reused in other systems."
+					zoom       	100
+					max_height 	28350
+					max_width  	21600
+					origin_x   	0
+					origin_y   	0
+					items      	(list diagram_item_list))
+				    (object ClassDiagram "<package name> - Interfaces"
+					quid       	"37BC226D026D"
+					title      	"<package name> - Interfaces"
+					documentation 	"This diagram shows only the classes that are visible outside this package. The interfaces of the package."
+					zoom       	100
+					max_height 	28350
+					max_width  	21600
+					origin_x   	0
+					origin_y   	0
+					items      	(list diagram_item_list))))
+			    (object Class_Category "<Subsystem Name>"
+				quid       	"35C0F38200B4"
+				documentation 	
+|<Enter a short description of the subsystem here.  A subsystem should be used in cases where a set of classes and/or other packages need to be encapsulated within a container and hidden behind a set of well-defined interfaces.  By convention, none of the contents of subsystem are visible except the interfaces of the subsystem.  This allows subsystems to be easily replaced, and the implementations changed, provided the interfaces remain unchanged.  It offers a degree of encapsulation greater than that of the package.
+|
+|If a set of classes is merely to be grouped together, but public visibility of classes is still desirable, a package is a more appropriate container.>
+				
+				stereotype 	"subsystem"
+				exportControl 	"Public"
+				logical_models 	(list unit_reference_list)
+				logical_presentations 	(list unit_reference_list
+				    (object ClassDiagram "<subsystem name> - Dependencies"
+					quid       	"35C0F4220190"
+					title      	"<subsystem name> - Dependencies"
+					documentation 	"This diagram shows the package itself and the packages that it is dependent of. That is useful to know for instance when the package is a separate unit that can be reused in other systems."
+					zoom       	100
+					max_height 	28350
+					max_width  	21600
+					origin_x   	0
+					origin_y   	0
+					items      	(list diagram_item_list))
+				    (object ClassDiagram "<subsystem name> - Interfaces"
+					quid       	"37BC21080165"
+					title      	"<subsystem name> - Interfaces"
+					documentation 	
+|The Process View in Rational Unified Process
+|This package is used to organize the active classes in the system and will be presented in the SoDA-generated Software Architecture Document, under the "Process View"
+					
+					zoom       	100
+					max_height 	28350
+					max_width  	21600
+					origin_x   	0
+					origin_y   	0
+					items      	(list diagram_item_list)))))
+			logical_presentations 	(list unit_reference_list
+			    (object ClassDiagram "All Packages in <Layer Name> - Layer"
+				quid       	"34E36C2903C0"
+				title      	"All Packages in <Layer Name> - Layer"
+				documentation 	"This diagram shows all packages in this - Layer."
+				zoom       	100
+				max_height 	28350
+				max_width  	21600
+				origin_x   	0
+				origin_y   	0
+				items      	(list diagram_item_list))))
+		    (object Class_Category "Use-Case Realizations"
+			quid       	"34E36D3203CA"
+			documentation 	
+|In this Package we will describe "Use Case Realizations" as stereotyped use cases.
+|
+|A use-case realization describes how a particular use case is realized within  the design model, in terms of collaborating objects.
+|
+|A realize dependency is used between the "Use Case Realization" and the "Use Case" in the use-case  model that is realized. 
+|
+|
+			
+			exportControl 	"Public"
+			logical_models 	(list unit_reference_list
+			    (object Association "$UNNAMED$0"
+				quid       	"35409E9D02A8"
+				stereotype 	"realize"
+				roles      	(list role_list
+				    (object Role "$UNNAMED$1"
+					quid       	"35409E9E0294"
+					supplier   	"Use Case View::Use-Case Model::Use Cases::<Use Case Name>::<Use Case Name>"
+					quidu      	"34E37FB203D4"
+					is_navigable 	TRUE)
+				    (object Role "$UNNAMED$2"
+					quid       	"35409E9E0295"
+					supplier   	"Logical View::Design Model::Use-Case Realizations::<Use-Case Name>::<Use-Case Name>"
+					quidu      	"352F38180276")))
+			    (object Class_Category "<Use-Case Name>"
+				quid       	"35D083E100BE"
+				documentation 	" A separate package is recommended for each Use Case Realization to facilitate access and version control of related use case artifacts."
+				exportControl 	"Public"
+				logical_models 	(list unit_reference_list
+				    (object UseCase "<Use-Case Name>"
+					attributes 	(list Attribute_Set
+					    (object Attribute
+						tool       	"RequisitePro"
+						name       	"ReqProProjectPath"
+						value      	"")
+					    (object Attribute
+						tool       	"RequisitePro"
+						name       	"ReqProProjectGuid"
+						value      	"")
+					    (object Attribute
+						tool       	"RequisitePro"
+						name       	"ReqProDocumentName"
+						value      	"")
+					    (object Attribute
+						tool       	"RequisitePro"
+						name       	"ReqProDocumentGuid"
+						value      	"")
+					    (object Attribute
+						tool       	"RequisitePro"
+						name       	"ReqProDocType"
+						value      	"")
+					    (object Attribute
+						tool       	"RequisitePro"
+						name       	"ReqProReqType"
+						value      	"")
+					    (object Attribute
+						tool       	"RequisitePro"
+						name       	"ReqProRequirementId"
+						value      	""))
+					quid       	"352F38180276"
+					documentation 	
+|This will be a stereotype on a usecase. 
+|In UML it is a stereotype on a collaboration and that does not exist in Rose.
+					
+					stereotype 	"use-case realization"
+					logical_models 	(list unit_reference_list
+					    (object Mechanism @8
+						logical_models 	(list unit_reference_list))
+					    (object Mechanism @9
+						logical_models 	(list unit_reference_list)))
+					logical_presentations 	(list unit_reference_list
+					    (object ClassDiagram "<Use Case Name> -  Realize Dependencies"
+						quid       	"37BC23B801F1"
+						title      	"<Use Case Name> -  Realize Dependencies"
+						documentation 	"This diagram shows the Use Case and the Use Case Realization and the realize dependency between them.  This information is used to connect the use case with the use case realization."
+						zoom       	100
+						max_height 	28350
+						max_width  	21600
+						origin_x   	0
+						origin_y   	0
+						items      	(list diagram_item_list))
+					    (object ClassDiagram "<Use Case Name> -  Participating Classes"
+						quid       	"37BC23E0036B"
+						title      	"<Use Case Name> -  Participating Classes"
+						documentation 	"This Diagram shows all participating classes in this Use Case Realization"
+						zoom       	100
+						max_height 	28350
+						max_width  	21600
+						origin_x   	0
+						origin_y   	0
+						items      	(list diagram_item_list))
+					    (object InteractionDiagram "<Use Case Name> -  Basic Flow"
+						mechanism_ref 	@8
+						quid       	"35081E3603A2"
+						title      	"<Use Case Name> -  Basic Flow"
+						zoom       	100
+						max_height 	28350
+						max_width  	21600
+						origin_x   	0
+						origin_y   	0
+						items      	(list diagram_item_list))
+					    (object InteractionDiagram "<Use Case Name> -  <Flow Type>"
+						mechanism_ref 	@9
+						quid       	"3540A0B901AE"
+						title      	"<Use Case Name> -  <Flow Type>"
+						zoom       	100
+						max_height 	28350
+						max_width  	21600
+						origin_x   	0
+						origin_y   	0
+						items      	(list diagram_item_list)))))
+				logical_presentations 	(list unit_reference_list
+				    (object ClassDiagram "Realize Dependency"
+					quid       	"34E39DA90302"
+					title      	"Realize Dependency"
+					documentation 	"This diagram shows the Use Case and the Use Case Realization and the realizes dependency between them."
+					zoom       	100
+					max_height 	28350
+					max_width  	21600
+					origin_x   	0
+					origin_y   	0
+					items      	(list diagram_item_list
+					    (object NoteView @10
+						location   	(704, 144)
+						label      	(object ItemLabel
+						    Parent_View 	@10
+						    location   	(38, 25)
+						    fill_color 	13434879
+						    nlines     	5
+						    max_width  	1296
+						    label      	
+|
+|This diagram shows the Use Case and the Use Case Realization and the realize dependency between them.
+						    )
+						line_color 	3342489
+						fill_color 	13434879
+						width      	1356
+						height     	250)
+					    (object UseCaseView "Use Case View::Use-Case Model::Use Cases::<Use Case Name>::<Use Case Name>" @11
+						location   	(1152, 528)
+						label      	(object ItemLabel
+						    Parent_View 	@11
+						    location   	(1152, 666)
+						    anchor_loc 	1
+						    nlines     	2
+						    max_width  	631
+						    justify    	0
+						    label      	"<Use Case Name>")
+						icon_style 	"Icon"
+						line_color 	3342489
+						fill_color 	13434879
+						quidu      	"34E37FB203D4"
+						autoResize 	TRUE)
+					    (object UseCaseView "Logical View::Design Model::Use-Case Realizations::<Use-Case Name>::<Use-Case Name>" @12
+						location   	(608, 960)
+						label      	(object ItemLabel
+						    Parent_View 	@12
+						    location   	(608, 1148)
+						    anchor_loc 	1
+						    nlines     	2
+						    max_width  	651
+						    justify    	0
+						    label      	"<Use-Case Name>")
+						stereotype 	(object ItemLabel
+						    Parent_View 	@12
+						    location   	(608, 1078)
+						    anchor     	10
+						    anchor_loc 	1
+						    nlines     	1
+						    max_width  	434
+						    justify    	0
+						    label      	"<<use-case realization>>")
+						icon       	"use-case realization"
+						icon_style 	"Icon"
+						line_color 	3342489
+						fill_color 	13434879
+						quidu      	"352F38180276"
+						autoResize 	TRUE)
+					    (object AssociationViewNew "$UNNAMED$0" @13
+						location   	(876, 741)
+						stereotype 	(object SegLabel @14
+						    Parent_View 	@13
+						    location   	(874, 746)
+						    anchor     	10
+						    anchor_loc 	1
+						    nlines     	1
+						    max_width  	450
+						    justify    	0
+						    label      	"<<realize>>"
+						    pctDist    	0.483333
+						    height     	5
+						    orientation 	1)
+						line_color 	3342489
+						quidu      	"35409E9D02A8"
+						roleview_list 	(list RoleViews
+						    (object RoleView "$UNNAMED$1" @15
+							Parent_View 	@13
+							location   	(236, -539)
+							stereotype 	TRUE
+							line_color 	3342489
+							quidu      	"35409E9E0294"
+							client     	@13
+							supplier   	@11
+							line_style 	0)
+						    (object RoleView "$UNNAMED$2" @16
+							Parent_View 	@13
+							location   	(236, -539)
+							stereotype 	TRUE
+							line_color 	3342489
+							quidu      	"35409E9E0295"
+							client     	@13
+							supplier   	@12
+							line_style 	0))))))))
+			logical_presentations 	(list unit_reference_list))
+		    (object Class_Category "Process View"
+			quid       	"35D227B103C0"
+			documentation 	"An architectural view that describes the concurrent aspect of the system: tasks (processes) and their interactions."
+			exportControl 	"Public"
+			logical_models 	(list unit_reference_list
+			    (object Class "<Process Name>"
+				quid       	"35DB3C8302D0"
+				documentation 	"This process provides <enter a description here of what the role of the process in the system is>.  A separate process was chosen for this to be able to <enter the rationale for needing a separate process>."
+				stereotype 	"process")
+			    (object Class "<Thread Name>"
+				quid       	"35DB3CB002BC"
+				documentation 	"This is a sub-process or thread within the <name of process of which this thread is a sub-process> process which handles <enter a description of what this thread does>.  A separate thread was chosen for this to be able to <enter the rationale for creating a separate thread>."
+				stereotype 	"thread")
+			    (object Association "$UNNAMED$3"
+				quid       	"35DB3E72017C"
+				roles      	(list role_list
+				    (object Role "$UNNAMED$4"
+					quid       	"35DB3E73005A"
+					supplier   	"Logical View::Design Model::Process View::<Process Name>"
+					quidu      	"35DB3C8302D0"
+					is_navigable 	TRUE
+					is_aggregate 	TRUE)
+				    (object Role "$UNNAMED$5"
+					quid       	"35DB3E730096"
+					supplier   	"Logical View::Design Model::Process View::<Thread Name>"
+					quidu      	"35DB3CB002BC"
+					Containment 	"By Value"
+					is_navigable 	TRUE))))
+			logical_presentations 	(list unit_reference_list
+			    (object ClassDiagram "Process View"
+				quid       	"35DB3C2A02B2"
+				title      	"Process View"
+				documentation 	"This diagram illustrates the composition of processes and threads, and the mapping of classes onto those processes and threads."
+				zoom       	100
+				max_height 	28350
+				max_width  	21600
+				origin_x   	0
+				origin_y   	0
+				items      	(list diagram_item_list
+				    (object ClassView "Class" "Logical View::Design Model::Process View::<Process Name>" @17
+					ShowCompartmentStereotypes 	TRUE
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(288, 464)
+					label      	(object ItemLabel
+					    Parent_View 	@17
+					    location   	(122, 436)
+					    fill_color 	13434879
+					    nlines     	1
+					    max_width  	332
+					    justify    	0
+					    label      	"<Process Name>")
+					stereotype 	(object ItemLabel
+					    Parent_View 	@17
+					    location   	(122, 389)
+					    fill_color 	13434879
+					    anchor     	10
+					    nlines     	1
+					    max_width  	332
+					    justify    	0
+					    label      	"<<process>>")
+					icon_style 	"Icon"
+					line_color 	3342489
+					fill_color 	13434879
+					quidu      	"35DB3C8302D0"
+					width      	350
+					height     	172
+					annotation 	8
+					autoResize 	TRUE)
+				    (object ClassView "Class" "Logical View::Design Model::Process View::<Thread Name>" @18
+					ShowCompartmentStereotypes 	TRUE
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(896, 464)
+					label      	(object ItemLabel
+					    Parent_View 	@18
+					    location   	(740, 436)
+					    fill_color 	13434879
+					    nlines     	1
+					    max_width  	312
+					    justify    	0
+					    label      	"<Thread Name>")
+					stereotype 	(object ItemLabel
+					    Parent_View 	@18
+					    location   	(740, 389)
+					    fill_color 	13434879
+					    anchor     	10
+					    nlines     	1
+					    max_width  	312
+					    justify    	0
+					    label      	"<<thread>>")
+					icon_style 	"Icon"
+					line_color 	3342489
+					fill_color 	13434879
+					quidu      	"35DB3CB002BC"
+					width      	330
+					height     	172
+					annotation 	8
+					autoResize 	TRUE)
+				    (object AssociationViewNew "$UNNAMED$3" @19
+					location   	(596, 464)
+					stereotype 	TRUE
+					line_color 	3342489
+					quidu      	"35DB3E72017C"
+					roleview_list 	(list RoleViews
+					    (object RoleView "$UNNAMED$4" @20
+						Parent_View 	@19
+						location   	(-300, 0)
+						stereotype 	TRUE
+						line_color 	3342489
+						quidu      	"35DB3E73005A"
+						client     	@19
+						supplier   	@17
+						line_style 	0)
+					    (object RoleView "$UNNAMED$5" @21
+						Parent_View 	@19
+						location   	(-300, 0)
+						stereotype 	TRUE
+						line_color 	3342489
+						quidu      	"35DB3E730096"
+						client     	@19
+						supplier   	@18
+						line_style 	0))))))))
+		logical_presentations 	(list unit_reference_list
+		    (object ClassDiagram "Architecturally Significant Model Elements"
+			quid       	"34E36BDE02C6"
+			title      	"Architecturally Significant Model Elements"
+			documentation 	"Elements of the Design Model which are considered architecturally significant should be presented in this diagram.  This diagram will be presented in the document generated using the SoDA Software Architecture Document."
+			zoom       	100
+			max_height 	28350
+			max_width  	21600
+			origin_x   	0
+			origin_y   	0
+			items      	(list diagram_item_list
+			    (object NoteView @22
+				location   	(672, 304)
+				label      	(object ItemLabel
+				    Parent_View 	@22
+				    location   	(28, 19)
+				    fill_color 	13434879
+				    nlines     	13
+				    max_width  	1253
+				    label      	
+|
+|This diagram is just produced for architectural significant packages.
+|
+|This diagram shows the Architectural Significant Classes and Packages in this package. Only significant  operations and attributes are shown on the classes in this diagram.
+|
+|See Rational Unified Process:
+|Activity: Architectural Design
+|Step:  Include Architecturally Significant Model Elements in the Logical View 
+|
+|This will be a part of  the  "Software Architecture Document" :
+|- "Logical View" 
+|-     "Architecturally Significant Model Elements"
+				    )
+				line_color 	3342489
+				fill_color 	13434879
+				width      	1313
+				height     	582)
+			    (object NoteView @23
+				location   	(1696, 160)
+				label      	(object ItemLabel
+				    Parent_View 	@23
+				    location   	(1358, 29)
+				    fill_color 	13434879
+				    nlines     	5
+				    max_width  	640
+				    label      	
+|Created/modified by: <name>
+|Date: <creation/modification date>
+|
+|Approved by: <name>
+|Date: <approval date>
+				    )
+				line_color 	3342489
+				fill_color 	13434879
+				width      	700
+				height     	275)))
+		    (object ClassDiagram "Architecture Overview - Package and Subsystem Layering"
+			quid       	"354A9751015E"
+			title      	"Architecture Overview - Package and Subsystem Layering"
+			documentation 	
+|This diagram depicts the organization of the design model into layers. This diagram will be presented in the document generated using the SoDA Software Architecture Document.  
+|
+|See Rational Unified Process:
+|Activity: Architectural Analysis
+|Step: Define the High-Level Organization of Subsystems
+|
+|Activity: Incorporate Existing Design Elements
+|Step: Update the Organization of the Design Model
+			
+			zoom       	100
+			max_height 	28350
+			max_width  	21600
+			origin_x   	0
+			origin_y   	0
+			items      	(list diagram_item_list
+			    (object NoteView @24
+				location   	(576, 256)
+				label      	(object ItemLabel
+				    Parent_View 	@24
+				    location   	(44, 31)
+				    fill_color 	13434879
+				    nlines     	9
+				    max_width  	1028
+				    label      	
+|This diagram shows the design model layers.
+|
+|See Rational Unified Process:
+|Activity: Architectural Analysis
+|Step: Define the High-Level Organization of Subsystems
+|
+|Activity: Architectural Design
+|Step: Define the Low-level Organization of Subsystems
+				    )
+				line_color 	3342489
+				fill_color 	13434879
+				width      	1088
+				height     	463)
+			    (object NoteView @25
+				location   	(1520, 176)
+				label      	(object ItemLabel
+				    Parent_View 	@25
+				    location   	(1182, 45)
+				    fill_color 	13434879
+				    nlines     	5
+				    max_width  	640
+				    label      	
+|Created/modified by: <name>
+|Date: <creation/modification date>
+|
+|Approved by: <name>
+|Date: <approval date>
+				    )
+				line_color 	3342489
+				fill_color 	13434879
+				width      	700
+				height     	275))))))
+	logical_presentations 	(list unit_reference_list
+	    (object ClassDiagram "Welcome"
+		quid       	"3512226B0028"
+		title      	"Welcome"
+		documentation 	
+|Welcome to the Rational Unified Process Frame Work
+|
+|Purpose of the FrameWork:
+|a) provide a good structure for a Rose model
+|b) provide a style guide with naming conventions/suggestions
+|c) identify a minimal set of diagrams to produce
+|d) relate activities in RUP to Rose diagrams
+|e) provide a basis for sophisticated SoDA reports. For instance based on this structure most of the Rose parts of the "Software Architecture Document" are generated from SoDA.
+|
+		
+		zoom       	100
+		max_height 	28350
+		max_width  	21600
+		origin_x   	0
+		origin_y   	0
+		items      	(list diagram_item_list
+		    (object NoteView @26
+			location   	(768, 384)
+			label      	(object ItemLabel
+			    Parent_View 	@26
+			    location   	(121, 96)
+			    fill_color 	13434879
+			    nlines     	14
+			    max_width  	1259
+			    label      	
+|Welcome to the Rational Unified Process Rose Model Framework
+|
+|Purpose of the Framework:
+|a) provide a good structure for a Rose model
+|b) provide a style guide with naming conventions/suggestions
+|c) identify a minimal set of diagrams to produce
+|d) relate activities in RUP to Rose diagrams
+|e) provide a basis for sophisticated SoDA reports. For instance based on this structure most of the Rose parts of the "Software Architecture Document" are generated from SoDA.
+			    )
+			line_color 	3342489
+			fill_color 	13434879
+			width      	1319
+			height     	588)
+		    (object CategoryView "Logical View::Analysis Model::TZ Compiler" @27
+			location   	(1136, 1008)
+			label      	(object ItemLabel
+			    Parent_View 	@27
+			    location   	(951, 924)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	370
+			    justify    	0
+			    label      	"TZ Compiler")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"40E569BC024F"
+			width      	382
+			height     	180)
+		    (object CategoryView "Logical View::Analysis Model::LTClasses" @28
+			location   	(432, 1008)
+			label      	(object ItemLabel
+			    Parent_View 	@28
+			    location   	(247, 924)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	370
+			    justify    	0
+			    label      	"LTClasses")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"40A89DC203B0"
+			width      	382
+			height     	180)
+		    (object CategoryView "Logical View::Analysis Model::Time Zone Database Management" @29
+			location   	(1872, 1040)
+			label      	(object ItemLabel
+			    Parent_View 	@29
+			    location   	(1638, 956)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	468
+			    justify    	0
+			    label      	"Time Zone Database Management")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"40B1E4A6003A"
+			width      	480
+			height     	180)
+		    (object CategoryView "Logical View::Analysis Model::Business Object Model" @30
+			location   	(512, 1408)
+			label      	(object ItemLabel
+			    Parent_View 	@30
+			    location   	(327, 1324)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	370
+			    justify    	0
+			    label      	"Business Object Model")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"35B678080064"
+			width      	382
+			height     	180)
+		    (object CategoryView "Logical View::Analysis Model::Local Time Conversion" @31
+			location   	(1728, 1392)
+			label      	(object ItemLabel
+			    Parent_View 	@31
+			    location   	(1543, 1308)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	370
+			    justify    	0
+			    label      	"Local Time Conversion")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"40B1D43200B7"
+			width      	382
+			height     	180)
+		    (object CategoryView "Logical View::Analysis Model::System Time Management" @32
+			location   	(1040, 1392)
+			label      	(object ItemLabel
+			    Parent_View 	@32
+			    location   	(855, 1308)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	370
+			    justify    	0
+			    label      	"System Time Management")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"40B1D49203C5"
+			width      	382
+			height     	180)))))
+    root_subsystem 	(object SubSystem "Component View"
+	quid       	"34DBB4830143"
+	documentation 	
+|In Rational Unified Process the  "Component View in Rose" is used to organize the implemetation model. 
+|
+|The Implementaition View in Rational Unified Process
+|
+|
+	
+	physical_models 	(list unit_reference_list
+	    (object SubSystem "Implementation Model"
+		quid       	"35B67C9A0348"
+		documentation 	
+|The Implementation Model in Rational Unified Process is a collection of components, and the implementation subsystems that contain them.
+|
+|An architectural view that describes one or several system configurations; the mapping of software components (tasks, modules) to the computing nodes in these configurations.
+|
+|Defines, executables, dll's, files, subsystems, compilation order etc.
+|
+|Rational Unified Process:
+|Activity: Define the Organization of Subsystems
+|
+|These diagram will be presented in the  Implementation  View section in the document generated using the SoDA Software Architecture Document.
+|
+|It is recommended that, in most cases, the mapping should be
+|1:1 between design and implementation, that is, for each package in design there is one subsystem in the implementation model.
+|
+		
+		physical_models 	(list unit_reference_list)
+		physical_presentations 	(list unit_reference_list
+		    (object Module_Diagram "Implementation Model Structure"
+			quid       	"34DBB487006E"
+			title      	"Implementation Model Structure"
+			documentation 	"This diagram presents the organization of the Implementation Model."
+			zoom       	100
+			max_height 	28350
+			max_width  	21600
+			origin_x   	0
+			origin_y   	0
+			items      	(list diagram_item_list
+			    (object NoteView @33
+				location   	(624, 160)
+				label      	(object ItemLabel
+				    Parent_View 	@33
+				    location   	(21, 26)
+				    fill_color 	13434879
+				    nlines     	5
+				    max_width  	1170
+				    label      	
+|
+|RationalUnified Process:
+|Activity: Structure the implementation model
+|Step: Create the Initial Implementation Model Structure
+				    )
+				line_color 	3342489
+				fill_color 	13434879
+				width      	1230
+				height     	281)))))
+	    (object SubSystem "Components Analysis"
+		is_unit    	TRUE
+		is_loaded  	FALSE
+		file_name  	"M:\\DST\\analysis\\Components.sub"
+		quid       	"40D969B300E0"))
+	physical_presentations 	(list unit_reference_list
+	    (object Module_Diagram "Main"
+		quid       	"35C6339B029E"
+		title      	"Main"
+		documentation 	"This diagram, required by Rose, simply provides a way of navigating to the Implementation Model."
+		zoom       	100
+		max_height 	28350
+		max_width  	21600
+		origin_x   	0
+		origin_y   	0
+		items      	(list diagram_item_list
+		    (object SubSysView "Component View::Implementation Model" @34
+			location   	(736, 800)
+			label      	(object ItemLabel
+			    Parent_View 	@34
+			    location   	(552, 713)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	368
+			    justify    	0
+			    label      	"Implementation Model")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"35B67C9A0348"
+			width      	381
+			height     	187)
+		    (object SubSysView "Component View::Components Analysis" @35
+			location   	(1408, 1392)
+			label      	(object ItemLabel
+			    Parent_View 	@35
+			    location   	(1264, 1323)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	288
+			    justify    	0
+			    label      	"Components Analysis")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"40D969B300E0"
+			width      	300
+			height     	150)))))
+    process_structure 	(object Processes
+	quid       	"34DBB4830144"
+	ProcsNDevs 	(list
+	    (object Processor "<processor name>"
+		quid       	"34DBBD4300B4"
+		documentation 	"This node provides <enter a short description here of the functionality and capability of the node>."
+		connections 	(list connection_list
+		    (object Connection_Relationship
+			quid       	"34DBBD4B008C"
+			supplier   	"<device name>"
+			quidu      	"34DBBD47019A"
+			supplier_is_device 	TRUE))
+		characteristics 	""
+		scheduling 	"Preemptive"
+		processes  	(list processes
+		    (object Process "<process name>"
+			quid       	"35DB411001D6"
+			documentation 	"This process corresponds to the process with the same name in the Logical View::Process Model."
+			stereotype 	"process"
+			priority   	"")
+		    (object Process "<thread name>"
+			quid       	"35DB41720348"
+			documentation 	"This process corresponds to the thread with the same name in the Logical View::Process Model."
+			stereotype 	"thread"
+			priority   	"")))
+	    (object Device "<device name>"
+		quid       	"34DBBD47019A"
+		documentation 	"This device provides <enter a short description of the capability the device provides> for the system."
+		characteristics 	"")
+	    (object Process_Diagram "Deployment View"
+		quid       	"34DBB4830146"
+		title      	"Deployment View"
+		documentation 	
+|The Deployment View in Rational Unified Process
+|
+|Defines the typical physical network configurations, including those typically used by end users, as well as special configurations used for development and test.
+|
+|See Rational Unified Process:
+|Activity: Describe Distribution
+|
+|This diagram will be a part of  the SoDA template-generated Software Architecture Document under the "Deployment  View" .
+		
+		zoom       	100
+		max_height 	28350
+		max_width  	21600
+		origin_x   	0
+		origin_y   	0
+		items      	(list diagram_item_list
+		    (object ProcessorView "<processor name>" @36
+			location   	(512, 1056)
+			label      	(object ItemLabel
+			    Parent_View 	@36
+			    location   	(276, 900)
+			    nlines     	2
+			    max_width  	400
+			    justify    	0
+			    label      	"<processor name>")
+			icon_style 	"Label"
+			quidu      	"34DBBD4300B4"
+			width      	475
+			height     	381
+			annotation 	3)
+		    (object DeviceView "<device name>" @37
+			location   	(1040, 1056)
+			label      	(object ItemLabel
+			    Parent_View 	@37
+			    location   	(867, 950)
+			    nlines     	2
+			    max_width  	275
+			    justify    	0
+			    label      	"<device name>")
+			icon_style 	"Icon"
+			quidu      	"34DBBD47019A"
+			width      	350
+			height     	282
+			annotation 	0)
+		    (object ConnectionView "" @38
+			stereotype 	TRUE
+			quidu      	"34DBBD4B008C"
+			client     	@36
+			supplier   	@37
+			line_style 	0)
+		    (object NoteView @39
+			location   	(816, 304)
+			label      	(object ItemLabel
+			    Parent_View 	@39
+			    location   	(38, 29)
+			    fill_color 	13434879
+			    nlines     	11
+			    max_width  	1521
+			    label      	
+|This Diagram defines the typical physical network configurations, including those typically used by end users, as well as special configurations used for development and test.
+|
+|· Allocate processes to the various nodes. Allocation takes into account the capacity of the nodes (in terms of
+|both memory and processing), bandwidth of the communication medium (bus, LANs, WANs), and the
+|availability of the hardware and communication links, rerouting, and so on.
+|
+|See, Rational Unified Process:
+|Activity: Describe Distribution
+			    )
+			line_color 	3342489
+			fill_color 	13434879
+			width      	1581
+			height     	563)))))
+    properties 	(object Properties
+	attributes 	(list Attribute_Set
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"propertyId"
+		value      	"783606378")
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"CreatableSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"Private"
+				value      	221)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"PublicNotCreatable"
+				value      	213)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"SingleUse"
+				value      	214)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"GlobalSingleUse"
+				value      	215)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"MultiUse"
+				value      	219)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"GlobalMultiUse"
+				value      	220)))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"OptionBase"
+			value      	("BaseSet" 222))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"OptionExplicit"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"OptionCompare"
+			value      	("CompareSet" 202))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"Creatable"
+			value      	("CreatableSet" 221))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateInitialization"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateTermination"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"CollectionClass"
+			value      	"Collection")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"CompareSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"(none)"
+				value      	202)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"Binary"
+				value      	203)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"Text"
+				value      	204)))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"UpdateCode"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"UpdateModel"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"InstancingSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"Private"
+				value      	221)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"PublicNotCreatable"
+				value      	213)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"SingleUse"
+				value      	214)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"GlobalSingleUse"
+				value      	215)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"MultiUse"
+				value      	219)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"GlobalMultiUse"
+				value      	220)))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"BaseSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"(none)"
+				value      	222)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"0"
+				value      	223)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"1"
+				value      	224)))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"Instancing"
+			value      	("InstancingSet" 221))))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"OperationName"
+			value      	"$operation")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"LibraryName"
+			value      	"")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"AliasName"
+			value      	"")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"IsStatic"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"EntryCode"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ExitCode"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ReplaceExistingBody"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"DefaultBody"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"IsConst"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"New"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"WithEvents"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"Subscript"
+			value      	"")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"NameIfUnlabeled"
+			value      	"the$supplier")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateGetOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateSetOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateLetOperation"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"New"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"WithEvents"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"Subscript"
+			value      	"")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"NameIfUnlabeled"
+			value      	"the$supplier")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateGetOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateSetOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateLetOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"UpdateCode"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"FullName"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Inherit"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ImplementsDelegation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"FullName"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ProjectFile"
+			value      	"")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"UpdateCode"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"UpdateModel"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ImportReferences"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"QuickImport"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"VisualStudio"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Repository"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"SCC"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"propertyId"
+		value      	"360000002")
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"DDLScriptFilename"
+			value      	"DDL1.SQL")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"DropClause"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"PrimaryKeyColumnName"
+			value      	"_ID")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"PrimaryKeyColumnType"
+			value      	"NUMBER(5,0)")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"SchemaNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"SchemaNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TableNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TableNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TypeNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TypeNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"ViewNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"ViewNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"VarrayNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"VarrayNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"NestedTableNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"NestedTableNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"ObjectTableNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"ObjectTableNameSuffix"
+			value      	"")))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsSchema"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"OID"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"WhereClause"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CheckConstraint"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CollectionTypeLength"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CollectionTypePrecision"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CollectionTypeScale"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CollectionOfREFS"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"MethodKind"
+			value      	("MethodKindSet" 1903))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"OverloadID"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"OrderNumber"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsReadNoDataState"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsReadNoProcessState"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsWriteNoDataState"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsWriteNoProcessState"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsSelfish"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerType"
+			value      	("TriggerTypeSet" 1801))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerEvent"
+			value      	("TriggerEventSet" 1601))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerText"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerReferencingNames"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerForEach"
+			value      	("TriggerForEachSet" 1701))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerWhenClause"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"MethodKindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"MapMethod"
+				value      	1901)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"OrderMethod"
+				value      	1902)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Function"
+				value      	1903)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Procedure"
+				value      	1904)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Operator"
+				value      	1905)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Constructor"
+				value      	1906)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Destructor"
+				value      	1907)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Trigger"
+				value      	1908)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Calculated"
+				value      	1909)))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"AFTER"
+				value      	1801)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"BEFORE"
+				value      	1802)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"INSTEAD OF"
+				value      	1803)))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerForEachSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"ROW"
+				value      	1701)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"STATEMENT"
+				value      	1702)))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerEventSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"INSERT"
+				value      	1601)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"UPDATE"
+				value      	1602)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"DELETE"
+				value      	1603)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"INSERT OR UPDATE"
+				value      	1604)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"INSERT OR DELETE"
+				value      	1605)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"UPDATE OR DELETE"
+				value      	1606)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"INSERT OR UPDATE OR DELETE"
+				value      	1607)))))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"OrderNumber"
+			value      	"")))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"OrderNumber"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsUnique"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"NullsAllowed"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"Length"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"Precision"
+			value      	"2")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"Scale"
+			value      	"6")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsIndex"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsPrimaryKey"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CompositeUnique"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CheckConstraint"
+			value      	"")))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"cg"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"UseMSVC"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileExtension"
+			value      	"h")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileBackupExtension"
+			value      	"h~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileTemporaryExtension"
+			value      	"h#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"PrecompiledHeader"
+			value      	"stdafx.h")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileExtension"
+			value      	"cpp")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileBackupExtension"
+			value      	"cp~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileTemporaryExtension"
+			value      	"cp#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StopOnError"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ErrorLimit"
+			value      	30)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Directory"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"PathSeparator"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FileNameFormat"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BooleanType"
+			value      	"int")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowTemplates"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowProtectedInheritance"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CommentWidth"
+			value      	60)
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByValueContainer"
+			value      	"$targetClass")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByValueContainer"
+			value      	"OptionalByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByValueContainer"
+			value      	"BoundedListByValue<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByValueContainer"
+			value      	"BoundedSetByValue<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByReferenceContainer"
+			value      	"BoundedListByReference<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByReferenceContainer"
+			value      	"BoundedSetByReference<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByValueContainer"
+			value      	"UnboundedListByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByValueContainer"
+			value      	"UnboundedSetByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByReferenceContainer"
+			value      	"UnboundedListByReference<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByReferenceContainer"
+			value      	"UnboundedSetByReference<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByValueContainer"
+			value      	"AssociationByValue<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByValueContainer"
+			value      	"DictionaryByValue<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByReferenceContainer"
+			value      	"AssociationByReference<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByReferenceContainer"
+			value      	"DictionaryByReference<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GeneratePreserveRegions"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowExplicitInstantiations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AlwaysKeepOrphanedCode"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowGenerateOverNewerAnnotations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowGenerateOverNewerVersion"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ImplementationType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ClassKey"
+			value      	"class")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegions"
+			value      	("GenerateEmptyRegionSet" 3))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegionSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Preserved"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unpreserved"
+				value      	2)
+			    (object Attribute
+				tool       	"cg"
+				name       	"All"
+				value      	3)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"PutBodiesInSpec"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDefaultConstructor"
+			value      	("GenerateSet" 206))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DefaultConstructorVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineDefaultConstructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ExplicitDefaultConstructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateCopyConstructor"
+			value      	("GenerateSet" 206))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CopyConstructorVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineCopyConstructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ExplicitCopyConstructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDestructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DestructorVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DestructorKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineDestructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAssignmentOperation"
+			value      	("GenerateSet" 206))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssignmentVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssignmentKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineAssignmentOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEqualityOperations"
+			value      	("GenerateSet" 206))
+		    (object Attribute
+			tool       	"cg"
+			name       	"EqualityVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"EqualityKind"
+			value      	("FriendKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineEqualityOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateRelationalOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"RelationalVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"RelationalKind"
+			value      	("FriendKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineRelationalOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateStorageMgmtOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StorageMgmtVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineStorageMgmtOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSubscriptOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"SubscriptVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"SubscriptKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"SubscriptResultType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineSubscriptOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDereferenceOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DereferenceVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DereferenceKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DereferenceResultType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineDereferenceOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateIndirectionOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IndirectionVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IndirectionKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IndirectionResultType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineIndirectionOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateStreamOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StreamVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineStreamOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ThreeKindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"KindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"FriendKindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"DeclareAndDefine"
+				value      	199)
+			    (object Attribute
+				tool       	"cg"
+				name       	"DeclareOnly"
+				value      	205)
+			    (object Attribute
+				tool       	"cg"
+				name       	"DoNotDeclare"
+				value      	206)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"VisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"ConstValue"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDefaultSpecifier"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DefaultSpecifier"
+			value      	"")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegions"
+			value      	("GenerateEmptyRegionSet" 3))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegionSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Preserved"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unpreserved"
+				value      	2)
+			    (object Attribute
+				tool       	"cg"
+				name       	"All"
+				value      	3)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"FileName"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowExtensionlessFileName"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InclusionProtectionSymbol"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeFormat"
+			value      	(value Text 
+|// $package
+|#include "$file"
+|
+			))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeBySimpleName"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludePrecompiledHeader"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeOrder"
+			value      	"AMIR")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InliningStyle"
+			value      	("InliningStyleSet" 207))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InliningStyleSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"InClassDeclaration"
+				value      	208)
+			    (object Attribute
+				tool       	"cg"
+				name       	"FollowingClassDeclaration"
+				value      	207)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"TypesDefined"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeClosure"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Module-Body"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegions"
+			value      	("GenerateEmptyRegionSet" 3))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegionSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Preserved"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unpreserved"
+				value      	2)
+			    (object Attribute
+				tool       	"cg"
+				name       	"All"
+				value      	3)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"FileName"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowExtensionlessFileName"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeFormat"
+			value      	(value Text 
+|// $package
+|#include "$file"
+|
+			))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeBySimpleName"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludePrecompiledHeader"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeOrder"
+			value      	"AMIR")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InliningStyle"
+			value      	("InliningStyleSet" 207))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InliningStyleSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"InClassDeclaration"
+				value      	208)
+			    (object Attribute
+				tool       	"cg"
+				name       	"FollowingClassDeclaration"
+				value      	207)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"TypesDefined"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeClosure"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationKind"
+			value      	("OperationKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationKindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationIsConst"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationIsExplicit"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Inline"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"EntryCode"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"ExitCode"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegions"
+			value      	("GenerateEmptyRegionSet" 3))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegionSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Preserved"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unpreserved"
+				value      	2)
+			    (object Attribute
+				tool       	"cg"
+				name       	"All"
+				value      	3)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"BodyAnnotations"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationIsOneWay"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Context"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"Raises"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CCRegion"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAbstractBody"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Has"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"Ordered"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"NameIfUnlabeled"
+			value      	"the_$supplier")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibility"
+			value      	("DataMemberVisibilitySet" 14))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)
+			    (object Attribute
+				tool       	"cg"
+				name       	"AtRelationshipVisibility"
+				value      	210)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutability"
+			value      	("DataMemberMutabilitySet" 0))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutabilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unrestricted"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Mutable"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Const"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberIsVolatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberFieldSize"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InitialValue"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetName"
+			value      	"get_$relationship")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetName"
+			value      	"set_$relationship")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKinds"
+			value      	("GetSetKindsSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKindsSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"ContainerClass"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SelectorName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SelectorType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConst"
+			value      	("GetResultIsConstSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConstSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"False"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"True"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Same_As_Function"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetByReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ForwardReferenceOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateForwardReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedHasRelType"
+			value      	("HasRelTypeSet" 47))
+		    (object Attribute
+			tool       	"cg"
+			name       	"HasRelTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Array"
+				value      	24)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Sequence"
+				value      	47)))))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Association"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"NameIfUnlabeled"
+			value      	"the_$targetClass")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Inherit"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"InstanceArguments"
+			value      	"")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ForwardReferenceOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"NameIfUnlabeled"
+			value      	"the_$targetClass")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberName"
+			value      	"$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibility"
+			value      	("DataMemberVisibilitySet" 14))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)
+			    (object Attribute
+				tool       	"cg"
+				name       	"AtRelationshipVisibility"
+				value      	210)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutability"
+			value      	("DataMemberMutabilitySet" 0))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutabilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unrestricted"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Mutable"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Const"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberIsVolatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberFieldSize"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InitialValue"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"ContainerClass"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ContainerGet"
+			value      	"$data.get($keys)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ContainerSet"
+			value      	"$data.set($keys,$value)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedContainer"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassContainer"
+			value      	"$supplier *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassInitialValue"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKinds"
+			value      	("GetSetKindsSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKindsSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetByReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetName"
+			value      	"get_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConst"
+			value      	("GetResultIsConstSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConstSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"False"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"True"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Same_As_Function"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetName"
+			value      	"set_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetSetByReference"
+			value      	("QualifiedGetSetByReferenceSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetSetByReferenceSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"False"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"True"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Same_As_GetSetByReference"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateQualifiedGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetName"
+			value      	"get_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetResultIsConst"
+			value      	("GetResultIsConstSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineQualifiedGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateQualifiedSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedSetName"
+			value      	"set_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedSetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineQualifiedSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAssocClassDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassDataMemberName"
+			value      	"$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassDataMemberVisibility"
+			value      	("DataMemberVisibilitySet" 14))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)
+			    (object Attribute
+				tool       	"cg"
+				name       	"AtRelationshipVisibility"
+				value      	210)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassDataMemberMutability"
+			value      	("DataMemberMutabilitySet" 0))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutabilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unrestricted"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Mutable"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Const"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassDataMemberIsVolatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassGetSetKinds"
+			value      	("GetSetKindsSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAssocClassGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassGetName"
+			value      	"get_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassGetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassGetResultIsConst"
+			value      	("GetResultIsConstSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineAssocClassGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAssocClassSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassSetName"
+			value      	"set_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassSetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineAssocClassSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassForwardReferenceOnly"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateForwardReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedRoleType"
+			value      	("AssocTypeSet" 47))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Array"
+				value      	24)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Sequence"
+				value      	47)))))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberName"
+			value      	"$attribute")
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibility"
+			value      	("DataMemberVisibilitySet" 14))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)
+			    (object Attribute
+				tool       	"cg"
+				name       	"AtAttributeVisibility"
+				value      	211)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutability"
+			value      	("DataMemberMutabilitySet" 0))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutabilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unrestricted"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Mutable"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Const"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberIsVolatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberFieldSize"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetName"
+			value      	"get_$attribute")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetName"
+			value      	"set_$attribute")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKinds"
+			value      	("GetSetKindsSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKindsSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConst"
+			value      	("GetResultIsConstSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConstSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"False"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"True"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Same_As_Function"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetByReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CaseSpecifier"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CCRegion"
+			value      	"")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Uses"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"ForwardReferenceOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"BodyReferenceOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateForwardReference"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Subsystem"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"Directory"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"DirectoryIsOnSearchList"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"PrecompiledHeader"
+			value      	"stdafx.h")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Category"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"IsNamespace"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"Indent"
+			value      	2)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegions"
+			value      	("GenerateEmptyRegionSet" 3))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegionSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Preserved"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unpreserved"
+				value      	2)
+			    (object Attribute
+				tool       	"cg"
+				name       	"All"
+				value      	3)))))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Version"
+			value      	"5.0")))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Type"
+			value      	("MSVCClassTypeSet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSVCClassTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Normal"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Interface_Part"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Connection_Part"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Class_Factory"
+				value      	3)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CObjectFunctionality"
+			value      	("CObjectFunctionalitySet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CObjectFunctionalitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dynamic"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dyncreate"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Serial"
+				value      	3)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateOverrideGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateDataGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DATA_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateFieldGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_FIELD_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateMessageGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateMessageMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_MSG_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MESSAGE_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLEFactory"
+			value      	("OLEFactorySet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLEFactorySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Built_in"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Simple"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Licensed"
+				value      	3)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLEName"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLEClassID"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateOLECtlType"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLECtlType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateOLETypeLib"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLETypeLibID"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLETypeLibMajor"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLETypeLibMinor"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GeneratePropPageIDs"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLEPropPageIDs"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateDispatchMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockProperties"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockFunctions"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DispatchDefValue"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateDispIdEnum"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISP_ID_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateInterfaceMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"INTERFACE_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"InitInterface"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateEventMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENT_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENT_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"EVENT_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockEvents"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateEventSinkMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENTSINK_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENTSINK_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"EVENTSINK_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"PropNotifySinks"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateConnectionMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CONNECTION_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"ConnectionPointIID"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"InheritanceType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DeclSpec"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLECommands"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MFCDeclares"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"ATL_Declares"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateCOMMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"COM_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateConnectionPointMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CONNECTION_POINT_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateMsgMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSG_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GeneratePropertyMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"PROPERTY_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MFCImplements"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Type"
+			value      	("MSVCOperationTypeSet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSVCOperationTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Normal"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Virtual_Override"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Message_Handler"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dispatch_Handler"
+				value      	3)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Event_Firing_Function"
+				value      	4)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Event_Sink_Handler"
+				value      	5)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Std_OLE_Method"
+				value      	6)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Command_Parser"
+				value      	7)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Property_Get_Function"
+				value      	8)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Property_Set_Function"
+				value      	9)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Property_Notify_Function"
+				value      	10)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Macro_Generated_Function"
+				value      	11)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_MSG_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MESSAGE_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENT_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"EVENT_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENTSINK_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"EVENTSINK_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CallType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DeclSpec"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"BodyImage"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Type"
+			value      	("MSVCAttributeTypeSet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSVCAttributeTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Normal"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Member_Property"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Get_Set_Property"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dialog_Data"
+				value      	3)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Field_Data"
+				value      	4)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Stock_Property"
+				value      	5)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DeclSpec"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"PointerBase"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CallType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockPropertyImplementation"
+			value      	"")))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Has"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Type"
+			value      	("MSVCAttributeTypeSet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSVCAttributeTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Normal"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Member_Property"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Get_Set_Property"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dialog_Data"
+				value      	3)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Field_Data"
+				value      	4)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Stock_Property"
+				value      	5)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DeclSpec"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"PointerBase"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CallType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockPropertyImplementation"
+			value      	"")))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Type"
+			value      	("MSVCAttributeTypeSet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSVCAttributeTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Normal"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Member_Property"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Get_Set_Property"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dialog_Data"
+				value      	3)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Field_Data"
+				value      	4)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Stock_Property"
+				value      	5)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DeclSpec"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"PointerBase"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CallType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockPropertyImplementation"
+			value      	"")))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateIncludesGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_INCLUDES_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateInsertLocation"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Module-Body"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateIncludesGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_INCLUDES_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateInsertLocation"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"DDL"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"DDL"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"DDL"
+			name       	"DataBase"
+			value      	("DataBaseSet" 800))
+		    (object Attribute
+			tool       	"DDL"
+			name       	"DataBaseSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"DDL"
+				name       	"ANSI"
+				value      	800)
+			    (object Attribute
+				tool       	"DDL"
+				name       	"Oracle"
+				value      	801)
+			    (object Attribute
+				tool       	"DDL"
+				name       	"SQLServer"
+				value      	802)
+			    (object Attribute
+				tool       	"DDL"
+				name       	"Sybase"
+				value      	803)
+			    (object Attribute
+				tool       	"DDL"
+				name       	"Watcom"
+				value      	804)))
+		    (object Attribute
+			tool       	"DDL"
+			name       	"PrimaryKeyColumnName"
+			value      	"Id")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"PrimaryKeyColumnType"
+			value      	"NUMBER(5)")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"ViewName"
+			value      	"V_")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"TableName"
+			value      	"T_")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"InheritSuffix"
+			value      	"_V")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"DropClause"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"BaseViews"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"DDLScriptFilename"
+			value      	"DDL1.SQL")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"Directory"
+			value      	"AUTO GENERATE")))
+	    (object Attribute
+		tool       	"DDL"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"DDL"
+			name       	"ColumnType"
+			value      	"VARCHAR")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"Length"
+			value      	"")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"NullsOK"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"PrimaryKey"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"Unique"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"CompositeUnique"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"CheckConstraint"
+			value      	"")))
+	    (object Attribute
+		tool       	"DDL"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"framework"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"IDL"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"StopOnError"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"Directory"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GeneratePreserveRegions"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"ImplementationType"
+			value      	"")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"ConstValue"
+			value      	"")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateDefaultSpecifier"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"DefaultSpecifier"
+			value      	"")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IDLElement"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IDLSpecificationType"
+			value      	("IDLSpecSet" 22))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IDLSpecSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Interface"
+				value      	22)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Typedef"
+				value      	54)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Enumeration"
+				value      	8)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Const"
+				value      	71)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Exception"
+				value      	61)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Struct"
+				value      	51)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Union"
+				value      	81)))))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"FileName"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateIDLModule"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"InclusionProtectionSymbol"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IncludeBySimpleName"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Module-Body"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"FileName"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IncludeBySimpleName"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"OperationIsOneWay"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"Context"
+			value      	"")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"Raises"
+			value      	"")))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CaseSpecifier"
+			value      	"")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IsConst"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"ConstValue"
+			value      	"")))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Has"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"NameIfUnlabeled"
+			value      	"the_$supplier")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateForwardReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"BoundedHasRelType"
+			value      	("HasRelTypeSet" 47))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"HasRelTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Array"
+				value      	24)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Sequence"
+				value      	47)))))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"NameIfUnlabeled"
+			value      	"the_$supplier")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateForwardReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"BoundedRoleType"
+			value      	("AssocTypeSet" 47))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"AssocTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Array"
+				value      	24)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Sequence"
+				value      	47)))))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Uses"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateForwardReference"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Subsystem"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"Directory"
+			value      	"AUTO GENERATE")))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Java"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"StopOnError"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Directory"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"Java"
+			name       	"UsePrefixes"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"InstanceVariablePrefix"
+			value      	"m_")
+		    (object Attribute
+			tool       	"Java"
+			name       	"ClassVariablePrefix"
+			value      	"s_")
+		    (object Attribute
+			tool       	"Java"
+			name       	"DefaultAttributeDataType"
+			value      	"int")
+		    (object Attribute
+			tool       	"Java"
+			name       	"DefaultOperationReturnType"
+			value      	"void")
+		    (object Attribute
+			tool       	"Java"
+			name       	"Editor"
+			value      	("EditorType" 100))
+		    (object Attribute
+			tool       	"Java"
+			name       	"VM"
+			value      	("VMType" 200))
+		    (object Attribute
+			tool       	"Java"
+			name       	"ClassPath"
+			value      	"")
+		    (object Attribute
+			tool       	"Java"
+			name       	"EditorType"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Java"
+				name       	"BuiltIn"
+				value      	100)
+			    (object Attribute
+				tool       	"Java"
+				name       	"WindowsShell"
+				value      	101)))
+		    (object Attribute
+			tool       	"Java"
+			name       	"VMType"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Java"
+				name       	"Sun"
+				value      	200)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Microsoft"
+				value      	201)))
+		    (object Attribute
+			tool       	"Java"
+			name       	"GlobalImports"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Java"
+			name       	"OpenBraceClassStyle"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"UseTabs"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"UseSpaces"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"SpacingItems"
+			value      	3)
+		    (object Attribute
+			tool       	"Java"
+			name       	"CommentLength"
+			value      	2)
+		    (object Attribute
+			tool       	"Java"
+			name       	"RoseDefaultCommentStyle"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"AsteriskCommentStyle"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavaCommentStyle"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocAuthor"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocDeprecated"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocException"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocParam"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocReturn"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocSee"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocSerial"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocSerialdata"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocSerialfield"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocSince"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocVersion"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocLink"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"Final"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateDefaultConstructor"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"ConstructorIs"
+			value      	("Ctor_Set" 62))
+		    (object Attribute
+			tool       	"Java"
+			name       	"Ctor_Set"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Java"
+				name       	"public"
+				value      	62)
+			    (object Attribute
+				tool       	"Java"
+				name       	"protected"
+				value      	63)
+			    (object Attribute
+				tool       	"Java"
+				name       	"private"
+				value      	64)
+			    (object Attribute
+				tool       	"Java"
+				name       	"package"
+				value      	65)))
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateFinalizer"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateStaticInitializer"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateInstanceInitializer"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Static"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"CmIdentification"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Java"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Java"
+			name       	"AdditionalImports"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Module-Body"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"CmIdentification"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Java"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Java"
+			name       	"AdditionalImports"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"Abstract"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Static"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Final"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Native"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Synchronized"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"DefaultBody"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Java"
+			name       	"ReplaceExistingBody"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Final"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Transient"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Volatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"PropertyType"
+			value      	("BeanProperty_Set" 71))
+		    (object Attribute
+			tool       	"Java"
+			name       	"BeanProperty_Set"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Java"
+				name       	"Not A Property"
+				value      	71)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Simple"
+				value      	72)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Bound"
+				value      	73)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Constrained"
+				value      	74)))
+		    (object Attribute
+			tool       	"Java"
+			name       	"IndividualChangeMgt"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Read/Write"
+			value      	("Read/Write_Set" 81))
+		    (object Attribute
+			tool       	"Java"
+			name       	"Read/Write_Set"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Java"
+				name       	"Read & Write"
+				value      	81)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Read Only"
+				value      	82)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Write Only"
+				value      	83)))
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateFullyQualifiedTypes"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"ContainerClass"
+			value      	"")
+		    (object Attribute
+			tool       	"Java"
+			name       	"InitialValue"
+			value      	"")
+		    (object Attribute
+			tool       	"Java"
+			name       	"Final"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Transient"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Volatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"PropertyType"
+			value      	("BeanProperty_Set" 71))
+		    (object Attribute
+			tool       	"Java"
+			name       	"BeanProperty_Set"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Java"
+				name       	"Not A Property"
+				value      	71)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Simple"
+				value      	72)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Bound"
+				value      	73)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Constrained"
+				value      	74)))
+		    (object Attribute
+			tool       	"Java"
+			name       	"IndividualChangeMgt"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Read/Write"
+			value      	("Read/Write_Set" 81))
+		    (object Attribute
+			tool       	"Java"
+			name       	"Read/Write_Set"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Java"
+				name       	"Read & Write"
+				value      	81)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Read Only"
+				value      	82)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Write Only"
+				value      	83)))))
+	    (object Attribute
+		tool       	"Java"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Objectory41"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"TypeLibImporter"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"ROBE"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"Editor"
+			value      	("EditorType" 100))
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"IncludePath"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"StopOnError"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"EditorType"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"CORBA"
+				name       	"BuiltIn"
+				value      	100)
+			    (object Attribute
+				tool       	"CORBA"
+				name       	"WindowsShell"
+				value      	101)))))
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"ArrayDimensions"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"ConstValue"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"ImplementationType"
+			value      	"")))
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"InclusionProtectionSymbol"
+			value      	"AUTO GENERATE")))
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"default__Module-Body"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"InclusionProtectionSymbol"
+			value      	"AUTO GENERATE")))
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"Context"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"OperationIsOneWay"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"ArrayDimensions"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"CaseSpecifier"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"Order"
+			value      	"")))
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"ArrayDimensions"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"CaseSpecifier"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"GenerateForwardReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"Order"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"BoundedRoleType"
+			value      	("AssocTypeSet" 47))
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"AssocTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"CORBA"
+				name       	"Array"
+				value      	24)
+			    (object Attribute
+				tool       	"CORBA"
+				name       	"Sequence"
+				value      	47)))))
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"default__Uses"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"GenerateForwardReference"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Rational Unified Process"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Rose Web Publisher"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"SoDA"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"COM"
+		name       	"propertyId"
+		value      	"783606378")
+	    (object Attribute
+		tool       	"COM"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"COM"
+			name       	"TypeKinds"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"COM"
+				name       	"enum"
+				value      	100)
+			    (object Attribute
+				tool       	"COM"
+				name       	"record"
+				value      	101)
+			    (object Attribute
+				tool       	"COM"
+				name       	"module"
+				value      	102)
+			    (object Attribute
+				tool       	"COM"
+				name       	"interface"
+				value      	103)
+			    (object Attribute
+				tool       	"COM"
+				name       	"dispinterface"
+				value      	104)
+			    (object Attribute
+				tool       	"COM"
+				name       	"coclass"
+				value      	105)
+			    (object Attribute
+				tool       	"COM"
+				name       	"alias"
+				value      	106)
+			    (object Attribute
+				tool       	"COM"
+				name       	"union"
+				value      	107)
+			    (object Attribute
+				tool       	"COM"
+				name       	"max"
+				value      	108)
+			    (object Attribute
+				tool       	"COM"
+				name       	"(none)"
+				value      	109)))
+		    (object Attribute
+			tool       	"COM"
+			name       	"kind"
+			value      	("TypeKinds" 105))
+		    (object Attribute
+			tool       	"COM"
+			name       	"uuid"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"version"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"helpstring"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"helpcontext"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"attributes"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"dllname"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"alias"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"Generate"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"COM"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"COM"
+			name       	"helpstring"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"attributes"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"COM"
+			name       	"id"
+			value      	"")))
+	    (object Attribute
+		tool       	"COM"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"COM"
+			name       	"filename"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"library"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"imports"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"uuid"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"version"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"helpstring"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"helpfile"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"helpcontext"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"lcid"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"attributes"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"Generate"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"COM"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Version Control"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Data Access"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"Data Access"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Data Access"
+			name       	"project"
+			value      	" ")))
+	    (object Attribute
+		tool       	"Data Access"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"RequisitePro"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"cg"
+		name       	"compiler2.1__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowGenerateOverNewerAnnotations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowGenerateOverNewerVersion"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileExtension"
+			value      	"h")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileBackupExtension"
+			value      	"h~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileTemporaryExtension"
+			value      	"h#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileExtension"
+			value      	"cpp")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileBackupExtension"
+			value      	"cp~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileTemporaryExtension"
+			value      	"cp#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StopOnError"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ErrorLimit"
+			value      	30)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Directory"
+			value      	"$ROSECPP_SOURCE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BooleanType"
+			value      	"int")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowTemplates"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowExplicitInstantiations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowProtectedInheritance"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByValueContainer"
+			value      	"$targetClass")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByValueContainer"
+			value      	"OptionalByValue(sizeof($targetClass))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByValueContainer"
+			value      	"BoundedListByValue(sizeof($targetClass),$limit)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByValueContainer"
+			value      	"BoundedSetByValue(sizeof($targetClass),$limit)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByReferenceContainer"
+			value      	"BoundedListByReference($limit)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByReferenceContainer"
+			value      	"BoundedSetByReference($limit)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByValueContainer"
+			value      	"UnboundedListByValue(sizeof($targetClass))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByValueContainer"
+			value      	"UnboundedSetByValue(sizeof($targetClass))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByReferenceContainer"
+			value      	"UnboundedListByReference")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByReferenceContainer"
+			value      	"UnboundedSetByReference")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByValueContainer"
+			value      	"AssociationByValue(sizeof($qualtype), sizeof($qualcont))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByValueContainer"
+			value      	"DictionaryByValue(sizeof($qualtype), sizeof($qualcont))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByReferenceContainer"
+			value      	"AssociationByReference(sizeof($qualtype), sizeof($qualcont))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByReferenceContainer"
+			value      	"DictionaryByReference(sizeof($qualtype), sizeof($qualcont))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"PathSeparator"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FileNameFormat"
+			value      	"128vx_b")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AlwaysKeepOrphanedCode"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"UseMSVC"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CommentWidth"
+			value      	60)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"compiler3.0__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowGenerateOverNewerAnnotations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowGenerateOverNewerVersion"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileExtension"
+			value      	"h")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileBackupExtension"
+			value      	"h~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileTemporaryExtension"
+			value      	"h#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileExtension"
+			value      	"cpp")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileBackupExtension"
+			value      	"cp~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileTemporaryExtension"
+			value      	"cp#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StopOnError"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ErrorLimit"
+			value      	30)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Directory"
+			value      	"$ROSECPP_SOURCE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BooleanType"
+			value      	"int")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowTemplates"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowExplicitInstantiations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowProtectedInheritance"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByValueContainer"
+			value      	"$targetClass")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByValueContainer"
+			value      	"OptionalByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByValueContainer"
+			value      	"BoundedListByValue<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByValueContainer"
+			value      	"BoundedSetByValue<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByReferenceContainer"
+			value      	"BoundedListByReference<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByReferenceContainer"
+			value      	"BoundedSetByReference<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByValueContainer"
+			value      	"UnboundedListByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByValueContainer"
+			value      	"UnboundedSetByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByReferenceContainer"
+			value      	"UnboundedListByReference<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByReferenceContainer"
+			value      	"UnboundedSetByReference<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByValueContainer"
+			value      	"AssociationByValue<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByValueContainer"
+			value      	"DictionaryByValue<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByReferenceContainer"
+			value      	"AssociationByReference<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByReferenceContainer"
+			value      	"DictionaryByReference<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"PathSeparator"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FileNameFormat"
+			value      	"128vx_b")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AlwaysKeepOrphanedCode"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"UseMSVC"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CommentWidth"
+			value      	60)))
+	    (object Attribute
+		tool       	"Rose Model Integrator"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"COM"
+		name       	"default__Param"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"COM"
+			name       	"attributes"
+			value      	"")))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Param"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ByVal"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ByRef"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"Optional"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ParamArray"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"COM"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"COM"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"COM"
+			name       	"id"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"helpstring"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"attributes"
+			value      	"")))
+	    (object Attribute
+		tool       	"VC++"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"VC++"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"VC++"
+			name       	"UpdateATL"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"SmartPointersOnAssoc"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"GenerateImports"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"PutImportsIn"
+			value      	"stdafx.h")
+		    (object Attribute
+			tool       	"VC++"
+			name       	"FullPathInImports"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"UseImportAttributes"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"ImportAttributes"
+			value      	"no_namespace named_guids")
+		    (object Attribute
+			tool       	"VC++"
+			name       	"ImportProjTypeLib"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"DefaultTypeLib"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"TypeLibLocation"
+			value      	"")
+		    (object Attribute
+			tool       	"VC++"
+			name       	"CompileProjTypeLib"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"RvcPtyVersion"
+			value      	"1.0")
+		    (object Attribute
+			tool       	"VC++"
+			name       	"ModelIDStyle"
+			value      	2)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"DocStyle"
+			value      	1)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"GenerateIncludes"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"ApplyPattern"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"CreateBackupFiles"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"SupportCodeName"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"DocRevEngineer"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"CreateOverviewDiagrams"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"UpdateModelIDsInCode"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"AttributeTypes"
+			value      	(value Text 
+|attr1=bool
+|attr2=short
+|attr3=int
+|attr4=long
+|attr5=char
+|attr6=float
+|attr7=double
+|attr8=void
+|attr9=clock_t
+|attr10=_complex
+|attr11=_dev_t
+|attr12=div_t
+|attr13=_exception
+|attr14=FILE
+|attr15=_finddata_t
+|attr16=_FPIEEE_RECORD
+|attr17=fpos_t
+|attr18=_HEAPINFO
+|attr19=jmp_buf
+|attr20=lconv
+|attr21=ldiv_t
+|attr22=_off_t
+|attr23=_onexit_t
+|attr24=_PNH
+|attr25=ptrdiff_t
+|attr26=sig_atomic_t
+|attr27=size_t
+|attr28=_stat
+|attr29=time_t
+|attr30=_timeb
+|attr31=tm
+|attr32=_utimbuf
+|attr33=va_list
+|attr34=wchar_t
+|attr35=wctrans_t
+|attr36=wctype_t
+|attr37=_wfinddata_t
+|attr38=_wfinddatai64_t
+|attr39=wint_t
+|attr40=ABORTPROC
+|attr41=ACMDRIVERENUMCB
+|attr42=ACMDRIVERPROC
+|attr43=ACMFILTERCHOOSEHOOKPROC
+|attr44=ACMFILTERENUMCB
+|attr45=ACMFILTERTAGENUMCB
+|attr46=ACMFORMATCHOOSEHOOKPROC
+|attr47=ACMFORMATENUMCB
+|attr48=ACMFORMATTAGENUMCB
+|attr49=APPLET_PROC
+|attr50=ATOM
+|attr51=BOOL
+|attr52=BOOLEAN
+|attr53=BYTE
+|attr54=CALINFO_ENUMPROC
+|attr55=CALLBACK
+|attr56=CHAR
+|attr57=COLORREF
+|attr58=CONST
+|attr59=CRITICAL_SECTION
+|attr60=CTRYID
+|attr61=DATEFMT_ENUMPROC
+|attr62=DESKTOPENUMPROC
+|attr63=DLGPROC
+|attr64=DRAWSTATEPROC
+|attr65=DWORD
+|attr66=EDITWORDBREAKPROC
+|attr67=ENHMFENUMPROC
+|attr68=ENUMRESLANGPROC
+|attr69=ENUMRESNAMEPROC
+|attr70=ENUMRESTYPEPROC
+|attr71=FARPROC
+|attr72=FILE_SEGMENT_ELEMENT
+|attr73=FLOAT
+|attr74=FONTENUMPROC
+|attr75=GOBJENUMPROC
+|attr76=GRAYSTRINGPROC
+|attr77=HACCEL
+|attr78=HANDLE
+|attr79=HBITMAP
+|attr80=HBRUSH
+|attr81=HCOLORSPACE
+|attr82=HCONV
+|attr83=HCONVLIST
+|attr84=HCURSOR
+|attr85=HDC
+|attr86=HDDEDATA
+|attr87=HDESK
+|attr88=HDROP
+|attr89=HDWP
+|attr90=HENHMETAFILE
+|attr91=HFILE
+|attr92=HFONT
+|attr93=HGDIOBJ
+|attr94=HGLOBAL
+|attr95=HHOOK
+|attr96=HICON
+|attr97=HIMAGELIST
+|attr98=HIMC
+|attr99=HINSTANCE
+|attr100=HKEY
+|attr101=HKL
+|attr102=HLOCAL
+|attr103=HMENU
+|attr104=HMETAFILE
+|attr105=HMODULE
+|attr106=HMONITOR
+|attr107=HOOKPROC
+|attr108=HPALETTE
+|attr109=HPEN
+|attr110=HRGN
+|attr111=HRSRC
+|attr112=HSZ
+|attr113=HTREEITEM
+|attr114=HWINSTA
+|attr115=HWND
+|attr116=INT
+|attr117=IPADDR
+|attr118=LANGID
+|attr119=LCID
+|attr120=LCSCSTYPE
+|attr121=LCSGAMUTMATCH
+|attr122=LCTYPE
+|attr123=LINEDDAPROC
+|attr124=LOCALE_ENUMPROC
+|attr125=LONG
+|attr126=LONGLONG
+|attr127=LPARAM
+|attr128=LPBOOL
+|attr129=LPBYTE
+|attr130=LPCCHOOKPROC
+|attr131=LPCFHOOKPROC
+|attr132=LPCOLORREF
+|attr133=LPCRITICAL_SECTION
+|attr134=LPCSTR
+|attr135=LPCTSTR
+|attr136=LPCVOID
+|attr137=LPCWSTR
+|attr138=LPDWORD
+|attr139=LPFIBER_START_ROUTINE
+|attr140=LPFRHOOKPROC
+|attr141=LPHANDLE
+|attr142=LPHANDLER_FUNCTION
+|attr143=LPINT
+|attr144=LPLONG
+|attr145=LPOFNHOOKPROC
+|attr146=LPPAGEPAINTHOOK
+|attr147=LPPAGESETUPHOOK
+|attr148=LPPRINTHOOKPROC
+|attr149=LPPROGRESS_ROUTINE
+|attr150=LPSETUPHOOKPROC
+|attr151=LPSTR
+|attr152=LPSTREAM
+|attr153=LPTHREAD_START_ROUTINE
+|attr154=LPTSTR
+|attr155=LPVOID
+|attr156=LPWORD
+|attr157=LPWSTR
+|attr158=LRESULT
+|attr159=LUID
+|attr160=PBOOL
+|attr161=PBOOLEAN
+|attr162=PBYTE
+|attr163=PCHAR
+|attr164=PCRITICAL_SECTION
+|attr165=PCSTR
+|attr166=PCTSTR
+|attr167=PCWCH
+|attr168=PCWSTR
+|attr169=PDWORD
+|attr170=PFLOAT
+|attr171=PFNCALLBACK
+|attr172=PHANDLE
+|attr173=PHANDLER_ROUTINE
+|attr174=PHKEY
+|attr175=PINT
+|attr176=PLCID
+|attr177=PLONG
+|attr178=PLUID
+|attr179=PROPENUMPROC
+|attr180=PROPENUMPROCEX
+|attr181=PSHORT
+|attr182=PSTR
+|attr183=PTBYTE
+|attr184=PTCHAR
+|attr185=PTIMERAPCROUTINE
+|attr186=PTSTR
+|attr187=PUCHAR
+|attr188=PUINT
+|attr189=PULONG
+|attr190=PUSHORT
+|attr191=PVOID
+|attr192=PWCHAR
+|attr193=PWORD
+|attr194=PWSTR
+|attr195=REGISTERWORDENUMPROC
+|attr196=REGSAM
+|attr197=SC_HANDLE
+|attr198=SC_LOCK
+|attr199=SENDASYNCPROC
+|attr200=SERVICE_STATUS_HANDLE
+|attr201=SHORT
+|attr202=TBYTE
+|attr203=TCHAR
+|attr204=TIMEFMT_ENUMPROC
+|attr205=TIMERPROC
+|attr206=UCHAR
+|attr207=UINT
+|attr208=ULONG
+|attr209=ULONGLONG
+|attr210=UNSIGNED
+|attr211=USHORT
+|attr212=VOID
+|attr213=WCHAR
+|attr214=WINAPI
+|attr215=WINSTAENUMPROC
+|attr216=WNDENUMPROC
+|attr217=WNDPROC
+|attr218=WORD
+|attr219=WPARAM
+|attr220=YIELDPROC
+|attr221=CPoint
+|attr222=CRect
+|attr223=CSize
+|attr224=CString
+|attr225=CTime
+|attr226=CTimeSpan
+|attr227=CCreateContext
+|attr228=CMemoryState
+|attr229=COleSafeArray
+|attr230=CPrintInfo
+			))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Containers"
+			value      	(value Text 
+|cont1=CArray<$TYPE, $TYPE&>
+|cont2=CByteArray
+|cont3=CDWordArray
+|cont4=CObArray
+|cont5=CPtrArray
+|cont6=CStringArray
+|cont7=CUIntArray
+|cont8=CWordArray
+|cont9=CList<$TYPE, $TYPE&>
+|cont10=CPtrList
+|cont11=CObList
+|cont12=CStringList
+|cont13=CMapWordToPtr
+|cont14=CMapPtrToWord
+|cont15=CMapPtrToPtr
+|cont16=CMapWordToOb
+|cont17=CMapStringToPtr
+|cont18=CMapStringToOb
+|cont19=CMapStringToString
+|cont20=CTypedPtrArray<CPtrArray, $TYPE*>
+|cont21=CTypedPtrArray<CObArray, $TYPE*>
+|cont22=CTypedPtrList<CObList, $TYPE*>
+|cont23=CTypedPtrList<CPtrList, $TYPE*>
+			))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"ClassMethods"
+			value      	(value Text 
+|*_body=// ToDo: Add your specialized code here and/or call the base class
+|cm1=$NAME()
+|cm2=$NAME(orig:const $NAME&)
+|cm3=<<virtual>> ~$NAME()
+|cm4=operator=(rhs:$NAME&):$NAME&
+|cm4_body=// ToDo: Add your specialized code here and/or call the base class||return rhs;
+|cm5=<<const>> operator==(rhs:const $NAME&):bool
+|cm5_body=// ToDo: Add your specialized code here and/or call the base class||return false;
+|cm6=<<const>> operator!=(rhs:$NAME&):bool
+|cm6_body=// ToDo: Add your specialized code here and/or call the base class||return false;
+|cm7=<<const>> operator<(rhs:$NAME&):bool
+|cm7_body=// ToDo: Add your specialized code here and/or call the base class||return false;
+|cm8=<<const>> operator>(rhs:$NAME&):bool
+|cm8_body=// ToDo: Add your specialized code here and/or call the base class||return false;
+|cm9=<<const>> operator<=(rhs:$NAME&):bool
+|cm9_body=// ToDo: Add your specialized code here and/or call the base class||return false;
+|cm10=<<const>> operator>=(rhs:$NAME&):bool
+|cm10_body=// ToDo: Add your specialized code here and/or call the base class||return false;
+|cm11=<<friend>> operator>>(i:istream&, rhs:$NAME&):istream&
+|cm11_body=// ToDo: Add your specialized code here and/or call the base class||return i;
+|cm12=<<friend>> operator<<(o:ostream&, rhs:const $NAME&):ostream&
+|cm12_body=// ToDo: Add your specialized code here and/or call the base class||return o;
+			))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Accessors"
+			value      	(value Text 
+|agf=<<const>> get_$BASICNAME():const $TYPE
+|agf_body=return $NAME;
+|asf=set_$BASICNAME(value:$TYPE):void
+|asf_body=$NAME = value;|return;
+|agv=<<const>> get_$BASICNAME():const $TYPE&
+|agv_body=return $NAME;
+|asv=set_$BASICNAME(value:$TYPE&):void
+|asv_body=$NAME = value;|return;
+|agp=<<const>> get_$BASICNAME():const $TYPE
+|agp_body=return $NAME;
+|asp=set_$BASICNAME(value:$TYPE):void
+|asp_body=$NAME = value;|return;
+|agr=<<const>> get_$BASICNAME():const $TYPE
+|agr_body=return $NAME;
+|asr=set_$BASICNAME(value:$TYPE):void
+|asr_body=$NAME = value;|return;
+|aga=<<const>> get_$BASICNAME(index:int):const $TYPE
+|aga_body=return $NAME[index];
+|asa=set_$BASICNAME(index:int, value:$TYPE):void
+|asa_body=$NAME[index] = value;|return;
+			))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Conditionals"
+			value      	(value Text 
+|*_decl=#ifdef _DEBUG
+|*_base=CObject
+|cond1=<<virtual, const>> AssertValid():void
+|cond1_body=$SUPERNAME::AssertValid();
+|cond2=<<virtual, const>> Dump(dc:CDumpContext&):void
+|cond2_body=$SUPERNAME::Dump(dc);
+			))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Patterns"
+			value      	(value Text 
+|patrn1=cm1,cm3,cond1,cond2
+|Patrn1_name=Default
+			))))
+	    (object Attribute
+		tool       	"VC++"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Generate"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"VC++"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"VC++"
+			name       	"InternalMap"
+			value      	(value Text 
+|*:AUTO:AUTO
+|
+			))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"ExportMap"
+			value      	(value Text 
+|*:AUTO:AUTO
+|
+			))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"InitialSourceIncludes"
+			value      	(value Text 
+|"stdafx.h"
+			))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"InitialHeaderIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Copyright"
+			value      	(value Text "Copyright (C) 1991 - 1999 Rational Software Corporation"))))
+	    (object Attribute
+		tool       	"VC++"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Const"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"InitialValue"
+			value      	"")))
+	    (object Attribute
+		tool       	"VC++"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Generate"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"VC++"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Inline"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"DefaultBody"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"VC++"
+		name       	"HiddenTool"
+		value      	FALSE))
+	quid       	"34DBB4830145"))
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tzservices/tzserver/analysis/DAYLIGHT SAVINGS ANALYSIS.md~	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,6210 @@
+
+(object Petal
+    version    	43
+    _written   	"Rose 6.5.9232.10"
+    charSet    	0)
+
+(object Design "Logical View"
+    is_unit    	TRUE
+    is_loaded  	TRUE
+    quid       	"36D487460258"
+    defaults   	(object defaults
+	rightMargin 	0.250000
+	leftMargin 	0.250000
+	topMargin  	0.250000
+	bottomMargin 	0.500000
+	pageOverlap 	0.250000
+	clipIconLabels 	TRUE
+	autoResize 	TRUE
+	snapToGrid 	TRUE
+	gridX      	16
+	gridY      	16
+	defaultFont 	(object Font
+	    size       	9
+	    face       	"Arial"
+	    bold       	FALSE
+	    italics    	FALSE
+	    underline  	FALSE
+	    strike     	FALSE
+	    color      	0
+	    default_color 	TRUE)
+	showMessageNum 	1
+	showClassOfObject 	TRUE
+	notation   	"Unified")
+    root_usecase_package 	(object Class_Category "Use Case View"
+	quid       	"34DBB4830142"
+	documentation 	
+|The Use Case View organizes the Use-Case Model and the optional Business Use-Case Model.
+|
+	
+	exportControl 	"Public"
+	global     	TRUE
+	logical_models 	(list unit_reference_list
+	    (object Class_Category "Business Use-Case Model"
+		quid       	"35B677D701B8"
+		documentation 	
+|Optional Model:
+|The business modeling workflow in Rational Unified Process produces two models: the business use-case model, and the business object model. Both show the business 
+|processes, but different aspects of them. In the business use-case model each business use case represents a business process, described (text and/or activity diagrams) from an "external" view point without worrying about who does what to whom inside of the organization. 
+|In the business object model, you include realizations of each business use case to show how workers and entities collaborate to perform the process. You do that using class diagrams, activity diagrams with swimlanes, collaboration diagrams, and/or interaction diagrams.
+|
+|<Any additional description of the Business Use Case Model, such as modeling conventions that the reader/reviewer may need to understand the model, should be described here.>
+		
+		exportControl 	"Public"
+		logical_models 	(list unit_reference_list)
+		logical_presentations 	(list unit_reference_list
+		    (object UseCaseDiagram "Global View of Business Actors and Business Use Cases"
+			quid       	"35C0DFF50172"
+			title      	"Global View of Business Actors and Business Use Cases"
+			documentation 	"This is a global view of the system showing all Busines Use Cases and Business Actors.  It is intended to be an overview diagram, so if the diagram becomes too complex for easy comprehension, use several diagrams, each of which should focus on a different aspect of the system.  Usually, organizing use case diagrams around actors is a good approach."
+			zoom       	100
+			max_height 	28350
+			max_width  	21600
+			origin_x   	0
+			origin_y   	0
+			items      	(list diagram_item_list
+			    (object NoteView @1
+				location   	(464, 352)
+				label      	(object ItemLabel
+				    Parent_View 	@1
+				    location   	(42, 11)
+				    fill_color 	13434879
+				    nlines     	14
+				    max_width  	809
+				    label      	
+|Global View of Business Actors and BusinessUse Cases
+|
+|This diagram presents all Business Actors and all concrete Business Use Cases (those that are directly instantiable).
+|
+|Related Rational Unified Process Activities:
+|- Activity: Find Business Actors and Use Cases
+|- Activity: Structure the Business Use Case Model
+|
+|*Note: this note may be deleted once the diagram is created.
+				    )
+				line_color 	3342489
+				fill_color 	13434879
+				width      	869
+				height     	694)
+			    (object NoteView @2
+				location   	(1280, 160)
+				label      	(object ItemLabel
+				    Parent_View 	@2
+				    location   	(942, 29)
+				    fill_color 	13434879
+				    nlines     	5
+				    max_width  	640
+				    label      	
+|Created/modified by: <name>
+|Date: <creation/modification date>
+|
+|Approved by: <name>
+|Date: <approval date>
+				    )
+				line_color 	3342489
+				fill_color 	13434879
+				width      	700
+				height     	275)))))
+	    (object Class_Category "Use-Case Model"
+		is_unit    	TRUE
+		is_loaded  	FALSE
+		file_name  	"M:\\DST\\analysis\\UseCases.cat"
+		quid       	"35B677F4010E"))
+	logical_presentations 	(list unit_reference_list
+	    (object UseCaseDiagram "Main"
+		quid       	"35C6339B029F"
+		title      	"Main"
+		documentation 	
+|This diagram depicts the relationships between the packages (models) contained in the 'Use-Case View": the Use-Case Model (for the system) and the Business Use-Case Model (describing the business).
+		
+		zoom       	90
+		max_height 	28350
+		max_width  	21600
+		origin_x   	0
+		origin_y   	0
+		items      	(list diagram_item_list
+		    (object CategoryView "Use Case View::Use-Case Model" @3
+			location   	(400, 864)
+			font       	(object Font
+			    size       	10)
+			label      	(object ItemLabel
+			    Parent_View 	@3
+			    location   	(256, 780)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	288
+			    justify    	0
+			    label      	"Use-Case Model")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"35B677F4010E"
+			width      	300
+			height     	180)
+		    (object NoteView @4
+			location   	(1168, 592)
+			font       	(object Font
+			    size       	10)
+			label      	(object ItemLabel
+			    Parent_View 	@4
+			    location   	(941, 390)
+			    fill_color 	13434879
+			    nlines     	9
+			    max_width  	419
+			    label      	"The Use-Case Model is traceable to (and derives from) the Business Model.  The system (as described in the Use Case Model) provides behavior that supports the business.")
+			line_color 	3342489
+			fill_color 	13434879
+			width      	479
+			height     	416)
+		    (object CategoryView "Use Case View::Business Use-Case Model" @5
+			location   	(384, 320)
+			label      	(object ItemLabel
+			    Parent_View 	@5
+			    location   	(189, 229)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	390
+			    justify    	0
+			    label      	"Business Use-Case Model")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"35B677D701B8"
+			width      	403
+			height     	194)
+		    (object ImportView "" @6
+			stereotype 	TRUE
+			line_color 	3342489
+			quidu      	"35C633DA030C"
+			client     	@3
+			supplier   	@5
+			line_style 	0)
+		    (object AttachView "" @7
+			stereotype 	TRUE
+			line_color 	3342489
+			client     	@6
+			supplier   	@4
+			line_style 	0)))))
+    root_category 	(object Class_Category "Logical View"
+	quid       	"34DBB4830141"
+	documentation 	
+|Rational Unified Process uses the "Logical View in Rose" to organize the Design Model  and the Process View and the optional Business Object Model and Analysis Model.
+	
+	exportControl 	"Public"
+	global     	TRUE
+	subsystem  	"Component View"
+	quidu      	"34DBB4830143"
+	logical_models 	(list unit_reference_list
+	    (object Class_Category "Analysis Model"
+		quid       	"35B678170028"
+		documentation 	
+|This model is optional.
+|The Analysis Model contains a set of Analysis Classes, which describe an abstract realization of the use cases of the system.  The analysis classes evolve into associated design elements which are modeled in the Design Model.  
+		
+		exportControl 	"Public"
+		logical_models 	(list unit_reference_list
+		    (object Class_Category "Business Object Model"
+			is_unit    	TRUE
+			is_loaded  	FALSE
+			file_name  	"M:\\DST\\analysis\\LogicalBusinessObjects.cat"
+			quid       	"35B678080064")
+		    (object Class_Category "TZ Compiler"
+			is_unit    	TRUE
+			is_loaded  	FALSE
+			file_name  	"M:\\DST\\analysis\\TZCOMPILER.CAT"
+			quid       	"40E569BC024F")
+		    (object Class_Category "LTClasses"
+			is_unit    	TRUE
+			is_loaded  	FALSE
+			file_name  	"M:\\DST\\analysis\\Classes.cat"
+			quid       	"40A89DC203B0")
+		    (object Class_Category "Time Zone Database Management"
+			is_unit    	TRUE
+			is_loaded  	FALSE
+			file_name  	"M:\\DST\\analysis\\LogicalTZDBM.cat"
+			quid       	"40B1E4A6003A")
+		    (object Class_Category "Local Time Conversion"
+			is_unit    	TRUE
+			is_loaded  	FALSE
+			file_name  	"M:\\DST\\analysis\\LogicalLocaltimeConv.cat"
+			quid       	"40B1D43200B7")
+		    (object Class_Category "System Time Management"
+			is_unit    	TRUE
+			is_loaded  	FALSE
+			file_name  	"M:\\DST\\analysis\\LogicalSysTimeMngmt.cat"
+			quid       	"40B1D49203C5")
+		    (object Class_Category "TZClasses"
+			is_unit    	TRUE
+			is_loaded  	FALSE
+			file_name  	"M:\\DST\\analysis\\TZClasses.cat"
+			quid       	"40F3CEAF0324")
+		    (object Class_Category "BClasses"
+			is_unit    	TRUE
+			is_loaded  	FALSE
+			file_name  	"M:\\DST\\analysis\\BClasses.cat"
+			quid       	"40F3CFB10172"))
+		logical_presentations 	(list unit_reference_list))
+	    (object Class_Category "Design Model"
+		quid       	"35B6782302DA"
+		documentation 	
+|The Design Model in Rational Unified Process.
+|The design model is adapted to model the real implementation environment, and serves as an abstraction of the source code. It is a "blueprint" of how the source code is structured and written. 
+|
+|The design model is a hierarchy of packages (design subsystems and design-service  packages), with "leaves" that are classes. Subsystems are a design "view" of the components that are defined in the Implementation Model.
+|
+|The design model hierarchy consists of layers. 
+|
+|Classes represent abstractions of classes in the system's implementation. They define the objects, which in turn are abstractions of the objects in the system's implementation. The use cases are realized by the objects, and this is represented by use-case realizations in the Design Model.  Each use-case realization has a realize dependency to a use case in the Use-Case Model. 
+		
+		exportControl 	"Public"
+		logical_models 	(list unit_reference_list
+		    (object Class_Category "<Layer Name> Layer"
+			quid       	"34E3686A00F0"
+			documentation 	
+|The design model is normally organized in layers. The number of layers is not fixed, but varies from situation to situation. 
+|
+|During architectural analysis, focus is normally on the two high-level layers, that is, the application and business-specific layers;  this is what is meant by the "high-level organization of subsystems." The other lower-level layers are in focus during architectural design, refer to the activity Architectural Design for more information.
+|
+|Layers are identified using the naming conventions shown in the name of this package. 
+			
+			exportControl 	"Public"
+			logical_models 	(list unit_reference_list
+			    (object Class_Category "<package name>"
+				quid       	"34E36BB7017C"
+				documentation 	
+|<Enter a short description of the package here.  A package should be used in cases where a set of classes and/or other packages need to be grouped together for model organization purposes.  Though the contents of the package can have public visibility, which makes them visible to model elements outside the containing package, packages are primarily just grouping mechanisms.  
+|
+|If a set of classes is to be encapsulated and can be hidden behind a well-defined interface, a subsystem is a more appropriate container>
+				
+				exportControl 	"Public"
+				logical_models 	(list unit_reference_list)
+				logical_presentations 	(list unit_reference_list
+				    (object ClassDiagram "<package name> - Dependencies"
+					quid       	"37BC2256004D"
+					title      	"<package name> - Dependencies"
+					documentation 	"This diagram shows the package itself and the packages that it is dependent of. That is useful to know for instance when the package is a separate unit that can be reused in other systems."
+					zoom       	100
+					max_height 	28350
+					max_width  	21600
+					origin_x   	0
+					origin_y   	0
+					items      	(list diagram_item_list))
+				    (object ClassDiagram "<package name> - Interfaces"
+					quid       	"37BC226D026D"
+					title      	"<package name> - Interfaces"
+					documentation 	"This diagram shows only the classes that are visible outside this package. The interfaces of the package."
+					zoom       	100
+					max_height 	28350
+					max_width  	21600
+					origin_x   	0
+					origin_y   	0
+					items      	(list diagram_item_list))))
+			    (object Class_Category "<Subsystem Name>"
+				quid       	"35C0F38200B4"
+				documentation 	
+|<Enter a short description of the subsystem here.  A subsystem should be used in cases where a set of classes and/or other packages need to be encapsulated within a container and hidden behind a set of well-defined interfaces.  By convention, none of the contents of subsystem are visible except the interfaces of the subsystem.  This allows subsystems to be easily replaced, and the implementations changed, provided the interfaces remain unchanged.  It offers a degree of encapsulation greater than that of the package.
+|
+|If a set of classes is merely to be grouped together, but public visibility of classes is still desirable, a package is a more appropriate container.>
+				
+				stereotype 	"subsystem"
+				exportControl 	"Public"
+				logical_models 	(list unit_reference_list)
+				logical_presentations 	(list unit_reference_list
+				    (object ClassDiagram "<subsystem name> - Dependencies"
+					quid       	"35C0F4220190"
+					title      	"<subsystem name> - Dependencies"
+					documentation 	"This diagram shows the package itself and the packages that it is dependent of. That is useful to know for instance when the package is a separate unit that can be reused in other systems."
+					zoom       	100
+					max_height 	28350
+					max_width  	21600
+					origin_x   	0
+					origin_y   	0
+					items      	(list diagram_item_list))
+				    (object ClassDiagram "<subsystem name> - Interfaces"
+					quid       	"37BC21080165"
+					title      	"<subsystem name> - Interfaces"
+					documentation 	
+|The Process View in Rational Unified Process
+|This package is used to organize the active classes in the system and will be presented in the SoDA-generated Software Architecture Document, under the "Process View"
+					
+					zoom       	100
+					max_height 	28350
+					max_width  	21600
+					origin_x   	0
+					origin_y   	0
+					items      	(list diagram_item_list)))))
+			logical_presentations 	(list unit_reference_list
+			    (object ClassDiagram "All Packages in <Layer Name> - Layer"
+				quid       	"34E36C2903C0"
+				title      	"All Packages in <Layer Name> - Layer"
+				documentation 	"This diagram shows all packages in this - Layer."
+				zoom       	100
+				max_height 	28350
+				max_width  	21600
+				origin_x   	0
+				origin_y   	0
+				items      	(list diagram_item_list))))
+		    (object Class_Category "Use-Case Realizations"
+			quid       	"34E36D3203CA"
+			documentation 	
+|In this Package we will describe "Use Case Realizations" as stereotyped use cases.
+|
+|A use-case realization describes how a particular use case is realized within  the design model, in terms of collaborating objects.
+|
+|A realize dependency is used between the "Use Case Realization" and the "Use Case" in the use-case  model that is realized. 
+|
+|
+			
+			exportControl 	"Public"
+			logical_models 	(list unit_reference_list
+			    (object Association "$UNNAMED$0"
+				quid       	"35409E9D02A8"
+				stereotype 	"realize"
+				roles      	(list role_list
+				    (object Role "$UNNAMED$1"
+					quid       	"35409E9E0294"
+					supplier   	"Use Case View::Use-Case Model::Use Cases::<Use Case Name>::<Use Case Name>"
+					quidu      	"34E37FB203D4"
+					is_navigable 	TRUE)
+				    (object Role "$UNNAMED$2"
+					quid       	"35409E9E0295"
+					supplier   	"Logical View::Design Model::Use-Case Realizations::<Use-Case Name>::<Use-Case Name>"
+					quidu      	"352F38180276")))
+			    (object Class_Category "<Use-Case Name>"
+				quid       	"35D083E100BE"
+				documentation 	" A separate package is recommended for each Use Case Realization to facilitate access and version control of related use case artifacts."
+				exportControl 	"Public"
+				logical_models 	(list unit_reference_list
+				    (object UseCase "<Use-Case Name>"
+					attributes 	(list Attribute_Set
+					    (object Attribute
+						tool       	"RequisitePro"
+						name       	"ReqProProjectPath"
+						value      	"")
+					    (object Attribute
+						tool       	"RequisitePro"
+						name       	"ReqProProjectGuid"
+						value      	"")
+					    (object Attribute
+						tool       	"RequisitePro"
+						name       	"ReqProDocumentName"
+						value      	"")
+					    (object Attribute
+						tool       	"RequisitePro"
+						name       	"ReqProDocumentGuid"
+						value      	"")
+					    (object Attribute
+						tool       	"RequisitePro"
+						name       	"ReqProDocType"
+						value      	"")
+					    (object Attribute
+						tool       	"RequisitePro"
+						name       	"ReqProReqType"
+						value      	"")
+					    (object Attribute
+						tool       	"RequisitePro"
+						name       	"ReqProRequirementId"
+						value      	""))
+					quid       	"352F38180276"
+					documentation 	
+|This will be a stereotype on a usecase. 
+|In UML it is a stereotype on a collaboration and that does not exist in Rose.
+					
+					stereotype 	"use-case realization"
+					logical_models 	(list unit_reference_list
+					    (object Mechanism @8
+						logical_models 	(list unit_reference_list))
+					    (object Mechanism @9
+						logical_models 	(list unit_reference_list)))
+					logical_presentations 	(list unit_reference_list
+					    (object ClassDiagram "<Use Case Name> -  Realize Dependencies"
+						quid       	"37BC23B801F1"
+						title      	"<Use Case Name> -  Realize Dependencies"
+						documentation 	"This diagram shows the Use Case and the Use Case Realization and the realize dependency between them.  This information is used to connect the use case with the use case realization."
+						zoom       	100
+						max_height 	28350
+						max_width  	21600
+						origin_x   	0
+						origin_y   	0
+						items      	(list diagram_item_list))
+					    (object ClassDiagram "<Use Case Name> -  Participating Classes"
+						quid       	"37BC23E0036B"
+						title      	"<Use Case Name> -  Participating Classes"
+						documentation 	"This Diagram shows all participating classes in this Use Case Realization"
+						zoom       	100
+						max_height 	28350
+						max_width  	21600
+						origin_x   	0
+						origin_y   	0
+						items      	(list diagram_item_list))
+					    (object InteractionDiagram "<Use Case Name> -  Basic Flow"
+						mechanism_ref 	@8
+						quid       	"35081E3603A2"
+						title      	"<Use Case Name> -  Basic Flow"
+						zoom       	100
+						max_height 	28350
+						max_width  	21600
+						origin_x   	0
+						origin_y   	0
+						items      	(list diagram_item_list))
+					    (object InteractionDiagram "<Use Case Name> -  <Flow Type>"
+						mechanism_ref 	@9
+						quid       	"3540A0B901AE"
+						title      	"<Use Case Name> -  <Flow Type>"
+						zoom       	100
+						max_height 	28350
+						max_width  	21600
+						origin_x   	0
+						origin_y   	0
+						items      	(list diagram_item_list)))))
+				logical_presentations 	(list unit_reference_list
+				    (object ClassDiagram "Realize Dependency"
+					quid       	"34E39DA90302"
+					title      	"Realize Dependency"
+					documentation 	"This diagram shows the Use Case and the Use Case Realization and the realizes dependency between them."
+					zoom       	100
+					max_height 	28350
+					max_width  	21600
+					origin_x   	0
+					origin_y   	0
+					items      	(list diagram_item_list
+					    (object NoteView @10
+						location   	(704, 144)
+						label      	(object ItemLabel
+						    Parent_View 	@10
+						    location   	(38, 25)
+						    fill_color 	13434879
+						    nlines     	5
+						    max_width  	1296
+						    label      	
+|
+|This diagram shows the Use Case and the Use Case Realization and the realize dependency between them.
+						    )
+						line_color 	3342489
+						fill_color 	13434879
+						width      	1356
+						height     	250)
+					    (object UseCaseView "Use Case View::Use-Case Model::Use Cases::<Use Case Name>::<Use Case Name>" @11
+						location   	(1152, 528)
+						label      	(object ItemLabel
+						    Parent_View 	@11
+						    location   	(1152, 666)
+						    anchor_loc 	1
+						    nlines     	2
+						    max_width  	631
+						    justify    	0
+						    label      	"<Use Case Name>")
+						icon_style 	"Icon"
+						line_color 	3342489
+						fill_color 	13434879
+						quidu      	"34E37FB203D4"
+						autoResize 	TRUE)
+					    (object UseCaseView "Logical View::Design Model::Use-Case Realizations::<Use-Case Name>::<Use-Case Name>" @12
+						location   	(608, 960)
+						label      	(object ItemLabel
+						    Parent_View 	@12
+						    location   	(608, 1148)
+						    anchor_loc 	1
+						    nlines     	2
+						    max_width  	651
+						    justify    	0
+						    label      	"<Use-Case Name>")
+						stereotype 	(object ItemLabel
+						    Parent_View 	@12
+						    location   	(608, 1078)
+						    anchor     	10
+						    anchor_loc 	1
+						    nlines     	1
+						    max_width  	434
+						    justify    	0
+						    label      	"<<use-case realization>>")
+						icon       	"use-case realization"
+						icon_style 	"Icon"
+						line_color 	3342489
+						fill_color 	13434879
+						quidu      	"352F38180276"
+						autoResize 	TRUE)
+					    (object AssociationViewNew "$UNNAMED$0" @13
+						location   	(876, 741)
+						stereotype 	(object SegLabel @14
+						    Parent_View 	@13
+						    location   	(874, 746)
+						    anchor     	10
+						    anchor_loc 	1
+						    nlines     	1
+						    max_width  	450
+						    justify    	0
+						    label      	"<<realize>>"
+						    pctDist    	0.483333
+						    height     	5
+						    orientation 	1)
+						line_color 	3342489
+						quidu      	"35409E9D02A8"
+						roleview_list 	(list RoleViews
+						    (object RoleView "$UNNAMED$1" @15
+							Parent_View 	@13
+							location   	(236, -539)
+							stereotype 	TRUE
+							line_color 	3342489
+							quidu      	"35409E9E0294"
+							client     	@13
+							supplier   	@11
+							line_style 	0)
+						    (object RoleView "$UNNAMED$2" @16
+							Parent_View 	@13
+							location   	(236, -539)
+							stereotype 	TRUE
+							line_color 	3342489
+							quidu      	"35409E9E0295"
+							client     	@13
+							supplier   	@12
+							line_style 	0))))))))
+			logical_presentations 	(list unit_reference_list))
+		    (object Class_Category "Process View"
+			quid       	"35D227B103C0"
+			documentation 	"An architectural view that describes the concurrent aspect of the system: tasks (processes) and their interactions."
+			exportControl 	"Public"
+			logical_models 	(list unit_reference_list
+			    (object Class "<Process Name>"
+				quid       	"35DB3C8302D0"
+				documentation 	"This process provides <enter a description here of what the role of the process in the system is>.  A separate process was chosen for this to be able to <enter the rationale for needing a separate process>."
+				stereotype 	"process")
+			    (object Class "<Thread Name>"
+				quid       	"35DB3CB002BC"
+				documentation 	"This is a sub-process or thread within the <name of process of which this thread is a sub-process> process which handles <enter a description of what this thread does>.  A separate thread was chosen for this to be able to <enter the rationale for creating a separate thread>."
+				stereotype 	"thread")
+			    (object Association "$UNNAMED$3"
+				quid       	"35DB3E72017C"
+				roles      	(list role_list
+				    (object Role "$UNNAMED$4"
+					quid       	"35DB3E73005A"
+					supplier   	"Logical View::Design Model::Process View::<Process Name>"
+					quidu      	"35DB3C8302D0"
+					is_navigable 	TRUE
+					is_aggregate 	TRUE)
+				    (object Role "$UNNAMED$5"
+					quid       	"35DB3E730096"
+					supplier   	"Logical View::Design Model::Process View::<Thread Name>"
+					quidu      	"35DB3CB002BC"
+					Containment 	"By Value"
+					is_navigable 	TRUE))))
+			logical_presentations 	(list unit_reference_list
+			    (object ClassDiagram "Process View"
+				quid       	"35DB3C2A02B2"
+				title      	"Process View"
+				documentation 	"This diagram illustrates the composition of processes and threads, and the mapping of classes onto those processes and threads."
+				zoom       	100
+				max_height 	28350
+				max_width  	21600
+				origin_x   	0
+				origin_y   	0
+				items      	(list diagram_item_list
+				    (object ClassView "Class" "Logical View::Design Model::Process View::<Process Name>" @17
+					ShowCompartmentStereotypes 	TRUE
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(288, 464)
+					label      	(object ItemLabel
+					    Parent_View 	@17
+					    location   	(122, 436)
+					    fill_color 	13434879
+					    nlines     	1
+					    max_width  	332
+					    justify    	0
+					    label      	"<Process Name>")
+					stereotype 	(object ItemLabel
+					    Parent_View 	@17
+					    location   	(122, 389)
+					    fill_color 	13434879
+					    anchor     	10
+					    nlines     	1
+					    max_width  	332
+					    justify    	0
+					    label      	"<<process>>")
+					icon_style 	"Icon"
+					line_color 	3342489
+					fill_color 	13434879
+					quidu      	"35DB3C8302D0"
+					width      	350
+					height     	172
+					annotation 	8
+					autoResize 	TRUE)
+				    (object ClassView "Class" "Logical View::Design Model::Process View::<Thread Name>" @18
+					ShowCompartmentStereotypes 	TRUE
+					IncludeAttribute 	TRUE
+					IncludeOperation 	TRUE
+					location   	(896, 464)
+					label      	(object ItemLabel
+					    Parent_View 	@18
+					    location   	(740, 436)
+					    fill_color 	13434879
+					    nlines     	1
+					    max_width  	312
+					    justify    	0
+					    label      	"<Thread Name>")
+					stereotype 	(object ItemLabel
+					    Parent_View 	@18
+					    location   	(740, 389)
+					    fill_color 	13434879
+					    anchor     	10
+					    nlines     	1
+					    max_width  	312
+					    justify    	0
+					    label      	"<<thread>>")
+					icon_style 	"Icon"
+					line_color 	3342489
+					fill_color 	13434879
+					quidu      	"35DB3CB002BC"
+					width      	330
+					height     	172
+					annotation 	8
+					autoResize 	TRUE)
+				    (object AssociationViewNew "$UNNAMED$3" @19
+					location   	(596, 464)
+					stereotype 	TRUE
+					line_color 	3342489
+					quidu      	"35DB3E72017C"
+					roleview_list 	(list RoleViews
+					    (object RoleView "$UNNAMED$4" @20
+						Parent_View 	@19
+						location   	(-300, 0)
+						stereotype 	TRUE
+						line_color 	3342489
+						quidu      	"35DB3E73005A"
+						client     	@19
+						supplier   	@17
+						line_style 	0)
+					    (object RoleView "$UNNAMED$5" @21
+						Parent_View 	@19
+						location   	(-300, 0)
+						stereotype 	TRUE
+						line_color 	3342489
+						quidu      	"35DB3E730096"
+						client     	@19
+						supplier   	@18
+						line_style 	0))))))))
+		logical_presentations 	(list unit_reference_list
+		    (object ClassDiagram "Architecturally Significant Model Elements"
+			quid       	"34E36BDE02C6"
+			title      	"Architecturally Significant Model Elements"
+			documentation 	"Elements of the Design Model which are considered architecturally significant should be presented in this diagram.  This diagram will be presented in the document generated using the SoDA Software Architecture Document."
+			zoom       	100
+			max_height 	28350
+			max_width  	21600
+			origin_x   	0
+			origin_y   	0
+			items      	(list diagram_item_list
+			    (object NoteView @22
+				location   	(672, 304)
+				label      	(object ItemLabel
+				    Parent_View 	@22
+				    location   	(28, 19)
+				    fill_color 	13434879
+				    nlines     	13
+				    max_width  	1253
+				    label      	
+|
+|This diagram is just produced for architectural significant packages.
+|
+|This diagram shows the Architectural Significant Classes and Packages in this package. Only significant  operations and attributes are shown on the classes in this diagram.
+|
+|See Rational Unified Process:
+|Activity: Architectural Design
+|Step:  Include Architecturally Significant Model Elements in the Logical View 
+|
+|This will be a part of  the  "Software Architecture Document" :
+|- "Logical View" 
+|-     "Architecturally Significant Model Elements"
+				    )
+				line_color 	3342489
+				fill_color 	13434879
+				width      	1313
+				height     	582)
+			    (object NoteView @23
+				location   	(1696, 160)
+				label      	(object ItemLabel
+				    Parent_View 	@23
+				    location   	(1358, 29)
+				    fill_color 	13434879
+				    nlines     	5
+				    max_width  	640
+				    label      	
+|Created/modified by: <name>
+|Date: <creation/modification date>
+|
+|Approved by: <name>
+|Date: <approval date>
+				    )
+				line_color 	3342489
+				fill_color 	13434879
+				width      	700
+				height     	275)))
+		    (object ClassDiagram "Architecture Overview - Package and Subsystem Layering"
+			quid       	"354A9751015E"
+			title      	"Architecture Overview - Package and Subsystem Layering"
+			documentation 	
+|This diagram depicts the organization of the design model into layers. This diagram will be presented in the document generated using the SoDA Software Architecture Document.  
+|
+|See Rational Unified Process:
+|Activity: Architectural Analysis
+|Step: Define the High-Level Organization of Subsystems
+|
+|Activity: Incorporate Existing Design Elements
+|Step: Update the Organization of the Design Model
+			
+			zoom       	100
+			max_height 	28350
+			max_width  	21600
+			origin_x   	0
+			origin_y   	0
+			items      	(list diagram_item_list
+			    (object NoteView @24
+				location   	(576, 256)
+				label      	(object ItemLabel
+				    Parent_View 	@24
+				    location   	(44, 31)
+				    fill_color 	13434879
+				    nlines     	9
+				    max_width  	1028
+				    label      	
+|This diagram shows the design model layers.
+|
+|See Rational Unified Process:
+|Activity: Architectural Analysis
+|Step: Define the High-Level Organization of Subsystems
+|
+|Activity: Architectural Design
+|Step: Define the Low-level Organization of Subsystems
+				    )
+				line_color 	3342489
+				fill_color 	13434879
+				width      	1088
+				height     	463)
+			    (object NoteView @25
+				location   	(1520, 176)
+				label      	(object ItemLabel
+				    Parent_View 	@25
+				    location   	(1182, 45)
+				    fill_color 	13434879
+				    nlines     	5
+				    max_width  	640
+				    label      	
+|Created/modified by: <name>
+|Date: <creation/modification date>
+|
+|Approved by: <name>
+|Date: <approval date>
+				    )
+				line_color 	3342489
+				fill_color 	13434879
+				width      	700
+				height     	275))))))
+	logical_presentations 	(list unit_reference_list
+	    (object ClassDiagram "Welcome"
+		quid       	"3512226B0028"
+		title      	"Welcome"
+		documentation 	
+|Welcome to the Rational Unified Process Frame Work
+|
+|Purpose of the FrameWork:
+|a) provide a good structure for a Rose model
+|b) provide a style guide with naming conventions/suggestions
+|c) identify a minimal set of diagrams to produce
+|d) relate activities in RUP to Rose diagrams
+|e) provide a basis for sophisticated SoDA reports. For instance based on this structure most of the Rose parts of the "Software Architecture Document" are generated from SoDA.
+|
+		
+		zoom       	100
+		max_height 	28350
+		max_width  	21600
+		origin_x   	0
+		origin_y   	0
+		items      	(list diagram_item_list
+		    (object NoteView @26
+			location   	(768, 384)
+			label      	(object ItemLabel
+			    Parent_View 	@26
+			    location   	(121, 96)
+			    fill_color 	13434879
+			    nlines     	14
+			    max_width  	1259
+			    label      	
+|Welcome to the Rational Unified Process Rose Model Framework
+|
+|Purpose of the Framework:
+|a) provide a good structure for a Rose model
+|b) provide a style guide with naming conventions/suggestions
+|c) identify a minimal set of diagrams to produce
+|d) relate activities in RUP to Rose diagrams
+|e) provide a basis for sophisticated SoDA reports. For instance based on this structure most of the Rose parts of the "Software Architecture Document" are generated from SoDA.
+			    )
+			line_color 	3342489
+			fill_color 	13434879
+			width      	1319
+			height     	588)
+		    (object CategoryView "Logical View::Analysis Model::TZ Compiler" @27
+			location   	(1136, 1008)
+			label      	(object ItemLabel
+			    Parent_View 	@27
+			    location   	(951, 924)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	370
+			    justify    	0
+			    label      	"TZ Compiler")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"40E569BC024F"
+			width      	382
+			height     	180)
+		    (object CategoryView "Logical View::Analysis Model::LTClasses" @28
+			location   	(432, 1008)
+			label      	(object ItemLabel
+			    Parent_View 	@28
+			    location   	(247, 924)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	370
+			    justify    	0
+			    label      	"LTClasses")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"40A89DC203B0"
+			width      	382
+			height     	180)
+		    (object CategoryView "Logical View::Analysis Model::Time Zone Database Management" @29
+			location   	(1872, 1040)
+			label      	(object ItemLabel
+			    Parent_View 	@29
+			    location   	(1638, 956)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	468
+			    justify    	0
+			    label      	"Time Zone Database Management")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"40B1E4A6003A"
+			width      	480
+			height     	180)
+		    (object CategoryView "Logical View::Analysis Model::Business Object Model" @30
+			location   	(512, 1408)
+			label      	(object ItemLabel
+			    Parent_View 	@30
+			    location   	(327, 1324)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	370
+			    justify    	0
+			    label      	"Business Object Model")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"35B678080064"
+			width      	382
+			height     	180)
+		    (object CategoryView "Logical View::Analysis Model::Local Time Conversion" @31
+			location   	(1728, 1392)
+			label      	(object ItemLabel
+			    Parent_View 	@31
+			    location   	(1543, 1308)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	370
+			    justify    	0
+			    label      	"Local Time Conversion")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"40B1D43200B7"
+			width      	382
+			height     	180)
+		    (object CategoryView "Logical View::Analysis Model::System Time Management" @32
+			location   	(1040, 1392)
+			label      	(object ItemLabel
+			    Parent_View 	@32
+			    location   	(855, 1308)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	370
+			    justify    	0
+			    label      	"System Time Management")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"40B1D49203C5"
+			width      	382
+			height     	180)))))
+    root_subsystem 	(object SubSystem "Component View"
+	quid       	"34DBB4830143"
+	documentation 	
+|In Rational Unified Process the  "Component View in Rose" is used to organize the implemetation model. 
+|
+|The Implementaition View in Rational Unified Process
+|
+|
+	
+	physical_models 	(list unit_reference_list
+	    (object SubSystem "Implementation Model"
+		quid       	"35B67C9A0348"
+		documentation 	
+|The Implementation Model in Rational Unified Process is a collection of components, and the implementation subsystems that contain them.
+|
+|An architectural view that describes one or several system configurations; the mapping of software components (tasks, modules) to the computing nodes in these configurations.
+|
+|Defines, executables, dll's, files, subsystems, compilation order etc.
+|
+|Rational Unified Process:
+|Activity: Define the Organization of Subsystems
+|
+|These diagram will be presented in the  Implementation  View section in the document generated using the SoDA Software Architecture Document.
+|
+|It is recommended that, in most cases, the mapping should be
+|1:1 between design and implementation, that is, for each package in design there is one subsystem in the implementation model.
+|
+		
+		physical_models 	(list unit_reference_list)
+		physical_presentations 	(list unit_reference_list
+		    (object Module_Diagram "Implementation Model Structure"
+			quid       	"34DBB487006E"
+			title      	"Implementation Model Structure"
+			documentation 	"This diagram presents the organization of the Implementation Model."
+			zoom       	100
+			max_height 	28350
+			max_width  	21600
+			origin_x   	0
+			origin_y   	0
+			items      	(list diagram_item_list
+			    (object NoteView @33
+				location   	(624, 160)
+				label      	(object ItemLabel
+				    Parent_View 	@33
+				    location   	(21, 26)
+				    fill_color 	13434879
+				    nlines     	5
+				    max_width  	1170
+				    label      	
+|
+|RationalUnified Process:
+|Activity: Structure the implementation model
+|Step: Create the Initial Implementation Model Structure
+				    )
+				line_color 	3342489
+				fill_color 	13434879
+				width      	1230
+				height     	281)))))
+	    (object SubSystem "Components Analysis"
+		is_unit    	TRUE
+		is_loaded  	FALSE
+		file_name  	"M:\\DST\\analysis\\Components.sub"
+		quid       	"40D969B300E0"))
+	physical_presentations 	(list unit_reference_list
+	    (object Module_Diagram "Main"
+		quid       	"35C6339B029E"
+		title      	"Main"
+		documentation 	"This diagram, required by Rose, simply provides a way of navigating to the Implementation Model."
+		zoom       	100
+		max_height 	28350
+		max_width  	21600
+		origin_x   	0
+		origin_y   	0
+		items      	(list diagram_item_list
+		    (object SubSysView "Component View::Implementation Model" @34
+			location   	(736, 800)
+			label      	(object ItemLabel
+			    Parent_View 	@34
+			    location   	(552, 713)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	368
+			    justify    	0
+			    label      	"Implementation Model")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"35B67C9A0348"
+			width      	381
+			height     	187)
+		    (object SubSysView "Component View::Components Analysis" @35
+			location   	(1408, 1392)
+			label      	(object ItemLabel
+			    Parent_View 	@35
+			    location   	(1264, 1323)
+			    fill_color 	13434879
+			    nlines     	2
+			    max_width  	288
+			    justify    	0
+			    label      	"Components Analysis")
+			icon_style 	"Icon"
+			line_color 	3342489
+			fill_color 	13434879
+			quidu      	"40D969B300E0"
+			width      	300
+			height     	150)))))
+    process_structure 	(object Processes
+	quid       	"34DBB4830144"
+	ProcsNDevs 	(list
+	    (object Processor "<processor name>"
+		quid       	"34DBBD4300B4"
+		documentation 	"This node provides <enter a short description here of the functionality and capability of the node>."
+		connections 	(list connection_list
+		    (object Connection_Relationship
+			quid       	"34DBBD4B008C"
+			supplier   	"<device name>"
+			quidu      	"34DBBD47019A"
+			supplier_is_device 	TRUE))
+		characteristics 	""
+		scheduling 	"Preemptive"
+		processes  	(list processes
+		    (object Process "<process name>"
+			quid       	"35DB411001D6"
+			documentation 	"This process corresponds to the process with the same name in the Logical View::Process Model."
+			stereotype 	"process"
+			priority   	"")
+		    (object Process "<thread name>"
+			quid       	"35DB41720348"
+			documentation 	"This process corresponds to the thread with the same name in the Logical View::Process Model."
+			stereotype 	"thread"
+			priority   	"")))
+	    (object Device "<device name>"
+		quid       	"34DBBD47019A"
+		documentation 	"This device provides <enter a short description of the capability the device provides> for the system."
+		characteristics 	"")
+	    (object Process_Diagram "Deployment View"
+		quid       	"34DBB4830146"
+		title      	"Deployment View"
+		documentation 	
+|The Deployment View in Rational Unified Process
+|
+|Defines the typical physical network configurations, including those typically used by end users, as well as special configurations used for development and test.
+|
+|See Rational Unified Process:
+|Activity: Describe Distribution
+|
+|This diagram will be a part of  the SoDA template-generated Software Architecture Document under the "Deployment  View" .
+		
+		zoom       	100
+		max_height 	28350
+		max_width  	21600
+		origin_x   	0
+		origin_y   	0
+		items      	(list diagram_item_list
+		    (object ProcessorView "<processor name>" @36
+			location   	(512, 1056)
+			label      	(object ItemLabel
+			    Parent_View 	@36
+			    location   	(276, 900)
+			    nlines     	2
+			    max_width  	400
+			    justify    	0
+			    label      	"<processor name>")
+			icon_style 	"Label"
+			quidu      	"34DBBD4300B4"
+			width      	475
+			height     	381
+			annotation 	3)
+		    (object DeviceView "<device name>" @37
+			location   	(1040, 1056)
+			label      	(object ItemLabel
+			    Parent_View 	@37
+			    location   	(867, 950)
+			    nlines     	2
+			    max_width  	275
+			    justify    	0
+			    label      	"<device name>")
+			icon_style 	"Icon"
+			quidu      	"34DBBD47019A"
+			width      	350
+			height     	282
+			annotation 	0)
+		    (object ConnectionView "" @38
+			stereotype 	TRUE
+			quidu      	"34DBBD4B008C"
+			client     	@36
+			supplier   	@37
+			line_style 	0)
+		    (object NoteView @39
+			location   	(816, 304)
+			label      	(object ItemLabel
+			    Parent_View 	@39
+			    location   	(38, 29)
+			    fill_color 	13434879
+			    nlines     	11
+			    max_width  	1521
+			    label      	
+|This Diagram defines the typical physical network configurations, including those typically used by end users, as well as special configurations used for development and test.
+|
+|· Allocate processes to the various nodes. Allocation takes into account the capacity of the nodes (in terms of
+|both memory and processing), bandwidth of the communication medium (bus, LANs, WANs), and the
+|availability of the hardware and communication links, rerouting, and so on.
+|
+|See, Rational Unified Process:
+|Activity: Describe Distribution
+			    )
+			line_color 	3342489
+			fill_color 	13434879
+			width      	1581
+			height     	563)))))
+    properties 	(object Properties
+	attributes 	(list Attribute_Set
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"propertyId"
+		value      	"783606378")
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"CreatableSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"Private"
+				value      	221)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"PublicNotCreatable"
+				value      	213)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"SingleUse"
+				value      	214)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"GlobalSingleUse"
+				value      	215)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"MultiUse"
+				value      	219)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"GlobalMultiUse"
+				value      	220)))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"OptionBase"
+			value      	("BaseSet" 222))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"OptionExplicit"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"OptionCompare"
+			value      	("CompareSet" 202))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"Creatable"
+			value      	("CreatableSet" 221))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateInitialization"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateTermination"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"CollectionClass"
+			value      	"Collection")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"CompareSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"(none)"
+				value      	202)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"Binary"
+				value      	203)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"Text"
+				value      	204)))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"UpdateCode"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"UpdateModel"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"InstancingSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"Private"
+				value      	221)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"PublicNotCreatable"
+				value      	213)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"SingleUse"
+				value      	214)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"GlobalSingleUse"
+				value      	215)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"MultiUse"
+				value      	219)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"GlobalMultiUse"
+				value      	220)))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"BaseSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"(none)"
+				value      	222)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"0"
+				value      	223)
+			    (object Attribute
+				tool       	"Visual Basic"
+				name       	"1"
+				value      	224)))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"Instancing"
+			value      	("InstancingSet" 221))))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"OperationName"
+			value      	"$operation")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"LibraryName"
+			value      	"")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"AliasName"
+			value      	"")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"IsStatic"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"EntryCode"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ExitCode"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ReplaceExistingBody"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"DefaultBody"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"IsConst"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"New"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"WithEvents"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"Subscript"
+			value      	"")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"NameIfUnlabeled"
+			value      	"the$supplier")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateGetOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateSetOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateLetOperation"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"New"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"WithEvents"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"Subscript"
+			value      	"")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"NameIfUnlabeled"
+			value      	"the$supplier")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateGetOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateSetOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"GenerateLetOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"UpdateCode"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"FullName"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Inherit"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ImplementsDelegation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"FullName"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ProjectFile"
+			value      	"")
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"UpdateCode"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"UpdateModel"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ImportReferences"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"QuickImport"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"VisualStudio"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Repository"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"SCC"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"propertyId"
+		value      	"360000002")
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"DDLScriptFilename"
+			value      	"DDL1.SQL")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"DropClause"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"PrimaryKeyColumnName"
+			value      	"_ID")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"PrimaryKeyColumnType"
+			value      	"NUMBER(5,0)")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"SchemaNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"SchemaNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TableNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TableNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TypeNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TypeNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"ViewNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"ViewNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"VarrayNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"VarrayNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"NestedTableNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"NestedTableNameSuffix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"ObjectTableNamePrefix"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"ObjectTableNameSuffix"
+			value      	"")))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsSchema"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"OID"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"WhereClause"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CheckConstraint"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CollectionTypeLength"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CollectionTypePrecision"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CollectionTypeScale"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CollectionOfREFS"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"MethodKind"
+			value      	("MethodKindSet" 1903))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"OverloadID"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"OrderNumber"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsReadNoDataState"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsReadNoProcessState"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsWriteNoDataState"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsWriteNoProcessState"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsSelfish"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerType"
+			value      	("TriggerTypeSet" 1801))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerEvent"
+			value      	("TriggerEventSet" 1601))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerText"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerReferencingNames"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerForEach"
+			value      	("TriggerForEachSet" 1701))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerWhenClause"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"MethodKindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"MapMethod"
+				value      	1901)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"OrderMethod"
+				value      	1902)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Function"
+				value      	1903)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Procedure"
+				value      	1904)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Operator"
+				value      	1905)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Constructor"
+				value      	1906)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Destructor"
+				value      	1907)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Trigger"
+				value      	1908)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"Calculated"
+				value      	1909)))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"AFTER"
+				value      	1801)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"BEFORE"
+				value      	1802)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"INSTEAD OF"
+				value      	1803)))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerForEachSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"ROW"
+				value      	1701)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"STATEMENT"
+				value      	1702)))
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"TriggerEventSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"INSERT"
+				value      	1601)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"UPDATE"
+				value      	1602)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"DELETE"
+				value      	1603)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"INSERT OR UPDATE"
+				value      	1604)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"INSERT OR DELETE"
+				value      	1605)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"UPDATE OR DELETE"
+				value      	1606)
+			    (object Attribute
+				tool       	"Oracle8"
+				name       	"INSERT OR UPDATE OR DELETE"
+				value      	1607)))))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"OrderNumber"
+			value      	"")))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"OrderNumber"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsUnique"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"NullsAllowed"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"Length"
+			value      	"")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"Precision"
+			value      	"2")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"Scale"
+			value      	"6")
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsIndex"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"IsPrimaryKey"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CompositeUnique"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Oracle8"
+			name       	"CheckConstraint"
+			value      	"")))
+	    (object Attribute
+		tool       	"Oracle8"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"cg"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"UseMSVC"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileExtension"
+			value      	"h")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileBackupExtension"
+			value      	"h~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileTemporaryExtension"
+			value      	"h#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"PrecompiledHeader"
+			value      	"stdafx.h")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileExtension"
+			value      	"cpp")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileBackupExtension"
+			value      	"cp~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileTemporaryExtension"
+			value      	"cp#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StopOnError"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ErrorLimit"
+			value      	30)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Directory"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"PathSeparator"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FileNameFormat"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BooleanType"
+			value      	"int")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowTemplates"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowProtectedInheritance"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CommentWidth"
+			value      	60)
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByValueContainer"
+			value      	"$targetClass")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByValueContainer"
+			value      	"OptionalByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByValueContainer"
+			value      	"BoundedListByValue<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByValueContainer"
+			value      	"BoundedSetByValue<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByReferenceContainer"
+			value      	"BoundedListByReference<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByReferenceContainer"
+			value      	"BoundedSetByReference<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByValueContainer"
+			value      	"UnboundedListByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByValueContainer"
+			value      	"UnboundedSetByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByReferenceContainer"
+			value      	"UnboundedListByReference<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByReferenceContainer"
+			value      	"UnboundedSetByReference<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByValueContainer"
+			value      	"AssociationByValue<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByValueContainer"
+			value      	"DictionaryByValue<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByReferenceContainer"
+			value      	"AssociationByReference<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByReferenceContainer"
+			value      	"DictionaryByReference<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GeneratePreserveRegions"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowExplicitInstantiations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AlwaysKeepOrphanedCode"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowGenerateOverNewerAnnotations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowGenerateOverNewerVersion"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ImplementationType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ClassKey"
+			value      	"class")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegions"
+			value      	("GenerateEmptyRegionSet" 3))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegionSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Preserved"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unpreserved"
+				value      	2)
+			    (object Attribute
+				tool       	"cg"
+				name       	"All"
+				value      	3)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"PutBodiesInSpec"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDefaultConstructor"
+			value      	("GenerateSet" 206))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DefaultConstructorVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineDefaultConstructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ExplicitDefaultConstructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateCopyConstructor"
+			value      	("GenerateSet" 206))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CopyConstructorVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineCopyConstructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ExplicitCopyConstructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDestructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DestructorVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DestructorKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineDestructor"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAssignmentOperation"
+			value      	("GenerateSet" 206))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssignmentVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssignmentKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineAssignmentOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEqualityOperations"
+			value      	("GenerateSet" 206))
+		    (object Attribute
+			tool       	"cg"
+			name       	"EqualityVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"EqualityKind"
+			value      	("FriendKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineEqualityOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateRelationalOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"RelationalVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"RelationalKind"
+			value      	("FriendKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineRelationalOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateStorageMgmtOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StorageMgmtVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineStorageMgmtOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSubscriptOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"SubscriptVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"SubscriptKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"SubscriptResultType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineSubscriptOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDereferenceOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DereferenceVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DereferenceKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DereferenceResultType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineDereferenceOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateIndirectionOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IndirectionVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IndirectionKind"
+			value      	("ThreeKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IndirectionResultType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineIndirectionOperation"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateStreamOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StreamVisibility"
+			value      	("VisibilitySet" 45))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineStreamOperations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ThreeKindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"KindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"FriendKindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"DeclareAndDefine"
+				value      	199)
+			    (object Attribute
+				tool       	"cg"
+				name       	"DeclareOnly"
+				value      	205)
+			    (object Attribute
+				tool       	"cg"
+				name       	"DoNotDeclare"
+				value      	206)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"VisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"ConstValue"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDefaultSpecifier"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DefaultSpecifier"
+			value      	"")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegions"
+			value      	("GenerateEmptyRegionSet" 3))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegionSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Preserved"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unpreserved"
+				value      	2)
+			    (object Attribute
+				tool       	"cg"
+				name       	"All"
+				value      	3)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"FileName"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowExtensionlessFileName"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InclusionProtectionSymbol"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeFormat"
+			value      	(value Text 
+|// $package
+|#include "$file"
+|
+			))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeBySimpleName"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludePrecompiledHeader"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeOrder"
+			value      	"AMIR")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InliningStyle"
+			value      	("InliningStyleSet" 207))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InliningStyleSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"InClassDeclaration"
+				value      	208)
+			    (object Attribute
+				tool       	"cg"
+				name       	"FollowingClassDeclaration"
+				value      	207)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"TypesDefined"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeClosure"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Module-Body"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegions"
+			value      	("GenerateEmptyRegionSet" 3))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegionSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Preserved"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unpreserved"
+				value      	2)
+			    (object Attribute
+				tool       	"cg"
+				name       	"All"
+				value      	3)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"cg"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"FileName"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowExtensionlessFileName"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeFormat"
+			value      	(value Text 
+|// $package
+|#include "$file"
+|
+			))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeBySimpleName"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludePrecompiledHeader"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeOrder"
+			value      	"AMIR")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InliningStyle"
+			value      	("InliningStyleSet" 207))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InliningStyleSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"InClassDeclaration"
+				value      	208)
+			    (object Attribute
+				tool       	"cg"
+				name       	"FollowingClassDeclaration"
+				value      	207)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"TypesDefined"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"IncludeClosure"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationKind"
+			value      	("OperationKindSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationKindSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationIsConst"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationIsExplicit"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Inline"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"EntryCode"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"ExitCode"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegions"
+			value      	("GenerateEmptyRegionSet" 3))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegionSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Preserved"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unpreserved"
+				value      	2)
+			    (object Attribute
+				tool       	"cg"
+				name       	"All"
+				value      	3)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"BodyAnnotations"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OperationIsOneWay"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Context"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"Raises"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CCRegion"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAbstractBody"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Has"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"Ordered"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"NameIfUnlabeled"
+			value      	"the_$supplier")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibility"
+			value      	("DataMemberVisibilitySet" 14))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)
+			    (object Attribute
+				tool       	"cg"
+				name       	"AtRelationshipVisibility"
+				value      	210)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutability"
+			value      	("DataMemberMutabilitySet" 0))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutabilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unrestricted"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Mutable"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Const"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberIsVolatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberFieldSize"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InitialValue"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetName"
+			value      	"get_$relationship")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetName"
+			value      	"set_$relationship")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKinds"
+			value      	("GetSetKindsSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKindsSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"ContainerClass"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SelectorName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SelectorType"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConst"
+			value      	("GetResultIsConstSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConstSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"False"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"True"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Same_As_Function"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetByReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ForwardReferenceOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateForwardReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedHasRelType"
+			value      	("HasRelTypeSet" 47))
+		    (object Attribute
+			tool       	"cg"
+			name       	"HasRelTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Array"
+				value      	24)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Sequence"
+				value      	47)))))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Association"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"NameIfUnlabeled"
+			value      	"the_$targetClass")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Inherit"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"InstanceArguments"
+			value      	"")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ForwardReferenceOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"NameIfUnlabeled"
+			value      	"the_$targetClass")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberName"
+			value      	"$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibility"
+			value      	("DataMemberVisibilitySet" 14))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)
+			    (object Attribute
+				tool       	"cg"
+				name       	"AtRelationshipVisibility"
+				value      	210)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutability"
+			value      	("DataMemberMutabilitySet" 0))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutabilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unrestricted"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Mutable"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Const"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberIsVolatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberFieldSize"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"InitialValue"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"ContainerClass"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ContainerGet"
+			value      	"$data.get($keys)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"ContainerSet"
+			value      	"$data.set($keys,$value)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedContainer"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassContainer"
+			value      	"$supplier *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassInitialValue"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKinds"
+			value      	("GetSetKindsSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKindsSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetByReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetName"
+			value      	"get_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConst"
+			value      	("GetResultIsConstSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConstSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"False"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"True"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Same_As_Function"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetName"
+			value      	"set_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetSetByReference"
+			value      	("QualifiedGetSetByReferenceSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetSetByReferenceSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"False"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"True"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Same_As_GetSetByReference"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateQualifiedGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetName"
+			value      	"get_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedGetResultIsConst"
+			value      	("GetResultIsConstSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineQualifiedGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateQualifiedSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedSetName"
+			value      	"set_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedSetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineQualifiedSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAssocClassDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassDataMemberName"
+			value      	"$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassDataMemberVisibility"
+			value      	("DataMemberVisibilitySet" 14))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)
+			    (object Attribute
+				tool       	"cg"
+				name       	"AtRelationshipVisibility"
+				value      	210)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassDataMemberMutability"
+			value      	("DataMemberMutabilitySet" 0))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutabilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unrestricted"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Mutable"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Const"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassDataMemberIsVolatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassGetSetKinds"
+			value      	("GetSetKindsSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAssocClassGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassGetName"
+			value      	"get_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassGetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassGetResultIsConst"
+			value      	("GetResultIsConstSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineAssocClassGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateAssocClassSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassSetName"
+			value      	"set_$target")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassSetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineAssocClassSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocClassForwardReferenceOnly"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateForwardReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedRoleType"
+			value      	("AssocTypeSet" 47))
+		    (object Attribute
+			tool       	"cg"
+			name       	"AssocTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Array"
+				value      	24)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Sequence"
+				value      	47)))))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberName"
+			value      	"$attribute")
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibility"
+			value      	("DataMemberVisibilitySet" 14))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberVisibilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Public"
+				value      	45)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Protected"
+				value      	44)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Private"
+				value      	43)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Implementation"
+				value      	14)
+			    (object Attribute
+				tool       	"cg"
+				name       	"AtAttributeVisibility"
+				value      	211)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutability"
+			value      	("DataMemberMutabilitySet" 0))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberMutabilitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unrestricted"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Mutable"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Const"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberIsVolatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"DataMemberFieldSize"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateGetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateSetOperation"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetName"
+			value      	"get_$attribute")
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetName"
+			value      	"set_$attribute")
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKinds"
+			value      	("GetSetKindsSet" 200))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetKindsSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"Common"
+				value      	200)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Virtual"
+				value      	201)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Abstract"
+				value      	202)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Static"
+				value      	203)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Friend"
+				value      	204)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetIsConst"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConst"
+			value      	("GetResultIsConstSet" 2))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetResultIsConstSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"False"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"True"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Same_As_Function"
+				value      	2)))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GetSetByReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineGet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"SetReturnsValue"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"InlineSet"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CaseSpecifier"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CCRegion"
+			value      	"")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Uses"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"ForwardReferenceOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"BodyReferenceOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateForwardReference"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Subsystem"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"Directory"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"DirectoryIsOnSearchList"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"PrecompiledHeader"
+			value      	"stdafx.h")))
+	    (object Attribute
+		tool       	"cg"
+		name       	"default__Category"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"IsNamespace"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeName"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"Indent"
+			value      	2)
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegions"
+			value      	("GenerateEmptyRegionSet" 3))
+		    (object Attribute
+			tool       	"cg"
+			name       	"GenerateEmptyRegionSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"cg"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Preserved"
+				value      	1)
+			    (object Attribute
+				tool       	"cg"
+				name       	"Unpreserved"
+				value      	2)
+			    (object Attribute
+				tool       	"cg"
+				name       	"All"
+				value      	3)))))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Version"
+			value      	"5.0")))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Type"
+			value      	("MSVCClassTypeSet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSVCClassTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Normal"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Interface_Part"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Connection_Part"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Class_Factory"
+				value      	3)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CObjectFunctionality"
+			value      	("CObjectFunctionalitySet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CObjectFunctionalitySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dynamic"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dyncreate"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Serial"
+				value      	3)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateOverrideGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateDataGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DATA_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateFieldGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_FIELD_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateMessageGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateMessageMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_MSG_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MESSAGE_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLEFactory"
+			value      	("OLEFactorySet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLEFactorySet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"None"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Built_in"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Simple"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Licensed"
+				value      	3)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLEName"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLEClassID"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateOLECtlType"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLECtlType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateOLETypeLib"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLETypeLibID"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLETypeLibMajor"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLETypeLibMinor"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GeneratePropPageIDs"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLEPropPageIDs"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateDispatchMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockProperties"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockFunctions"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DispatchDefValue"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateDispIdEnum"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISP_ID_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateInterfaceMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"INTERFACE_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"InitInterface"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateEventMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENT_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENT_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"EVENT_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockEvents"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateEventSinkMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENTSINK_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENTSINK_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"EVENTSINK_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"PropNotifySinks"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateConnectionMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CONNECTION_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"ConnectionPointIID"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"InheritanceType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DeclSpec"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"OLECommands"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MFCDeclares"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"ATL_Declares"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateCOMMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"COM_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateConnectionPointMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CONNECTION_POINT_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateMsgMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSG_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GeneratePropertyMap"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"PROPERTY_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MFCImplements"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Type"
+			value      	("MSVCOperationTypeSet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSVCOperationTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Normal"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Virtual_Override"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Message_Handler"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dispatch_Handler"
+				value      	3)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Event_Firing_Function"
+				value      	4)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Event_Sink_Handler"
+				value      	5)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Std_OLE_Method"
+				value      	6)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Command_Parser"
+				value      	7)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Property_Get_Function"
+				value      	8)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Property_Set_Function"
+				value      	9)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Property_Notify_Function"
+				value      	10)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Macro_Generated_Function"
+				value      	11)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_MSG_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MESSAGE_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENT_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"EVENT_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_EVENTSINK_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"EVENTSINK_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CallType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DeclSpec"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"BodyImage"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Type"
+			value      	("MSVCAttributeTypeSet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSVCAttributeTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Normal"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Member_Property"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Get_Set_Property"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dialog_Data"
+				value      	3)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Field_Data"
+				value      	4)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Stock_Property"
+				value      	5)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DeclSpec"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"PointerBase"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CallType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockPropertyImplementation"
+			value      	"")))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Has"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Type"
+			value      	("MSVCAttributeTypeSet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSVCAttributeTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Normal"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Member_Property"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Get_Set_Property"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dialog_Data"
+				value      	3)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Field_Data"
+				value      	4)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Stock_Property"
+				value      	5)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DeclSpec"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"PointerBase"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CallType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockPropertyImplementation"
+			value      	"")))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"Type"
+			value      	("MSVCAttributeTypeSet" 0))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"MSVCAttributeTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Normal"
+				value      	0)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Member_Property"
+				value      	1)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Get_Set_Property"
+				value      	2)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Dialog_Data"
+				value      	3)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Field_Data"
+				value      	4)
+			    (object Attribute
+				tool       	"MSVC"
+				name       	"Stock_Property"
+				value      	5)))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DISPATCH_MAP_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"DeclSpec"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"PointerBase"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"CallType"
+			value      	"")
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"StockPropertyImplementation"
+			value      	"")))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateIncludesGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_INCLUDES_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateInsertLocation"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"MSVC"
+		name       	"default__Module-Body"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateIncludesGroup"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"AFX_INCLUDES_Entries"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"MSVC"
+			name       	"GenerateInsertLocation"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"DDL"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"DDL"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"DDL"
+			name       	"DataBase"
+			value      	("DataBaseSet" 800))
+		    (object Attribute
+			tool       	"DDL"
+			name       	"DataBaseSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"DDL"
+				name       	"ANSI"
+				value      	800)
+			    (object Attribute
+				tool       	"DDL"
+				name       	"Oracle"
+				value      	801)
+			    (object Attribute
+				tool       	"DDL"
+				name       	"SQLServer"
+				value      	802)
+			    (object Attribute
+				tool       	"DDL"
+				name       	"Sybase"
+				value      	803)
+			    (object Attribute
+				tool       	"DDL"
+				name       	"Watcom"
+				value      	804)))
+		    (object Attribute
+			tool       	"DDL"
+			name       	"PrimaryKeyColumnName"
+			value      	"Id")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"PrimaryKeyColumnType"
+			value      	"NUMBER(5)")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"ViewName"
+			value      	"V_")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"TableName"
+			value      	"T_")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"InheritSuffix"
+			value      	"_V")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"DropClause"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"BaseViews"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"DDLScriptFilename"
+			value      	"DDL1.SQL")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"Directory"
+			value      	"AUTO GENERATE")))
+	    (object Attribute
+		tool       	"DDL"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"DDL"
+			name       	"ColumnType"
+			value      	"VARCHAR")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"Length"
+			value      	"")
+		    (object Attribute
+			tool       	"DDL"
+			name       	"NullsOK"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"PrimaryKey"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"Unique"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"CompositeUnique"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"DDL"
+			name       	"CheckConstraint"
+			value      	"")))
+	    (object Attribute
+		tool       	"DDL"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"framework"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"IDL"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"StopOnError"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"Directory"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GeneratePreserveRegions"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"ImplementationType"
+			value      	"")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"ConstValue"
+			value      	"")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateDefaultSpecifier"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"DefaultSpecifier"
+			value      	"")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IDLElement"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IDLSpecificationType"
+			value      	("IDLSpecSet" 22))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IDLSpecSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Interface"
+				value      	22)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Typedef"
+				value      	54)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Enumeration"
+				value      	8)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Const"
+				value      	71)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Exception"
+				value      	61)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Struct"
+				value      	51)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Union"
+				value      	81)))))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"FileName"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateIDLModule"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"InclusionProtectionSymbol"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IncludeBySimpleName"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Module-Body"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"FileName"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IncludeBySimpleName"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"OperationIsOneWay"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"Context"
+			value      	"")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"Raises"
+			value      	"")))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"CaseSpecifier"
+			value      	"")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IsConst"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"ConstValue"
+			value      	"")))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Has"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"NameIfUnlabeled"
+			value      	"the_$supplier")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateForwardReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"BoundedHasRelType"
+			value      	("HasRelTypeSet" 47))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"HasRelTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Array"
+				value      	24)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Sequence"
+				value      	47)))))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"NameIfUnlabeled"
+			value      	"the_$supplier")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"DataMemberName"
+			value      	"$relationship")
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateForwardReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"IDL"
+			name       	"BoundedRoleType"
+			value      	("AssocTypeSet" 47))
+		    (object Attribute
+			tool       	"IDL"
+			name       	"AssocTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Array"
+				value      	24)
+			    (object Attribute
+				tool       	"IDL"
+				name       	"Sequence"
+				value      	47)))))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Uses"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"GenerateForwardReference"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"default__Subsystem"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"IDL"
+			name       	"Directory"
+			value      	"AUTO GENERATE")))
+	    (object Attribute
+		tool       	"IDL"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Java"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"StopOnError"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Directory"
+			value      	"AUTO GENERATE")
+		    (object Attribute
+			tool       	"Java"
+			name       	"UsePrefixes"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"InstanceVariablePrefix"
+			value      	"m_")
+		    (object Attribute
+			tool       	"Java"
+			name       	"ClassVariablePrefix"
+			value      	"s_")
+		    (object Attribute
+			tool       	"Java"
+			name       	"DefaultAttributeDataType"
+			value      	"int")
+		    (object Attribute
+			tool       	"Java"
+			name       	"DefaultOperationReturnType"
+			value      	"void")
+		    (object Attribute
+			tool       	"Java"
+			name       	"Editor"
+			value      	("EditorType" 100))
+		    (object Attribute
+			tool       	"Java"
+			name       	"VM"
+			value      	("VMType" 200))
+		    (object Attribute
+			tool       	"Java"
+			name       	"ClassPath"
+			value      	"")
+		    (object Attribute
+			tool       	"Java"
+			name       	"EditorType"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Java"
+				name       	"BuiltIn"
+				value      	100)
+			    (object Attribute
+				tool       	"Java"
+				name       	"WindowsShell"
+				value      	101)))
+		    (object Attribute
+			tool       	"Java"
+			name       	"VMType"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Java"
+				name       	"Sun"
+				value      	200)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Microsoft"
+				value      	201)))
+		    (object Attribute
+			tool       	"Java"
+			name       	"GlobalImports"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Java"
+			name       	"OpenBraceClassStyle"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"UseTabs"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"UseSpaces"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"SpacingItems"
+			value      	3)
+		    (object Attribute
+			tool       	"Java"
+			name       	"CommentLength"
+			value      	2)
+		    (object Attribute
+			tool       	"Java"
+			name       	"RoseDefaultCommentStyle"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"AsteriskCommentStyle"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavaCommentStyle"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocAuthor"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocDeprecated"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocException"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocParam"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocReturn"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocSee"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocSerial"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocSerialdata"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocSerialfield"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocSince"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocVersion"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"JavadocLink"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"Final"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateDefaultConstructor"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"ConstructorIs"
+			value      	("Ctor_Set" 62))
+		    (object Attribute
+			tool       	"Java"
+			name       	"Ctor_Set"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Java"
+				name       	"public"
+				value      	62)
+			    (object Attribute
+				tool       	"Java"
+				name       	"protected"
+				value      	63)
+			    (object Attribute
+				tool       	"Java"
+				name       	"private"
+				value      	64)
+			    (object Attribute
+				tool       	"Java"
+				name       	"package"
+				value      	65)))
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateFinalizer"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateStaticInitializer"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateInstanceInitializer"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Static"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"CmIdentification"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Java"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Java"
+			name       	"AdditionalImports"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Module-Body"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"CmIdentification"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Java"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Java"
+			name       	"AdditionalImports"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"Abstract"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Static"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Final"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Native"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Synchronized"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"DefaultBody"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"Java"
+			name       	"ReplaceExistingBody"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Final"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Transient"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Volatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"PropertyType"
+			value      	("BeanProperty_Set" 71))
+		    (object Attribute
+			tool       	"Java"
+			name       	"BeanProperty_Set"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Java"
+				name       	"Not A Property"
+				value      	71)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Simple"
+				value      	72)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Bound"
+				value      	73)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Constrained"
+				value      	74)))
+		    (object Attribute
+			tool       	"Java"
+			name       	"IndividualChangeMgt"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Read/Write"
+			value      	("Read/Write_Set" 81))
+		    (object Attribute
+			tool       	"Java"
+			name       	"Read/Write_Set"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Java"
+				name       	"Read & Write"
+				value      	81)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Read Only"
+				value      	82)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Write Only"
+				value      	83)))
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateFullyQualifiedTypes"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"Java"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Java"
+			name       	"GenerateDataMember"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"ContainerClass"
+			value      	"")
+		    (object Attribute
+			tool       	"Java"
+			name       	"InitialValue"
+			value      	"")
+		    (object Attribute
+			tool       	"Java"
+			name       	"Final"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Transient"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Volatile"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"PropertyType"
+			value      	("BeanProperty_Set" 71))
+		    (object Attribute
+			tool       	"Java"
+			name       	"BeanProperty_Set"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Java"
+				name       	"Not A Property"
+				value      	71)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Simple"
+				value      	72)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Bound"
+				value      	73)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Constrained"
+				value      	74)))
+		    (object Attribute
+			tool       	"Java"
+			name       	"IndividualChangeMgt"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Java"
+			name       	"Read/Write"
+			value      	("Read/Write_Set" 81))
+		    (object Attribute
+			tool       	"Java"
+			name       	"Read/Write_Set"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"Java"
+				name       	"Read & Write"
+				value      	81)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Read Only"
+				value      	82)
+			    (object Attribute
+				tool       	"Java"
+				name       	"Write Only"
+				value      	83)))))
+	    (object Attribute
+		tool       	"Java"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Objectory41"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"TypeLibImporter"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"ROBE"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"Editor"
+			value      	("EditorType" 100))
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"IncludePath"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"StopOnError"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"EditorType"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"CORBA"
+				name       	"BuiltIn"
+				value      	100)
+			    (object Attribute
+				tool       	"CORBA"
+				name       	"WindowsShell"
+				value      	101)))))
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"ArrayDimensions"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"ConstValue"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"ImplementationType"
+			value      	"")))
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"InclusionProtectionSymbol"
+			value      	"AUTO GENERATE")))
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"default__Module-Body"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"AdditionalIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"CmIdentification"
+			value      	(value Text "  %X% %Q% %Z% %W%"))
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"CopyrightNotice"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"InclusionProtectionSymbol"
+			value      	"AUTO GENERATE")))
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"Context"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"OperationIsOneWay"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"ArrayDimensions"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"CaseSpecifier"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"Order"
+			value      	"")))
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"ArrayDimensions"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"CaseSpecifier"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"GenerateForwardReference"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"IsReadOnly"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"Order"
+			value      	"")
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"BoundedRoleType"
+			value      	("AssocTypeSet" 47))
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"AssocTypeSet"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"CORBA"
+				name       	"Array"
+				value      	24)
+			    (object Attribute
+				tool       	"CORBA"
+				name       	"Sequence"
+				value      	47)))))
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"default__Uses"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"CORBA"
+			name       	"GenerateForwardReference"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"CORBA"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Rational Unified Process"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Rose Web Publisher"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"SoDA"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"COM"
+		name       	"propertyId"
+		value      	"783606378")
+	    (object Attribute
+		tool       	"COM"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"COM"
+			name       	"TypeKinds"
+			value      	(list Attribute_Set
+			    (object Attribute
+				tool       	"COM"
+				name       	"enum"
+				value      	100)
+			    (object Attribute
+				tool       	"COM"
+				name       	"record"
+				value      	101)
+			    (object Attribute
+				tool       	"COM"
+				name       	"module"
+				value      	102)
+			    (object Attribute
+				tool       	"COM"
+				name       	"interface"
+				value      	103)
+			    (object Attribute
+				tool       	"COM"
+				name       	"dispinterface"
+				value      	104)
+			    (object Attribute
+				tool       	"COM"
+				name       	"coclass"
+				value      	105)
+			    (object Attribute
+				tool       	"COM"
+				name       	"alias"
+				value      	106)
+			    (object Attribute
+				tool       	"COM"
+				name       	"union"
+				value      	107)
+			    (object Attribute
+				tool       	"COM"
+				name       	"max"
+				value      	108)
+			    (object Attribute
+				tool       	"COM"
+				name       	"(none)"
+				value      	109)))
+		    (object Attribute
+			tool       	"COM"
+			name       	"kind"
+			value      	("TypeKinds" 105))
+		    (object Attribute
+			tool       	"COM"
+			name       	"uuid"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"version"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"helpstring"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"helpcontext"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"attributes"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"dllname"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"alias"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"Generate"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"COM"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"COM"
+			name       	"helpstring"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"attributes"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"COM"
+			name       	"id"
+			value      	"")))
+	    (object Attribute
+		tool       	"COM"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"COM"
+			name       	"filename"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"library"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"imports"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"uuid"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"version"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"helpstring"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"helpfile"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"helpcontext"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"lcid"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"attributes"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"Generate"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"COM"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Version Control"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"Data Access"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"Data Access"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Data Access"
+			name       	"project"
+			value      	" ")))
+	    (object Attribute
+		tool       	"Data Access"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"RequisitePro"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"cg"
+		name       	"compiler2.1__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowGenerateOverNewerAnnotations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowGenerateOverNewerVersion"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileExtension"
+			value      	"h")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileBackupExtension"
+			value      	"h~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileTemporaryExtension"
+			value      	"h#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileExtension"
+			value      	"cpp")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileBackupExtension"
+			value      	"cp~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileTemporaryExtension"
+			value      	"cp#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StopOnError"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ErrorLimit"
+			value      	30)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Directory"
+			value      	"$ROSECPP_SOURCE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BooleanType"
+			value      	"int")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowTemplates"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowExplicitInstantiations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowProtectedInheritance"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByValueContainer"
+			value      	"$targetClass")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByValueContainer"
+			value      	"OptionalByValue(sizeof($targetClass))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByValueContainer"
+			value      	"BoundedListByValue(sizeof($targetClass),$limit)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByValueContainer"
+			value      	"BoundedSetByValue(sizeof($targetClass),$limit)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByReferenceContainer"
+			value      	"BoundedListByReference($limit)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByReferenceContainer"
+			value      	"BoundedSetByReference($limit)")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByValueContainer"
+			value      	"UnboundedListByValue(sizeof($targetClass))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByValueContainer"
+			value      	"UnboundedSetByValue(sizeof($targetClass))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByReferenceContainer"
+			value      	"UnboundedListByReference")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByReferenceContainer"
+			value      	"UnboundedSetByReference")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByValueContainer"
+			value      	"AssociationByValue(sizeof($qualtype), sizeof($qualcont))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByValueContainer"
+			value      	"DictionaryByValue(sizeof($qualtype), sizeof($qualcont))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByReferenceContainer"
+			value      	"AssociationByReference(sizeof($qualtype), sizeof($qualcont))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByReferenceContainer"
+			value      	"DictionaryByReference(sizeof($qualtype), sizeof($qualcont))")
+		    (object Attribute
+			tool       	"cg"
+			name       	"PathSeparator"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FileNameFormat"
+			value      	"128vx_b")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AlwaysKeepOrphanedCode"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"UseMSVC"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CommentWidth"
+			value      	60)))
+	    (object Attribute
+		tool       	"cg"
+		name       	"compiler3.0__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowGenerateOverNewerAnnotations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowGenerateOverNewerVersion"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileExtension"
+			value      	"h")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileBackupExtension"
+			value      	"h~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"HeaderFileTemporaryExtension"
+			value      	"h#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileExtension"
+			value      	"cpp")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileBackupExtension"
+			value      	"cp~")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CodeFileTemporaryExtension"
+			value      	"cp#")
+		    (object Attribute
+			tool       	"cg"
+			name       	"CreateMissingDirectories"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"StopOnError"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"ErrorLimit"
+			value      	30)
+		    (object Attribute
+			tool       	"cg"
+			name       	"Directory"
+			value      	"$ROSECPP_SOURCE")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BooleanType"
+			value      	"int")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowTemplates"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowExplicitInstantiations"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"AllowProtectedInheritance"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByValueContainer"
+			value      	"$targetClass")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OneByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByValueContainer"
+			value      	"OptionalByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"OptionalByReferenceContainer"
+			value      	"$targetClass *")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByValueContainer"
+			value      	"$targetClass[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedFixedByReferenceContainer"
+			value      	"$targetClass *[$limit]")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByValueContainer"
+			value      	"BoundedListByValue<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByValueContainer"
+			value      	"BoundedSetByValue<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"BoundedByReferenceContainer"
+			value      	"BoundedListByReference<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedBoundedByReferenceContainer"
+			value      	"BoundedSetByReference<$targetClass,$limit>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByValueContainer"
+			value      	"UnboundedListByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByValueContainer"
+			value      	"UnboundedSetByValue<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnboundedByReferenceContainer"
+			value      	"UnboundedListByReference<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedUnboundedByReferenceContainer"
+			value      	"UnboundedSetByReference<$targetClass>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByValueContainer"
+			value      	"AssociationByValue<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByValueContainer"
+			value      	"DictionaryByValue<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"QualifiedByReferenceContainer"
+			value      	"AssociationByReference<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"UnorderedQualifiedByReferenceContainer"
+			value      	"DictionaryByReference<$qualtype, $qualcont>")
+		    (object Attribute
+			tool       	"cg"
+			name       	"PathSeparator"
+			value      	"")
+		    (object Attribute
+			tool       	"cg"
+			name       	"FileNameFormat"
+			value      	"128vx_b")
+		    (object Attribute
+			tool       	"cg"
+			name       	"AlwaysKeepOrphanedCode"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"UseMSVC"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"cg"
+			name       	"CommentWidth"
+			value      	60)))
+	    (object Attribute
+		tool       	"Rose Model Integrator"
+		name       	"HiddenTool"
+		value      	FALSE)
+	    (object Attribute
+		tool       	"COM"
+		name       	"default__Param"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"COM"
+			name       	"attributes"
+			value      	"")))
+	    (object Attribute
+		tool       	"Visual Basic"
+		name       	"default__Param"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ByVal"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ByRef"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"Optional"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"Visual Basic"
+			name       	"ParamArray"
+			value      	FALSE)))
+	    (object Attribute
+		tool       	"COM"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"COM"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"COM"
+			name       	"id"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"helpstring"
+			value      	"")
+		    (object Attribute
+			tool       	"COM"
+			name       	"attributes"
+			value      	"")))
+	    (object Attribute
+		tool       	"VC++"
+		name       	"propertyId"
+		value      	"809135966")
+	    (object Attribute
+		tool       	"VC++"
+		name       	"default__Project"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"VC++"
+			name       	"UpdateATL"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"SmartPointersOnAssoc"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"GenerateImports"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"PutImportsIn"
+			value      	"stdafx.h")
+		    (object Attribute
+			tool       	"VC++"
+			name       	"FullPathInImports"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"UseImportAttributes"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"ImportAttributes"
+			value      	"no_namespace named_guids")
+		    (object Attribute
+			tool       	"VC++"
+			name       	"ImportProjTypeLib"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"DefaultTypeLib"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"TypeLibLocation"
+			value      	"")
+		    (object Attribute
+			tool       	"VC++"
+			name       	"CompileProjTypeLib"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"RvcPtyVersion"
+			value      	"1.0")
+		    (object Attribute
+			tool       	"VC++"
+			name       	"ModelIDStyle"
+			value      	2)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"DocStyle"
+			value      	1)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"GenerateIncludes"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"ApplyPattern"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"CreateBackupFiles"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"SupportCodeName"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"DocRevEngineer"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"CreateOverviewDiagrams"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"UpdateModelIDsInCode"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"AttributeTypes"
+			value      	(value Text 
+|attr1=bool
+|attr2=short
+|attr3=int
+|attr4=long
+|attr5=char
+|attr6=float
+|attr7=double
+|attr8=void
+|attr9=clock_t
+|attr10=_complex
+|attr11=_dev_t
+|attr12=div_t
+|attr13=_exception
+|attr14=FILE
+|attr15=_finddata_t
+|attr16=_FPIEEE_RECORD
+|attr17=fpos_t
+|attr18=_HEAPINFO
+|attr19=jmp_buf
+|attr20=lconv
+|attr21=ldiv_t
+|attr22=_off_t
+|attr23=_onexit_t
+|attr24=_PNH
+|attr25=ptrdiff_t
+|attr26=sig_atomic_t
+|attr27=size_t
+|attr28=_stat
+|attr29=time_t
+|attr30=_timeb
+|attr31=tm
+|attr32=_utimbuf
+|attr33=va_list
+|attr34=wchar_t
+|attr35=wctrans_t
+|attr36=wctype_t
+|attr37=_wfinddata_t
+|attr38=_wfinddatai64_t
+|attr39=wint_t
+|attr40=ABORTPROC
+|attr41=ACMDRIVERENUMCB
+|attr42=ACMDRIVERPROC
+|attr43=ACMFILTERCHOOSEHOOKPROC
+|attr44=ACMFILTERENUMCB
+|attr45=ACMFILTERTAGENUMCB
+|attr46=ACMFORMATCHOOSEHOOKPROC
+|attr47=ACMFORMATENUMCB
+|attr48=ACMFORMATTAGENUMCB
+|attr49=APPLET_PROC
+|attr50=ATOM
+|attr51=BOOL
+|attr52=BOOLEAN
+|attr53=BYTE
+|attr54=CALINFO_ENUMPROC
+|attr55=CALLBACK
+|attr56=CHAR
+|attr57=COLORREF
+|attr58=CONST
+|attr59=CRITICAL_SECTION
+|attr60=CTRYID
+|attr61=DATEFMT_ENUMPROC
+|attr62=DESKTOPENUMPROC
+|attr63=DLGPROC
+|attr64=DRAWSTATEPROC
+|attr65=DWORD
+|attr66=EDITWORDBREAKPROC
+|attr67=ENHMFENUMPROC
+|attr68=ENUMRESLANGPROC
+|attr69=ENUMRESNAMEPROC
+|attr70=ENUMRESTYPEPROC
+|attr71=FARPROC
+|attr72=FILE_SEGMENT_ELEMENT
+|attr73=FLOAT
+|attr74=FONTENUMPROC
+|attr75=GOBJENUMPROC
+|attr76=GRAYSTRINGPROC
+|attr77=HACCEL
+|attr78=HANDLE
+|attr79=HBITMAP
+|attr80=HBRUSH
+|attr81=HCOLORSPACE
+|attr82=HCONV
+|attr83=HCONVLIST
+|attr84=HCURSOR
+|attr85=HDC
+|attr86=HDDEDATA
+|attr87=HDESK
+|attr88=HDROP
+|attr89=HDWP
+|attr90=HENHMETAFILE
+|attr91=HFILE
+|attr92=HFONT
+|attr93=HGDIOBJ
+|attr94=HGLOBAL
+|attr95=HHOOK
+|attr96=HICON
+|attr97=HIMAGELIST
+|attr98=HIMC
+|attr99=HINSTANCE
+|attr100=HKEY
+|attr101=HKL
+|attr102=HLOCAL
+|attr103=HMENU
+|attr104=HMETAFILE
+|attr105=HMODULE
+|attr106=HMONITOR
+|attr107=HOOKPROC
+|attr108=HPALETTE
+|attr109=HPEN
+|attr110=HRGN
+|attr111=HRSRC
+|attr112=HSZ
+|attr113=HTREEITEM
+|attr114=HWINSTA
+|attr115=HWND
+|attr116=INT
+|attr117=IPADDR
+|attr118=LANGID
+|attr119=LCID
+|attr120=LCSCSTYPE
+|attr121=LCSGAMUTMATCH
+|attr122=LCTYPE
+|attr123=LINEDDAPROC
+|attr124=LOCALE_ENUMPROC
+|attr125=LONG
+|attr126=LONGLONG
+|attr127=LPARAM
+|attr128=LPBOOL
+|attr129=LPBYTE
+|attr130=LPCCHOOKPROC
+|attr131=LPCFHOOKPROC
+|attr132=LPCOLORREF
+|attr133=LPCRITICAL_SECTION
+|attr134=LPCSTR
+|attr135=LPCTSTR
+|attr136=LPCVOID
+|attr137=LPCWSTR
+|attr138=LPDWORD
+|attr139=LPFIBER_START_ROUTINE
+|attr140=LPFRHOOKPROC
+|attr141=LPHANDLE
+|attr142=LPHANDLER_FUNCTION
+|attr143=LPINT
+|attr144=LPLONG
+|attr145=LPOFNHOOKPROC
+|attr146=LPPAGEPAINTHOOK
+|attr147=LPPAGESETUPHOOK
+|attr148=LPPRINTHOOKPROC
+|attr149=LPPROGRESS_ROUTINE
+|attr150=LPSETUPHOOKPROC
+|attr151=LPSTR
+|attr152=LPSTREAM
+|attr153=LPTHREAD_START_ROUTINE
+|attr154=LPTSTR
+|attr155=LPVOID
+|attr156=LPWORD
+|attr157=LPWSTR
+|attr158=LRESULT
+|attr159=LUID
+|attr160=PBOOL
+|attr161=PBOOLEAN
+|attr162=PBYTE
+|attr163=PCHAR
+|attr164=PCRITICAL_SECTION
+|attr165=PCSTR
+|attr166=PCTSTR
+|attr167=PCWCH
+|attr168=PCWSTR
+|attr169=PDWORD
+|attr170=PFLOAT
+|attr171=PFNCALLBACK
+|attr172=PHANDLE
+|attr173=PHANDLER_ROUTINE
+|attr174=PHKEY
+|attr175=PINT
+|attr176=PLCID
+|attr177=PLONG
+|attr178=PLUID
+|attr179=PROPENUMPROC
+|attr180=PROPENUMPROCEX
+|attr181=PSHORT
+|attr182=PSTR
+|attr183=PTBYTE
+|attr184=PTCHAR
+|attr185=PTIMERAPCROUTINE
+|attr186=PTSTR
+|attr187=PUCHAR
+|attr188=PUINT
+|attr189=PULONG
+|attr190=PUSHORT
+|attr191=PVOID
+|attr192=PWCHAR
+|attr193=PWORD
+|attr194=PWSTR
+|attr195=REGISTERWORDENUMPROC
+|attr196=REGSAM
+|attr197=SC_HANDLE
+|attr198=SC_LOCK
+|attr199=SENDASYNCPROC
+|attr200=SERVICE_STATUS_HANDLE
+|attr201=SHORT
+|attr202=TBYTE
+|attr203=TCHAR
+|attr204=TIMEFMT_ENUMPROC
+|attr205=TIMERPROC
+|attr206=UCHAR
+|attr207=UINT
+|attr208=ULONG
+|attr209=ULONGLONG
+|attr210=UNSIGNED
+|attr211=USHORT
+|attr212=VOID
+|attr213=WCHAR
+|attr214=WINAPI
+|attr215=WINSTAENUMPROC
+|attr216=WNDENUMPROC
+|attr217=WNDPROC
+|attr218=WORD
+|attr219=WPARAM
+|attr220=YIELDPROC
+|attr221=CPoint
+|attr222=CRect
+|attr223=CSize
+|attr224=CString
+|attr225=CTime
+|attr226=CTimeSpan
+|attr227=CCreateContext
+|attr228=CMemoryState
+|attr229=COleSafeArray
+|attr230=CPrintInfo
+			))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Containers"
+			value      	(value Text 
+|cont1=CArray<$TYPE, $TYPE&>
+|cont2=CByteArray
+|cont3=CDWordArray
+|cont4=CObArray
+|cont5=CPtrArray
+|cont6=CStringArray
+|cont7=CUIntArray
+|cont8=CWordArray
+|cont9=CList<$TYPE, $TYPE&>
+|cont10=CPtrList
+|cont11=CObList
+|cont12=CStringList
+|cont13=CMapWordToPtr
+|cont14=CMapPtrToWord
+|cont15=CMapPtrToPtr
+|cont16=CMapWordToOb
+|cont17=CMapStringToPtr
+|cont18=CMapStringToOb
+|cont19=CMapStringToString
+|cont20=CTypedPtrArray<CPtrArray, $TYPE*>
+|cont21=CTypedPtrArray<CObArray, $TYPE*>
+|cont22=CTypedPtrList<CObList, $TYPE*>
+|cont23=CTypedPtrList<CPtrList, $TYPE*>
+			))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"ClassMethods"
+			value      	(value Text 
+|*_body=// ToDo: Add your specialized code here and/or call the base class
+|cm1=$NAME()
+|cm2=$NAME(orig:const $NAME&)
+|cm3=<<virtual>> ~$NAME()
+|cm4=operator=(rhs:$NAME&):$NAME&
+|cm4_body=// ToDo: Add your specialized code here and/or call the base class||return rhs;
+|cm5=<<const>> operator==(rhs:const $NAME&):bool
+|cm5_body=// ToDo: Add your specialized code here and/or call the base class||return false;
+|cm6=<<const>> operator!=(rhs:$NAME&):bool
+|cm6_body=// ToDo: Add your specialized code here and/or call the base class||return false;
+|cm7=<<const>> operator<(rhs:$NAME&):bool
+|cm7_body=// ToDo: Add your specialized code here and/or call the base class||return false;
+|cm8=<<const>> operator>(rhs:$NAME&):bool
+|cm8_body=// ToDo: Add your specialized code here and/or call the base class||return false;
+|cm9=<<const>> operator<=(rhs:$NAME&):bool
+|cm9_body=// ToDo: Add your specialized code here and/or call the base class||return false;
+|cm10=<<const>> operator>=(rhs:$NAME&):bool
+|cm10_body=// ToDo: Add your specialized code here and/or call the base class||return false;
+|cm11=<<friend>> operator>>(i:istream&, rhs:$NAME&):istream&
+|cm11_body=// ToDo: Add your specialized code here and/or call the base class||return i;
+|cm12=<<friend>> operator<<(o:ostream&, rhs:const $NAME&):ostream&
+|cm12_body=// ToDo: Add your specialized code here and/or call the base class||return o;
+			))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Accessors"
+			value      	(value Text 
+|agf=<<const>> get_$BASICNAME():const $TYPE
+|agf_body=return $NAME;
+|asf=set_$BASICNAME(value:$TYPE):void
+|asf_body=$NAME = value;|return;
+|agv=<<const>> get_$BASICNAME():const $TYPE&
+|agv_body=return $NAME;
+|asv=set_$BASICNAME(value:$TYPE&):void
+|asv_body=$NAME = value;|return;
+|agp=<<const>> get_$BASICNAME():const $TYPE
+|agp_body=return $NAME;
+|asp=set_$BASICNAME(value:$TYPE):void
+|asp_body=$NAME = value;|return;
+|agr=<<const>> get_$BASICNAME():const $TYPE
+|agr_body=return $NAME;
+|asr=set_$BASICNAME(value:$TYPE):void
+|asr_body=$NAME = value;|return;
+|aga=<<const>> get_$BASICNAME(index:int):const $TYPE
+|aga_body=return $NAME[index];
+|asa=set_$BASICNAME(index:int, value:$TYPE):void
+|asa_body=$NAME[index] = value;|return;
+			))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Conditionals"
+			value      	(value Text 
+|*_decl=#ifdef _DEBUG
+|*_base=CObject
+|cond1=<<virtual, const>> AssertValid():void
+|cond1_body=$SUPERNAME::AssertValid();
+|cond2=<<virtual, const>> Dump(dc:CDumpContext&):void
+|cond2_body=$SUPERNAME::Dump(dc);
+			))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Patterns"
+			value      	(value Text 
+|patrn1=cm1,cm3,cond1,cond2
+|Patrn1_name=Default
+			))))
+	    (object Attribute
+		tool       	"VC++"
+		name       	"default__Class"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Generate"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"VC++"
+		name       	"default__Module-Spec"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"VC++"
+			name       	"InternalMap"
+			value      	(value Text 
+|*:AUTO:AUTO
+|
+			))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"ExportMap"
+			value      	(value Text 
+|*:AUTO:AUTO
+|
+			))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"InitialSourceIncludes"
+			value      	(value Text 
+|"stdafx.h"
+			))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"InitialHeaderIncludes"
+			value      	(value Text ""))
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Copyright"
+			value      	(value Text "Copyright (C) 1991 - 1999 Rational Software Corporation"))))
+	    (object Attribute
+		tool       	"VC++"
+		name       	"default__Role"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Const"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"InitialValue"
+			value      	"")))
+	    (object Attribute
+		tool       	"VC++"
+		name       	"default__Attribute"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Generate"
+			value      	TRUE)))
+	    (object Attribute
+		tool       	"VC++"
+		name       	"default__Operation"
+		value      	(list Attribute_Set
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Generate"
+			value      	TRUE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"Inline"
+			value      	FALSE)
+		    (object Attribute
+			tool       	"VC++"
+			name       	"DefaultBody"
+			value      	(value Text ""))))
+	    (object Attribute
+		tool       	"VC++"
+		name       	"HiddenTool"
+		value      	FALSE))
+	quid       	"34DBB4830145"))
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tzservices/tzserver/analysis/Integration Test Design.cat	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,469 @@
+
+(object Petal
+    version    	43
+    _written   	"Rose 6.1.9113.5"
+    charSet    	0)
+
+(object Class_Category "DST Integration Test"
+    is_unit    	TRUE
+    is_loaded  	TRUE
+    quid       	"410F8AD50291"
+    exportControl 	"Public"
+    logical_models 	(list unit_reference_list
+	(object Class "CIntTestStepCompareTimes"
+	    quid       	"410F6666011A"
+	    superclasses 	(list inheritance_relationship_list
+		(object Inheritance_Relationship
+		    quid       	"410F66A001C6"
+		    supplier   	"Logical View::Design Model::DST Integration Test::CIntTestStep"
+		    quidu      	"410F5C850361")))
+	(object Class "CTestServer"
+	    quid       	"410F5BEE03BF")
+	(object Class "CIntTestStepImportVcal"
+	    quid       	"410F63D900AD"
+	    superclasses 	(list inheritance_relationship_list
+		(object Inheritance_Relationship
+		    quid       	"410F669B0291"
+		    supplier   	"Logical View::Design Model::DST Integration Test::CIntTestStep"
+		    quidu      	"410F5C850361")))
+	(object Class "CIntTestStepSetLocation"
+	    quid       	"410F63C4004F"
+	    superclasses 	(list inheritance_relationship_list
+		(object Inheritance_Relationship
+		    quid       	"410F669503D9"
+		    supplier   	"Logical View::Design Model::DST Integration Test::CIntTestStep"
+		    quidu      	"410F5C850361")))
+	(object Class "CIntTest02Step"
+	    quid       	"410F63120233")
+	(object Class "CIntTestStepReadLocation"
+	    quid       	"410F5F110272"
+	    superclasses 	(list inheritance_relationship_list
+		(object Inheritance_Relationship
+		    quid       	"410F6699010A"
+		    supplier   	"Logical View::Design Model::DST Integration Test::CIntTestStep"
+		    quidu      	"410F5C850361")))
+	(object Class "CIntTestStep"
+	    quid       	"410F5C850361"
+	    superclasses 	(list inheritance_relationship_list
+		(object Inheritance_Relationship
+		    quid       	"410F5CDC0233"
+		    supplier   	"Logical View::Design Model::DST Integration Test::CDSTTestStep"
+		    quidu      	"410F5C7A011F")))
+	(object Class "CDSTTestStep"
+	    quid       	"410F5C7A011F"
+	    superclasses 	(list inheritance_relationship_list
+		(object Inheritance_Relationship
+		    quid       	"410F5CE20243"
+		    supplier   	"Logical View::Design Model::DST Integration Test::CTestStep"
+		    quidu      	"410F5C6F0015"))
+	    operations 	(list Operations
+		(object Operation "TestL"
+		    quid       	"411381F60235"
+		    concurrency 	"Sequential"
+		    opExportControl 	"Public"
+		    uid        	0)))
+	(object Class "CTestStep"
+	    quid       	"410F5C6F0015"
+	    documentation 	
+|
+|
+	    
+	    operations 	(list Operations
+		(object Operation "doTestStepPreamble"
+		    quid       	"41137E14015A"
+		    concurrency 	"Sequential"
+		    opExportControl 	"Public"
+		    uid        	0)
+		(object Operation "doTestStep"
+		    quid       	"41137E49012B"
+		    concurrency 	"Sequential"
+		    opExportControl 	"Public"
+		    uid        	0)
+		(object Operation "doTestStepPostamble"
+		    quid       	"41137E52037D"
+		    concurrency 	"Sequential"
+		    opExportControl 	"Public"
+		    uid        	0)))
+	(object Class "CIntTestServer"
+	    quid       	"410F5C100286"
+	    superclasses 	(list inheritance_relationship_list
+		(object Inheritance_Relationship
+		    quid       	"410F5C30019C"
+		    supplier   	"Logical View::Design Model::DST Integration Test::CDSTTestServer"
+		    quidu      	"410F5C050025"))
+	    used_nodes 	(list uses_relationship_list
+		(object Uses_Relationship
+		    quid       	"410F5EE8009D"
+		    supplier   	"Logical View::Design Model::DST Integration Test::CTestStep"
+		    quidu      	"410F5C6F0015"
+		    supplier_cardinality 	(value cardinality "1..n"))))
+	(object Class "CDSTTestServer"
+	    quid       	"410F5C050025"
+	    superclasses 	(list inheritance_relationship_list
+		(object Inheritance_Relationship
+		    quid       	"410F5C290229"
+		    supplier   	"Logical View::Design Model::DST Integration Test::CTestServer"
+		    quidu      	"410F5BEE03BF"))))
+    logical_presentations 	(list unit_reference_list
+	(object ClassDiagram "DST Integration Test design"
+	    quid       	"410F8B1103C9"
+	    title      	"DST Integration Test design"
+	    zoom       	100
+	    max_height 	28350
+	    max_width  	21600
+	    origin_x   	0
+	    origin_y   	0
+	    items      	(list diagram_item_list
+		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CTestServer" @1
+		    ShowCompartmentStereotypes 	TRUE
+		    IncludeAttribute 	TRUE
+		    IncludeOperation 	TRUE
+		    location   	(224, 249)
+		    label      	(object ItemLabel
+			Parent_View 	@1
+			location   	(96, 200)
+			fill_color 	13434879
+			nlines     	1
+			max_width  	256
+			justify    	0
+			label      	"CTestServer")
+		    icon_style 	"Icon"
+		    line_color 	3342489
+		    fill_color 	13434879
+		    quidu      	"410F5BEE03BF"
+		    width      	274
+		    height     	120
+		    annotation 	8
+		    autoResize 	TRUE)
+		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CDSTTestServer" @2
+		    ShowCompartmentStereotypes 	TRUE
+		    IncludeAttribute 	TRUE
+		    IncludeOperation 	TRUE
+		    location   	(224, 489)
+		    label      	(object ItemLabel
+			Parent_View 	@2
+			location   	(61, 440)
+			fill_color 	13434879
+			nlines     	1
+			max_width  	326
+			justify    	0
+			label      	"CDSTTestServer")
+		    icon_style 	"Icon"
+		    line_color 	3342489
+		    fill_color 	13434879
+		    quidu      	"410F5C050025"
+		    width      	344
+		    height     	120
+		    annotation 	8
+		    autoResize 	TRUE)
+		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestServer" @3
+		    ShowCompartmentStereotypes 	TRUE
+		    IncludeAttribute 	TRUE
+		    IncludeOperation 	TRUE
+		    location   	(224, 745)
+		    label      	(object ItemLabel
+			Parent_View 	@3
+			location   	(78, 696)
+			fill_color 	13434879
+			nlines     	1
+			max_width  	292
+			justify    	0
+			label      	"CIntTestServer")
+		    icon_style 	"Icon"
+		    line_color 	3342489
+		    fill_color 	13434879
+		    quidu      	"410F5C100286"
+		    width      	310
+		    height     	120
+		    annotation 	8
+		    autoResize 	TRUE)
+		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CTestStep" @4
+		    ShowCompartmentStereotypes 	TRUE
+		    IncludeAttribute 	TRUE
+		    IncludeOperation 	TRUE
+		    location   	(743, 200)
+		    label      	(object ItemLabel
+			Parent_View 	@4
+			location   	(512, 77)
+			fill_color 	13434879
+			nlines     	1
+			max_width  	462
+			justify    	0
+			label      	"CTestStep")
+		    icon_style 	"Icon"
+		    line_color 	3342489
+		    fill_color 	13434879
+		    quidu      	"410F5C6F0015"
+		    compartment 	(object Compartment
+			Parent_View 	@4
+			location   	(512, 135)
+			icon_style 	"Icon"
+			fill_color 	16777215
+			anchor     	2
+			nlines     	4
+			max_width  	468)
+		    width      	480
+		    height     	268
+		    annotation 	8
+		    autoResize 	TRUE)
+		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CDSTTestStep" @5
+		    ShowCompartmentStereotypes 	TRUE
+		    IncludeAttribute 	TRUE
+		    IncludeOperation 	TRUE
+		    location   	(746, 506)
+		    label      	(object ItemLabel
+			Parent_View 	@5
+			location   	(583, 430)
+			fill_color 	13434879
+			nlines     	1
+			max_width  	326
+			justify    	0
+			label      	"CDSTTestStep")
+		    icon_style 	"Icon"
+		    line_color 	3342489
+		    fill_color 	13434879
+		    quidu      	"410F5C7A011F"
+		    compartment 	(object Compartment
+			Parent_View 	@5
+			location   	(583, 488)
+			icon_style 	"Icon"
+			fill_color 	16777215
+			anchor     	2
+			nlines     	2
+			max_width  	181)
+		    width      	344
+		    height     	174
+		    annotation 	8
+		    autoResize 	TRUE)
+		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestStep" @6
+		    ShowCompartmentStereotypes 	TRUE
+		    IncludeAttribute 	TRUE
+		    IncludeOperation 	TRUE
+		    location   	(741, 766)
+		    label      	(object ItemLabel
+			Parent_View 	@6
+			location   	(610, 718)
+			fill_color 	13434879
+			nlines     	1
+			max_width  	262
+			justify    	0
+			label      	"CIntTestStep")
+		    icon_style 	"Icon"
+		    line_color 	3342489
+		    fill_color 	13434879
+		    quidu      	"410F5C850361"
+		    width      	280
+		    height     	118
+		    annotation 	8
+		    autoResize 	TRUE)
+		(object NoteView @7
+		    location   	(1565, 409)
+		    label      	(object ItemLabel
+			Parent_View 	@7
+			location   	(1171, 328)
+			fill_color 	13434879
+			nlines     	3
+			max_width  	753
+			label      	"It is intended that the CDSTTestServer and CDSTTestStep are generic classes that implement OOM testing functionality.")
+		    line_color 	3342489
+		    fill_color 	13434879
+		    width      	813
+		    height     	174)
+		(object NoteView @8
+		    location   	(1571, 665)
+		    label      	(object ItemLabel
+			Parent_View 	@8
+			location   	(1174, 565)
+			fill_color 	13434879
+			nlines     	4
+			max_width  	759
+			label      	"Specific integration test server and integration test step are derived to support any integration specific functionality")
+		    line_color 	3342489
+		    fill_color 	13434879
+		    width      	819
+		    height     	213)
+		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestStepReadLocation" @9
+		    ShowCompartmentStereotypes 	TRUE
+		    IncludeAttribute 	TRUE
+		    IncludeOperation 	TRUE
+		    location   	(793, 1104)
+		    label      	(object ItemLabel
+			Parent_View 	@9
+			location   	(544, 1055)
+			fill_color 	13434879
+			nlines     	1
+			max_width  	498
+			justify    	0
+			label      	"CIntTestStepReadLocation")
+		    icon_style 	"Icon"
+		    line_color 	3342489
+		    fill_color 	13434879
+		    quidu      	"410F5F110272"
+		    width      	516
+		    height     	120
+		    annotation 	8
+		    autoResize 	TRUE)
+		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestStepImportVcal" @10
+		    ShowCompartmentStereotypes 	TRUE
+		    IncludeAttribute 	TRUE
+		    IncludeOperation 	TRUE
+		    location   	(1300, 1107)
+		    label      	(object ItemLabel
+			Parent_View 	@10
+			location   	(1082, 1058)
+			fill_color 	13434879
+			nlines     	1
+			max_width  	436
+			justify    	0
+			label      	"CIntTestStepImportVcal")
+		    icon_style 	"Icon"
+		    line_color 	3342489
+		    fill_color 	13434879
+		    quidu      	"410F63D900AD"
+		    width      	454
+		    height     	120
+		    annotation 	8
+		    autoResize 	TRUE)
+		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestStepCompareTimes" @11
+		    ShowCompartmentStereotypes 	TRUE
+		    IncludeAttribute 	TRUE
+		    IncludeOperation 	TRUE
+		    location   	(1815, 1107)
+		    label      	(object ItemLabel
+			Parent_View 	@11
+			location   	(1554, 1058)
+			fill_color 	13434879
+			nlines     	1
+			max_width  	522
+			justify    	0
+			label      	"CIntTestStepCompareTimes")
+		    icon_style 	"Icon"
+		    line_color 	3342489
+		    fill_color 	13434879
+		    quidu      	"410F6666011A"
+		    width      	540
+		    height     	120
+		    annotation 	8
+		    autoResize 	TRUE)
+		(object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestStepSetLocation" @12
+		    ShowCompartmentStereotypes 	TRUE
+		    IncludeAttribute 	TRUE
+		    IncludeOperation 	TRUE
+		    location   	(280, 1104)
+		    label      	(object ItemLabel
+			Parent_View 	@12
+			location   	(53, 1055)
+			fill_color 	13434879
+			nlines     	1
+			max_width  	454
+			justify    	0
+			label      	"CIntTestStepSetLocation")
+		    icon_style 	"Icon"
+		    line_color 	3342489
+		    fill_color 	13434879
+		    quidu      	"410F63C4004F"
+		    width      	472
+		    height     	120
+		    annotation 	8
+		    autoResize 	TRUE)
+		(object NoteView @13
+		    location   	(968, 1280)
+		    label      	(object ItemLabel
+			Parent_View 	@13
+			location   	(274, 1212)
+			fill_color 	13434879
+			nlines     	2
+			max_width  	1353
+			label      	"There are many different test steps each intended to perform a simple operation.  There are only four shown here to keep the diagram readable")
+		    line_color 	3342489
+		    fill_color 	13434879
+		    width      	1413
+		    height     	149)
+		(object NoteView @14
+		    location   	(1562, 184)
+		    label      	(object ItemLabel
+			Parent_View 	@14
+			location   	(1171, 109)
+			fill_color 	13434879
+			nlines     	3
+			max_width  	746
+			label      	"CTestServer and CTestStep are TestExecute framework base classes")
+		    line_color 	3342489
+		    fill_color 	13434879
+		    width      	806
+		    height     	163)
+		(object InheritView "" @15
+		    stereotype 	TRUE
+		    line_color 	3342489
+		    quidu      	"410F5C290229"
+		    client     	@2
+		    supplier   	@1
+		    line_style 	0)
+		(object InheritView "" @16
+		    stereotype 	TRUE
+		    line_color 	3342489
+		    quidu      	"410F5C30019C"
+		    client     	@3
+		    supplier   	@2
+		    line_style 	0)
+		(object InheritView "" @17
+		    stereotype 	TRUE
+		    line_color 	3342489
+		    quidu      	"410F5CE20243"
+		    client     	@5
+		    supplier   	@4
+		    line_style 	0)
+		(object InheritView "" @18
+		    stereotype 	TRUE
+		    line_color 	3342489
+		    quidu      	"410F5CDC0233"
+		    client     	@6
+		    supplier   	@5
+		    line_style 	0)
+		(object InheritView "" @19
+		    stereotype 	TRUE
+		    line_color 	3342489
+		    quidu      	"410F669B0291"
+		    client     	@10
+		    supplier   	@6
+		    line_style 	0)
+		(object InheritView "" @20
+		    stereotype 	TRUE
+		    line_color 	3342489
+		    quidu      	"410F66A001C6"
+		    client     	@11
+		    supplier   	@6
+		    line_style 	0)
+		(object AttachView "" @21
+		    stereotype 	TRUE
+		    line_color 	3342489
+		    client     	@5
+		    supplier   	@7
+		    line_style 	0)
+		(object AttachView "" @22
+		    stereotype 	TRUE
+		    line_color 	3342489
+		    client     	@8
+		    supplier   	@6
+		    line_style 	0)
+		(object InheritView "" @23
+		    stereotype 	TRUE
+		    line_color 	3342489
+		    quidu      	"410F6699010A"
+		    client     	@9
+		    supplier   	@6
+		    line_style 	0)
+		(object InheritView "" @24
+		    stereotype 	TRUE
+		    line_color 	3342489
+		    quidu      	"410F669503D9"
+		    client     	@12
+		    supplier   	@6
+		    line_style 	0)
+		(object UsesView "" @25
+		    stereotype 	TRUE
+		    line_color 	3342489
+		    quidu      	"410F5EE8009D"
+		    client     	@3
+		    supplier   	@4
+		    line_style 	0)))))
--- a/tzservices/tzserver/group/BLD.INF	Fri Jun 11 13:48:03 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// App-Services/Tz (Time Zone Server)
-// 
-//
-
-PRJ_PLATFORMS
-
-// App-Engines/AgnVersit is built for WINC. Since it links with TzClient.dll
-// this component is also built for WINC
-DEFAULT WINC
-
-PRJ_EXPORTS
-// Public Headers 
-../Include/tzdefines.h		SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tzdefines.h)
-../Include/tz.h				SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tz.h)
-../Include/tzid.h			SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tzid.h)
-../Include/tzid.inl			SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tzid.inl)
-../Include/tzconverter.h	SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tzconverter.h)
-../Include/tzupdate.h		SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tzupdate.h)
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-../Include/tzusernames.h    SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(tzusernames.h)
-../Include/tzuserdefineddata.h     SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(tzuserdefineddata.h)
-#endif
-
-// Central Repository registration file for Auto Update and for Current Time Zone
-// NOTE: this is required for emulator and target hardware testing only. It is not used in production.
-1020383e.txt                    z:/private/10202be9/1020383e.txt
-
-// ConfML Files
-../conf/timezoneserver.confml                   MW_LAYER_EXPORTS_CONFML(timezoneserver.confml)
-../conf/timezoneserver_1020383e.crml	        MW_LAYER_EXPORTS_CRML(timezoneserver_1020383e.crml)
-
-../Include/vtzrules.h				SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(vtzrules.h)
-../Include/tzlocalizedcityrecord.h		SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tzlocalizedcityrecord.h)
-../Include/tzlocalizedcityrecord.inl		SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tzlocalizedcityrecord.inl)
-../Include/tzlocalizedtimezonerecord.h		SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(tzlocalizedtimezonerecord.h)
-../Include/tzlocalizedtimezonerecord.inl	SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(tzlocalizedtimezonerecord.inl)
-
-//
-// DBMS policy file for TZ Localization database.
-//
-10206A8B.SPD	z:/private/100012a5/policy/10206a8b.spd
-// BackupRestore
-backup_registration.xml		z:/private/1020383e/backup_registration.xml
-
-// ROM
-TimeZoneServer.iby		/epoc32/rom/include/timezoneserver.iby
-
-PRJ_MMPFILES
-TimeZoneClient.mmp
-TimeZoneServer.mmp
-tzswiobserverplugin.mmp
-
-PRJ_EXTENSIONS
-start extension app-services/buildstubsis
-	option SISNAME	timezone_stub
-	option SRCDIR	./	
-end
-
-#include "../test/group/bld.inf"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tzservices/tzserver/group/bld.inf	Tue Jun 29 10:40:11 2010 +0300
@@ -0,0 +1,72 @@
+// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// App-Services/Tz (Time Zone Server)
+// 
+//
+
+PRJ_PLATFORMS
+
+// App-Engines/AgnVersit is built for WINC. Since it links with TzClient.dll
+// this component is also built for WINC
+DEFAULT WINC
+
+PRJ_EXPORTS
+// Public Headers 
+../Include/tzdefines.h		SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tzdefines.h)
+../Include/tz.h				SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tz.h)
+../Include/tzid.h			SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tzid.h)
+../Include/tzid.inl			SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tzid.inl)
+../Include/tzconverter.h	SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tzconverter.h)
+../Include/tzupdate.h		SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tzupdate.h)
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+../Include/tzusernames.h    SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(tzusernames.h)
+../Include/tzuserdefineddata.h     SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(tzuserdefineddata.h)
+#endif
+
+// Central Repository registration file for Auto Update and for Current Time Zone
+// NOTE: this is required for emulator and target hardware testing only. It is not used in production.
+1020383e.txt                    z:/private/10202be9/1020383e.txt
+
+// ConfML Files
+../conf/timezoneserver.confml                   MW_LAYER_EXPORTS_CONFML(timezoneserver.confml)
+../conf/timezoneserver_1020383e.crml	        MW_LAYER_EXPORTS_CRML(timezoneserver_1020383e.crml)
+
+../Include/vtzrules.h				SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(vtzrules.h)
+../Include/tzlocalizedcityrecord.h		SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tzlocalizedcityrecord.h)
+../Include/tzlocalizedcityrecord.inl		SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(tzlocalizedcityrecord.inl)
+../Include/tzlocalizedtimezonerecord.h		SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(tzlocalizedtimezonerecord.h)
+../Include/tzlocalizedtimezonerecord.inl	SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(tzlocalizedtimezonerecord.inl)
+
+//
+// DBMS policy file for TZ Localization database.
+//
+10206A8B.SPD	z:/private/100012a5/policy/10206a8b.spd
+// BackupRestore
+backup_registration.xml		z:/private/1020383e/backup_registration.xml
+
+// ROM
+TimeZoneServer.iby		/epoc32/rom/include/timezoneserver.iby
+
+PRJ_MMPFILES
+TimeZoneClient.mmp
+TimeZoneServer.mmp
+tzswiobserverplugin.mmp
+
+PRJ_EXTENSIONS
+start extension app-services/buildstubsis
+	option SISNAME	timezone_stub
+	option SRCDIR	./	
+end
+
+#include "../test/group/bld.inf"
--- a/tzservices/tzserver/group/release.txt	Fri Jun 11 13:48:03 2010 +0300
+++ b/tzservices/tzserver/group/release.txt	Tue Jun 29 10:40:11 2010 +0300
@@ -300,6 +300,6 @@
 Title : First Release of Timezone Server
 
 * First release of the new Time Zone Server.
-* see ..\tz\documentation folder for how-to use the new component
+* see ..\tzserver\doc_pub folder for how-to use the new component
 ============================